From dde64ba4917ce14c56b488e26b3190723714f7d8 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 22 Dec 2015 16:58:00 +0000 Subject: [PATCH] Backgrounds do not need to be important. Allows for different button sizes if needed. --- pixelegg/css/mobile.css | 81 +++++++++++++++++----------------- pixelegg/css/pixelegg.css | 79 +++++++++++++++++---------------- pixelegg/less/def_buttons.less | 8 ++-- 3 files changed, 85 insertions(+), 83 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index cff8f7db05..c3ce7ac05c 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -1699,10 +1699,10 @@ span.ui-icon-search { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -2194,6 +2194,7 @@ body { * @package pixelegg * @version $Id$ */ +@import-once "def_colors.less"; #socialMedia { position: relative; bottom: 20px; @@ -2637,9 +2638,9 @@ button.et2_button_with_image { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-size: 20px auto !important; + padding-left: 30px; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; background-repeat: no-repeat !important; @@ -2694,10 +2695,10 @@ button.et2_button_delete { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; /*background-color: @color-negative-action !important;*/ @@ -2733,10 +2734,10 @@ button.et2_button_delete:hover { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; color: #ffffff !important; @@ -2771,10 +2772,10 @@ button.et2_button_delete:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; color: #ffffff; @@ -2841,10 +2842,10 @@ button#filemanager-select_button[ok]:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -2906,10 +2907,10 @@ button#cancel { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; content: "ID missing"; @@ -2950,10 +2951,10 @@ button#cancel:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -3013,10 +3014,10 @@ button[id="add"] { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -4271,7 +4272,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -4295,7 +4296,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.1px; + font-size: 12.100000000000001px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4691,7 +4692,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4863,7 +4864,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; @@ -7178,7 +7179,7 @@ span.egw_tutorial_title { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a0a361f4d1..15ac4debb5 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1688,10 +1688,10 @@ span.ui-icon-search { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -2183,6 +2183,7 @@ body { * @package pixelegg * @version $Id$ */ +@import-once "def_colors.less"; #socialMedia { position: relative; bottom: 20px; @@ -2626,9 +2627,9 @@ button.et2_button_with_image { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-size: 20px auto !important; + padding-left: 30px; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; background-repeat: no-repeat !important; @@ -2683,10 +2684,10 @@ button.et2_button_delete { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; /*background-color: @color-negative-action !important;*/ @@ -2722,10 +2723,10 @@ button.et2_button_delete:hover { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; color: #ffffff !important; @@ -2760,10 +2761,10 @@ button.et2_button_delete:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; color: #ffffff; @@ -2830,10 +2831,10 @@ button#filemanager-select_button[ok]:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -2895,10 +2896,10 @@ button#cancel { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; content: "ID missing"; @@ -2939,10 +2940,10 @@ button#cancel:active { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -3002,10 +3003,10 @@ button[id="add"] { -o-transition-timing-function: linear; transition-timing-function: linear; background-color: #b4b4b4; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ height: 24px; } @@ -4260,7 +4261,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -4284,7 +4285,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before { padding-right: 20px; - font-size: 12.1px; + font-size: 12.100000000000001px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4680,7 +4681,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.1px; + font-size: 12.100000000000001px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4852,7 +4853,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12.100000000000001px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index 079f3828a0..134ac49e8d 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -314,10 +314,10 @@ .Complete_Button_text_icon_before{ .Complete_Button_normal; - padding-left: 30px !important; - background-position: 6px center !important; - background-repeat: no-repeat !important; - background-size: 20px auto !important; + padding-left: 30px; + background-position: 6px center; + background-repeat: no-repeat; + background-size: 20px auto; /*.Button_size_h32_auto;*/ .dimension_height_m; }