From 195991e4f38447ca3b9898f44eee93dd20950174 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 15 Jan 2016 09:10:24 +0000 Subject: [PATCH] Mobile theme WIP: - Fix size of icons in sidebar - Fix custom theme color for search messed up color in pixelegg theme --- pixelegg/css/mobile.css | 24 +++++++++++-------- pixelegg/css/mobile.less | 24 +++++++++++-------- pixelegg/inc/class.pixelegg_framework.inc.php | 8 +++++-- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 21730c3b2c..7c7eac92e7 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -6795,7 +6795,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 30px 30px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -6805,7 +6805,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; /*display:inline-block;*/ display: none; } @@ -6815,7 +6815,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -6824,7 +6824,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; background-image: url(../images/topmenu_items/mobile/access.png); display: inline-block; background-position: center; @@ -6835,7 +6835,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -6845,7 +6845,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -6855,7 +6855,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; } #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search:before { @@ -6864,7 +6864,7 @@ span.egw_tutorial_title { background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -7489,11 +7489,15 @@ span.egw_tutorial_title { background-color: transparent; top: -3px; background-position: 15px center; - background-size: 32px 32px; + background-size: 24px 24px; left: 0; } + body #egw_fw_basecontainer .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon { + width: 18px; + height: 18px; + } body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_menu { - top: 8px; + background-size: 24px 24px; } body #egw_fw_basecontainer #egw_fw_top_toolbar div#egw_fw_topmenu_items { padding-top: 8px; diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less index 29391044c6..7f98fbd131 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -256,7 +256,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 30px 30px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -267,7 +267,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; /*display:inline-block;*/ display:none; } @@ -278,7 +278,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -289,7 +289,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; background-image: url(../images/topmenu_items/mobile/access.png); display: inline-block; background-position: center; @@ -301,7 +301,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -311,7 +311,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -322,7 +322,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; } @@ -333,7 +333,7 @@ background-repeat: no-repeat; width: 32px; height: 32px; - background-size: 32px 32px; + background-size: 24px 24px; display: inline-block; background-position: center; } @@ -1026,15 +1026,19 @@ background-color: transparent; top: -3px; background-position: 15px center; - background-size: 32px 32px; + background-size: 24px 24px; left: 0; } } } #egw_fw_basecontainer { + .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon { + width:18px; + height:18px; + } #egw_fw_top_toolbar { div#egw_fw_menu { - top:8px; + background-size: 24px 24px; } div#egw_fw_topmenu_items { padding-top: 8px; diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php index 27e9aa76b1..64808d360b 100755 --- a/pixelegg/inc/class.pixelegg_framework.inc.php +++ b/pixelegg/inc/class.pixelegg_framework.inc.php @@ -153,6 +153,11 @@ div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,#loginMainDiv #div background-color: $color_hex_darker !important; } + +"; + if (html::$ua_mobile) $ret['app_css'] .= " +/* Mobile theme specific color changes */ + /*nextmatch header and plus_button in mobile theme*/ body div.et2_nextmatch .search, body div.et2_nextmatch .search button, @@ -161,8 +166,7 @@ body div.et2_nextmatch .search .nm_action_header, body div.et2_nextmatch .search .nm_toggle_header, body div.et2_nextmatch .search .nm_favorites_button { background-color: $color; -} -"; +}"; } return $ret; }