From 9c9383f21dea8c815543e98ab29a02eda82faa86 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 15 Apr 2016 12:42:38 +0000 Subject: [PATCH] Fix styling for button with only image --- api/templates/default/etemplate2.css | 4 ++- pixelegg/css/mobile.css | 46 +++----------------------- pixelegg/css/pixelegg.css | 46 +++----------------------- pixelegg/less/layout_buttons.less | 6 ++-- pixelegg/less/svg.css | 25 --------------- pixelegg/mobile/fw_mobile.css | 48 ++++------------------------ 6 files changed, 23 insertions(+), 152 deletions(-) diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css index 975aeb8110..be1383e540 100644 --- a/api/templates/default/etemplate2.css +++ b/api/templates/default/etemplate2.css @@ -252,10 +252,12 @@ input[type=button]:focus { button.et2_button_with_image { padding-left: 20px; background-repeat: no-repeat; - background-position: 4px center; background-size: 16px; height: 24px; } +button.et2_button_with_image.et2_button_text { + background-position: 4px center; +} /* et2_box_widget ###*/ button[id="cancel"], button#cancel { diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 79c3e04202..f4a88dc96b 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -1483,26 +1483,6 @@ div#ui-datepicker-div { .ms-ctn .ms-trigger { 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 - * @package phpgwapi - * @version $Id$ - */ -/* - font styling - allowed attributes: font-family,font-size,color,font-weight -*/ /** * layout_*.less files are Pixelegg template specific */ @@ -2066,12 +2046,13 @@ button.et2_button_with_image { -o-transition-timing-function: linear; transition-timing-function: linear; padding-left: 30px; + background-position: 6px center; background-repeat: no-repeat; background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; background-repeat: no-repeat !important; - background-position: 6px center; + background-position: center; background-size: 20px 20px; background-color: #e6e6e6; } @@ -2086,6 +2067,9 @@ button.et2_button_with_image background-color[url$="svg"] { background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-repeat: repeat-x; } +button.et2_button_with_image.et2_button_text { + background-position: 6px center; +} /* ######################################################################################## * Content Element * Button löschen / delete / => color-negative-action // red @@ -2451,7 +2435,6 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } -/*Button Ende #######################################################*/ /** * EGroupware: Stylite Pixelegg template * @@ -3379,10 +3362,6 @@ h6 { td.lettersearch { background-image: none; } -/*.nextmatch_header table { - border: none !important; - width: 99% !important; -}*/ /** * EGroupware: CSS with less preprocessor * @@ -5160,21 +5139,6 @@ button.image_button { * @package pixelegg * @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 * diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 3ec54c1eef..19454aff81 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1472,26 +1472,6 @@ div#ui-datepicker-div { .ms-ctn .ms-trigger { 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 - * @package phpgwapi - * @version $Id$ - */ -/* - font styling - allowed attributes: font-family,font-size,color,font-weight -*/ /** * layout_*.less files are Pixelegg template specific */ @@ -2055,12 +2035,13 @@ button.et2_button_with_image { -o-transition-timing-function: linear; transition-timing-function: linear; padding-left: 30px; + background-position: 6px center; background-repeat: no-repeat; background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; background-repeat: no-repeat !important; - background-position: 6px center; + background-position: center; background-size: 20px 20px; background-color: #e6e6e6; } @@ -2075,6 +2056,9 @@ button.et2_button_with_image background-color[url$="svg"] { background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-repeat: repeat-x; } +button.et2_button_with_image.et2_button_text { + background-position: 6px center; +} /* ######################################################################################## * Content Element * Button löschen / delete / => color-negative-action // red @@ -2440,7 +2424,6 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } -/*Button Ende #######################################################*/ /** * EGroupware: Stylite Pixelegg template * @@ -3368,10 +3351,6 @@ h6 { td.lettersearch { background-image: none; } -/*.nextmatch_header table { - border: none !important; - width: 99% !important; -}*/ /** * EGroupware: CSS with less preprocessor * @@ -5149,21 +5128,6 @@ button.image_button { * @package pixelegg * @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 * diff --git a/pixelegg/less/layout_buttons.less b/pixelegg/less/layout_buttons.less index be9985b0a3..b673466708 100644 --- a/pixelegg/less/layout_buttons.less +++ b/pixelegg/less/layout_buttons.less @@ -95,13 +95,15 @@ input[type=button] { button.et2_button_with_image{ .Complete_Button_text_icon_before; background-repeat: no-repeat !important; - background-position: 6px center; + background-position: center; background-size: 20px 20px; background-color: @gray_10; background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);} - } +button.et2_button_with_image.et2_button_text { + background-position: 6px center; +} /* ######################################################################################## * Content Element * Button löschen / delete / => color-negative-action // red diff --git a/pixelegg/less/svg.css b/pixelegg/less/svg.css index 1fdbe37149..9cfca33257 100644 --- a/pixelegg/less/svg.css +++ b/pixelegg/less/svg.css @@ -16,28 +16,3 @@ /*stroke: @gray_50;*/ /*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; -}*/ diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index d723f73a40..0d967ec018 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -1057,7 +1057,7 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Stefan Reinhard * @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 { background-color: #ffdd73; @@ -1494,26 +1494,6 @@ div#ui-datepicker-div { .ms-ctn .ms-trigger { 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 - * @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 */ @@ -2077,12 +2057,13 @@ button.et2_button_with_image { -o-transition-timing-function: linear; transition-timing-function: linear; padding-left: 30px; + background-position: 6px center; background-repeat: no-repeat; background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; background-repeat: no-repeat !important; - background-position: 6px center; + background-position: center; background-size: 20px 20px; background-color: #e6e6e6; } @@ -2097,6 +2078,9 @@ button.et2_button_with_image background-color[url$="svg"] { background-image: linear-gradient(top, #b4b4b4, #b4b4b4); background-repeat: repeat-x; } +button.et2_button_with_image.et2_button_text { + background-position: 6px center; +} /* ######################################################################################## * Content Element * Button löschen / delete / => color-negative-action // red @@ -2462,7 +2446,6 @@ button[id="add"] { button[id="add"]:active { background-color: #1aa200 !important; } -/*Button Ende #######################################################*/ /** * EGroupware: Stylite Pixelegg template * @@ -3390,10 +3373,6 @@ h6 { td.lettersearch { background-image: none; } -/*.nextmatch_header table { - border: none !important; - width: 99% !important; -}*/ /** * EGroupware: CSS with less preprocessor * @@ -5171,21 +5150,6 @@ button.image_button { * @package 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 *