From 1670958e16fa148ef32cecdf1f0c75c3b9263280 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 4 Mar 2016 09:21:40 +0000 Subject: [PATCH] fix unintentional use of ui-bg_flat_0_aaaaaa_40x100.png image and always round font-size to full px --- pixelegg/css/mobile.css | 22 +++++++++++++--------- pixelegg/css/mobile.less | 20 ++++++++++---------- pixelegg/css/pixelegg.css | 16 ++++++++++------ pixelegg/less/def_fonts.less | 12 ++++++------ pixelegg/less/jquery-ui.less | 4 ++++ pixelegg/less/layout_traditional.less | 2 +- 6 files changed, 44 insertions(+), 32 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 3b41a35db4..62f3ae0558 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -1546,6 +1546,10 @@ div#ui-datepicker-div { background-color: #fecc44 !important; color: #373737; } +.ui-widget-overlay, +.ui-widget-shadow { + background-image: none; +} /** * EGroupware: Stylite Pixelegg template * @@ -1896,7 +1900,7 @@ body { #loginMainDiv div#centerBox form table.divLoginbox input[type="submit"] { background-color: #ffc200; color: #000000; - font-size: 19.8px; + font-size: 20px; } #loginMainDiv div#centerBox form table.divLoginbox input[type="submit"]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -3774,7 +3778,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.1px; + font-size: 12px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -3798,7 +3802,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: 12px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4196,7 +4200,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.1px; + font-size: 12px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4367,7 +4371,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12px; background-image: url(../images/arrow_right.png); background-repeat: no-repeat; background-position: left center; @@ -5840,7 +5844,7 @@ a.textSidebox { .egw-loading-prompt-container::before { opacity: .3; content: ""; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background-color: #aaaaaa; width: 100%; height: 100%; position: absolute; @@ -6407,7 +6411,7 @@ span.egw_tutorial_title { box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.6); } body .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 { - font-size: 14.3px; + font-size: 14px; line-height: 1em; margin: 0 15px 2px 2px; vertical-align: super; @@ -6527,7 +6531,7 @@ span.egw_tutorial_title { padding-top: 0.31em; padding-left: 3em; color: #999999; - font-size: 14.3px; + font-size: 14px; line-height: 17px; } body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header object { @@ -6673,7 +6677,7 @@ span.egw_tutorial_title { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.1px; + font-size: 12px; background-image: url(../images/arrow_left.png); background-repeat: no-repeat; background-position: left center; diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less index b84ccb5a96..386b038da5 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -33,7 +33,7 @@ @media all { body{ - + background-color: transparent; // iOS appHeader class div.egw_fw_mobile_iOS_popup_appHeader{ @@ -50,7 +50,7 @@ line-height: 32px !important; } - + #egw_fw_firstload { position: absolute; top: 0; @@ -72,11 +72,11 @@ -webkit-animation: fw-firstload 1s infinite; animation: fw-firstload 1s infinite; -moz-animation: fw-firstload 1s infinite; - + } - + } - + //################### //# # //# Grid & NM # @@ -106,7 +106,7 @@ top:0; width:10px; display: block; - + } span.cat_.mobile_cat_col { background: #F5F5F5; @@ -130,7 +130,7 @@ background-position: 3px 7px; position: fixed; } - + /*EOF close/back button styling*/ #egw_fw_basecontainer{ @@ -348,7 +348,7 @@ margin-top:17px; } } - + }//End of toolbar // ######################tabs header ########################## @@ -640,7 +640,7 @@ } } } - } + } } //################################# // Hover @@ -706,7 +706,7 @@ padding-left: 0; padding-right: 0px; float: left; - + /*filter grey*/ .img_filter_gray; } diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 108e95667d..f13989def8 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1535,6 +1535,10 @@ div#ui-datepicker-div { background-color: #fecc44 !important; color: #373737; } +.ui-widget-overlay, +.ui-widget-shadow { + background-image: none; +} /** * EGroupware: Stylite Pixelegg template * @@ -1885,7 +1889,7 @@ body { #loginMainDiv div#centerBox form table.divLoginbox input[type="submit"] { background-color: #ffc200; color: #000000; - font-size: 19.8px; + font-size: 20px; } #loginMainDiv div#centerBox form table.divLoginbox input[type="submit"]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -3763,7 +3767,7 @@ td.message span.message { text-decoration: none; height: 32px; /*font-size: 1.1em;*/ - font-size: 12.100000000000001px; + font-size: 12px; line-height: 1.5em; } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover { @@ -3787,7 +3791,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.100000000000001px; + font-size: 12px; content: " "; background-image: url(../images/topmenu_items/home.png); background-repeat: no-repeat; @@ -4185,7 +4189,7 @@ td.message span.message { padding-left: 3em; color: #999999; /*font-size: 12px;*/ - font-size: 12.100000000000001px; + font-size: 12px; line-height: 17px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object { @@ -4356,7 +4360,7 @@ td.message span.message { margin: 5px 0px 3px 5px; padding: 0px 0px 0px 15px; line-height: 1em; - font-size: 12.100000000000001px; + font-size: 12px; background-image: url(../images/arrow_right.png); background-repeat: no-repeat; background-position: left center; @@ -5829,7 +5833,7 @@ a.textSidebox { .egw-loading-prompt-container::before { opacity: .3; content: ""; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background-color: #aaaaaa; width: 100%; height: 100%; position: absolute; diff --git a/pixelegg/less/def_fonts.less b/pixelegg/less/def_fonts.less index 743debcdb1..f0f97f1564 100644 --- a/pixelegg/less/def_fonts.less +++ b/pixelegg/less/def_fonts.less @@ -28,9 +28,9 @@ .fontsize_normal {font-size: @basefontsize;} -.fontsize_xs {font-size: @basefontsize*0.25;} // h5 -.fontsize_s {font-size: @basefontsize*0.5;} // h4 -.fontsize_m {font-size: @basefontsize*1;} // p -.fontsize_l {font-size: @basefontsize*1.1;} // h3 + SIDEBAR APPS H1 -.fontsize_xl {font-size: @basefontsize*1.3;} // h2 -.fontsize_xxl {font-size: @basefontsize*1.8;} // h1 \ No newline at end of file +.fontsize_xs {font-size: round(@basefontsize*0.25);} // h5 +.fontsize_s {font-size: round(@basefontsize*0.5);} // h4 +.fontsize_m {font-size: round(@basefontsize*1);} // p +.fontsize_l {font-size: round(@basefontsize*1.1);} // h3 + SIDEBAR APPS H1 +.fontsize_xl {font-size: round(@basefontsize*1.3);} // h2 +.fontsize_xxl {font-size: round(@basefontsize*1.8);} // h1 \ No newline at end of file diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index d9caba7448..7d45581088 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -408,5 +408,9 @@ div.ui-timepicker-div{ &:active { background-color: @color_cancel_action_active !important; color: @gray_80; } } +// Overwrite not used / loadable background image +.ui-widget-overlay, .ui-widget-shadow { + background-image: none; +} // \ No newline at end of file diff --git a/pixelegg/less/layout_traditional.less b/pixelegg/less/layout_traditional.less index 6f464dec85..f8c6aa5d28 100755 --- a/pixelegg/less/layout_traditional.less +++ b/pixelegg/less/layout_traditional.less @@ -334,7 +334,7 @@ a.textSidebox .egw-loading-prompt-container::before { opacity:.3; content:""; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background-color: #aaaaaa; width: 100%; height: 100%; position: absolute;