extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix styling for button with only image

Browse Source
This commit is contained in:
Hadi Nategh 2016-04-15 12:42:38 +00:00
parent 3e397fce7c
commit 9c9383f21d
6 changed files with 23 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/templates/default/etemplate2.css
View File

@ -252,10 +252,12 @@ input[type=button]:focus {
button.et2_button_with_image { button.et2_button_with_image {
padding-left: 20px; padding-left: 20px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 4px center;
background-size: 16px; background-size: 16px;
height: 24px; height: 24px;
} }
button.et2_button_with_image.et2_button_text {
background-position: 4px center;
}
/* et2_box_widget ###*/ /* et2_box_widget ###*/
button[id="cancel"], button[id="cancel"],
button#cancel { button#cancel {

46
pixelegg/css/mobile.css
View File

@ -1483,26 +1483,6 @@ div#ui-datepicker-div {
.ms-ctn .ms-trigger { .ms-ctn .ms-trigger {
border-left: none; border-left: none;
} }
/**
* EGroupware: CSS with less preprocessor
* traditional.less
* included in pixelegg.less since 17/03/2014
*
* Please do NOT change css-files directly, instead change less-files and compile them!
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package phpgwapi
* @version $Id$
*/
/*
font styling
allowed attributes: font-family,font-size,color,font-weight
*/
/** /**
* layout_*.less files are Pixelegg template specific * layout_*.less files are Pixelegg template specific
*/ */
@ -2066,12 +2046,13 @@ button.et2_button_with_image {
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
padding-left: 30px; padding-left: 30px;
background-position: 6px center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 20px auto; background-size: 20px auto;
/*.Button_size_h32_auto;*/ /*.Button_size_h32_auto;*/
height: 24px; height: 24px;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: 6px center; background-position: center;
background-size: 20px 20px; background-size: 20px 20px;
background-color: #e6e6e6; background-color: #e6e6e6;
} }
@ -2086,6 +2067,9 @@ button.et2_button_with_image background-color[url$="svg"] {
background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
button.et2_button_with_image.et2_button_text {
background-position: 6px center;
}
/* ######################################################################################## /* ########################################################################################
* Content Element * Content Element
* Button löschen / delete / => color-negative-action // red * Button löschen / delete / => color-negative-action // red
@ -2451,7 +2435,6 @@ button[id="add"] {
button[id="add"]:active { button[id="add"]:active {
background-color: #1aa200 !important; background-color: #1aa200 !important;
} }
/*Button Ende #######################################################*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *
@ -3379,10 +3362,6 @@ h6 {
td.lettersearch { td.lettersearch {
background-image: none; background-image: none;
} }
/*.nextmatch_header table {
border: none !important;
width: 99% !important;
}*/
/** /**
* EGroupware: CSS with less preprocessor * EGroupware: CSS with less preprocessor
* *
@ -5160,21 +5139,6 @@ button.image_button {
* @package pixelegg * @package pixelegg
* @version $Id$ * @version $Id$
*/ */
/* disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails
//SVG Filter / not for Logo
#egw_fw_sidebar img[src$="svg"]{
.gradient_vertical (@gray_60, @gray_60);
.rounded(3px);
border: 1px solid @gray_0;;
}
#egw_fw_main img[src$="svg"],
#egw_fw_footer img[src$="svg"]{
//.gradient_vertical (@egw_color_2_a, @egw_color_2_a);
.gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%));
}*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *

46
pixelegg/css/pixelegg.css
View File

@ -1472,26 +1472,6 @@ div#ui-datepicker-div {
.ms-ctn .ms-trigger { .ms-ctn .ms-trigger {
border-left: none; border-left: none;
} }
/**
* EGroupware: CSS with less preprocessor
* traditional.less
* included in pixelegg.less since 17/03/2014
*
* Please do NOT change css-files directly, instead change less-files and compile them!
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package phpgwapi
* @version $Id$
*/
/*
font styling
allowed attributes: font-family,font-size,color,font-weight
*/
/** /**
* layout_*.less files are Pixelegg template specific * layout_*.less files are Pixelegg template specific
*/ */
@ -2055,12 +2035,13 @@ button.et2_button_with_image {
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
padding-left: 30px; padding-left: 30px;
background-position: 6px center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 20px auto; background-size: 20px auto;
/*.Button_size_h32_auto;*/ /*.Button_size_h32_auto;*/
height: 24px; height: 24px;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: 6px center; background-position: center;
background-size: 20px 20px; background-size: 20px 20px;
background-color: #e6e6e6; background-color: #e6e6e6;
} }
@ -2075,6 +2056,9 @@ button.et2_button_with_image background-color[url$="svg"] {
background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
button.et2_button_with_image.et2_button_text {
background-position: 6px center;
}
/* ######################################################################################## /* ########################################################################################
* Content Element * Content Element
* Button löschen / delete / => color-negative-action // red * Button löschen / delete / => color-negative-action // red
@ -2440,7 +2424,6 @@ button[id="add"] {
button[id="add"]:active { button[id="add"]:active {
background-color: #1aa200 !important; background-color: #1aa200 !important;
} }
/*Button Ende #######################################################*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *
@ -3368,10 +3351,6 @@ h6 {
td.lettersearch { td.lettersearch {
background-image: none; background-image: none;
} }
/*.nextmatch_header table {
border: none !important;
width: 99% !important;
}*/
/** /**
* EGroupware: CSS with less preprocessor * EGroupware: CSS with less preprocessor
* *
@ -5149,21 +5128,6 @@ button.image_button {
* @package pixelegg * @package pixelegg
* @version $Id$ * @version $Id$
*/ */
/* disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails
//SVG Filter / not for Logo
#egw_fw_sidebar img[src$="svg"]{
.gradient_vertical (@gray_60, @gray_60);
.rounded(3px);
border: 1px solid @gray_0;;
}
#egw_fw_main img[src$="svg"],
#egw_fw_footer img[src$="svg"]{
//.gradient_vertical (@egw_color_2_a, @egw_color_2_a);
.gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%));
}*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *

6
pixelegg/less/layout_buttons.less
View File

@ -95,13 +95,15 @@ input[type=button] {
button.et2_button_with_image{ button.et2_button_with_image{
.Complete_Button_text_icon_before; .Complete_Button_text_icon_before;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: 6px center; background-position: center;
background-size: 20px 20px; background-size: 20px 20px;
background-color: @gray_10; background-color: @gray_10;
background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);} background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);}
} }
button.et2_button_with_image.et2_button_text {
background-position: 6px center;
}
/* ######################################################################################## /* ########################################################################################
* Content Element * Content Element
* Button löschen / delete / => color-negative-action // red * Button löschen / delete / => color-negative-action // red

25
pixelegg/less/svg.css
View File

@ -16,28 +16,3 @@
/*stroke: @gray_50;*/ /*stroke: @gray_50;*/
/*fill: @gray_0;*/ /*fill: @gray_0;*/
} }
/*
svg#etemplate_navbar {
fill: @gray_40;
}
svg#infolog_navbar {
fill: @gray_40;
}
svg#admin_navbar {
fill: @gray_40;
}
.egw_fw_ui_tabs_header > svg * {
fill: @egw_color_2_a !important;
stroke: @gray_0 !important;
}
svg#sambaadmin_navbar {
fill: @gray_40;
}
svg#mail_navbar {
fill: @gray_40;
}*/

48
pixelegg/mobile/fw_mobile.css
View File

@ -1057,7 +1057,7 @@
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de> * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package pixelegg * @package pixelegg
* @version $Id: jquery-ui.less 55245 2016-03-04 09:21:40Z ralfbecker $ * @version $Id: jquery-ui.less 55742 2016-04-13 18:44:45Z nathangray $
*/ */
#uical_select_resource { #uical_select_resource {
background-color: #ffdd73; background-color: #ffdd73;
@ -1494,26 +1494,6 @@ div#ui-datepicker-div {
.ms-ctn .ms-trigger { .ms-ctn .ms-trigger {
border-left: none; border-left: none;
} }
/**
* EGroupware: CSS with less preprocessor
* traditional.less
* included in pixelegg.less since 17/03/2014
*
* Please do NOT change css-files directly, instead change less-files and compile them!
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package phpgwapi
* @version $Id: traditional.less 50764 2014-03-17 14:10:27Z pixelegg $
*/
/*
font styling
allowed attributes: font-family,font-size,color,font-weight
*/
/** /**
* layout_*.less files are Pixelegg template specific * layout_*.less files are Pixelegg template specific
*/ */
@ -2077,12 +2057,13 @@ button.et2_button_with_image {
-o-transition-timing-function: linear; -o-transition-timing-function: linear;
transition-timing-function: linear; transition-timing-function: linear;
padding-left: 30px; padding-left: 30px;
background-position: 6px center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 20px auto; background-size: 20px auto;
/*.Button_size_h32_auto;*/ /*.Button_size_h32_auto;*/
height: 24px; height: 24px;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: 6px center; background-position: center;
background-size: 20px 20px; background-size: 20px 20px;
background-color: #e6e6e6; background-color: #e6e6e6;
} }
@ -2097,6 +2078,9 @@ button.et2_button_with_image background-color[url$="svg"] {
background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
background-repeat: repeat-x; background-repeat: repeat-x;
} }
button.et2_button_with_image.et2_button_text {
background-position: 6px center;
}
/* ######################################################################################## /* ########################################################################################
* Content Element * Content Element
* Button löschen / delete / => color-negative-action // red * Button löschen / delete / => color-negative-action // red
@ -2462,7 +2446,6 @@ button[id="add"] {
button[id="add"]:active { button[id="add"]:active {
background-color: #1aa200 !important; background-color: #1aa200 !important;
} }
/*Button Ende #######################################################*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *
@ -3390,10 +3373,6 @@ h6 {
td.lettersearch { td.lettersearch {
background-image: none; background-image: none;
} }
/*.nextmatch_header table {
border: none !important;
width: 99% !important;
}*/
/** /**
* EGroupware: CSS with less preprocessor * EGroupware: CSS with less preprocessor
* *
@ -5171,21 +5150,6 @@ button.image_button {
* @package pixelegg * @package pixelegg
* @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $
*/ */
/* disabled for now in pixelegg.less, until we use svg outside filemanager thumbnails
//SVG Filter / not for Logo
#egw_fw_sidebar img[src$="svg"]{
.gradient_vertical (@gray_60, @gray_60);
.rounded(3px);
border: 1px solid @gray_0;;
}
#egw_fw_main img[src$="svg"],
#egw_fw_footer img[src$="svg"]{
//.gradient_vertical (@egw_color_2_a, @egw_color_2_a);
.gradient_vertical (fade(@gray_100,50%), fade(@gray_100,50%));
}*/
/** /**
* EGroupware: Stylite Pixelegg template * EGroupware: Stylite Pixelegg template
* *