Let the mobile theme uses pixelegg custom color

This commit is contained in:
Hadi Nategh 2015-02-20 14:05:32 +00:00
parent f6260c1c8c
commit 8ab9d48a96

View File

@ -98,7 +98,6 @@ class pixelegg_framework extends jdots_framework
*/ */
public function _get_css() public function _get_css()
{ {
if (html::$ua_mobile || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile') return egw_framework::_get_css();
$ret = parent::_get_css(); $ret = parent::_get_css();
// color to use // color to use
$color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'], $color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
@ -124,9 +123,9 @@ class pixelegg_framework extends jdots_framework
-popup toolbar -popup toolbar
*/ */
div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,#loginMainDiv #divAppIconBar #divLogo, div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,#loginMainDiv #divAppIconBar #divLogo,
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover, #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_category_active:hover,
.dialogFooterToolbar, .ui-widget-header{ .dialogFooterToolbar, .ui-widget-header{
background-color: $color; background-color: $color !important;
} }
/*Login background*/ /*Login background*/
@ -150,8 +149,8 @@ div#egw_fw_header, div.egw_fw_ui_category:hover,#loginMainDiv,#loginMainDiv #div
} }
/*Sidebar menu active category*/ /*Sidebar menu active category*/
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active{ #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_category_active{
background-color: $color_hex_darker; background-color: $color_hex_darker !important;
} }
"; ";
} }