Skip to content

Commit

Permalink
Fixed #392 - Issues with Action Menu CSS.
Browse files Browse the repository at this point in the history
  • Loading branch information
willrennie committed Aug 24, 2015
1 parent 201c70b commit 2b30827
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,23 @@
$mod_strings['LBL_COLOUR_SETTINGS'] = 'Theme Settings';
$mod_strings['LBL_COLOUR_DESC'] = 'Customise your SuiteCRM theme to match your branding.';
$mod_strings['LBL_COLOUR_ADMIN_INTRO'] = 'Change these settings to customise your SuiteCRM theme. <strong>Note:</strong> Please remember to refresh (Ctrl + F5) once you have saved your settings.';

$mod_strings['LBL_DISPLAY_SIDEBAR'] = 'Display Sidebar';

$mod_strings['LBL_COLOUR_ADMIN_MENU'] = 'Menu colour config';
$mod_strings['LBL_COLOUR_ADMIN_PAGE'] = 'Page colour config';
$mod_strings['LBL_COLOUR_ADMIN_PAGEHEADER'] = 'Page header colour';
$mod_strings['LBL_COLOUR_ADMIN_PAGELINK'] = 'Page link colour';
$mod_strings['LBL_COLOUR_ADMIN_DASHLET'] = 'Dashlet colour config';
$mod_strings['LBL_COLOUR_ADMIN_BUTTON'] = 'Button colour config';

$mod_strings['LBL_COLOUR_ADMIN_BASE'] = 'Top menu base colour: ';
$mod_strings['LBL_COLOUR_ADMIN_MENUTOP'] = 'Menu top gradient';
$mod_strings['LBL_COLOUR_ADMIN_MENUBOTTOM'] = 'Menu bottom gradient';
$mod_strings['LBL_COLOUR_ADMIN_MENUBRD'] = 'Menu border colour: ';
$mod_strings['LBL_COLOUR_ADMIN_MENUHOVER'] = 'Menu hover colour: ';
$mod_strings['LBL_COLOUR_ADMIN_DDLINK'] = 'Drop down link colour: ';
$mod_strings['LBL_COLOUR_ADMIN_DDMENU'] = 'Drop down menu colour: ';

$mod_strings['LBL_COLOUR_ADMIN_DDLINK_HOVER'] = 'Drop down menu link hover colour: ';
$mod_strings['LBL_ACTION_MENU_BACKGROUND'] = 'Action Menu background colour';
$mod_strings['LBL_ACTION_MENU_BACKGROUND_HOVER'] = 'Action Menu hover colour';
$mod_strings['LBL_COLOUR_ADMIN_MENUFONT'] = 'Menu link colour';
$mod_strings['LBL_COLOUR_ADMIN_MENULNKHVR'] = 'Menu link hover colour: ';
$mod_strings['LBL_COLOUR_ADMIN_BTNTOP'] = 'Button colour: ';
Expand All @@ -35,5 +34,4 @@
$mod_strings['LBL_COLOUR_ADMIN_BTNLNKHOVER'] = 'Button link hover colour: ';
$mod_strings['LBL_COLOUR_ADMIN_DASHHEAD'] = 'Dashlet header colour: ';
$mod_strings['LBL_COLOUR_ADMIN_ICON'] = 'Icon colour: ';

$mod_strings['LBL_COLOUR_ADMIN_TABS'] = 'Menu contents config';
18 changes: 16 additions & 2 deletions themes/SuiteR/css/colourSelector.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,21 @@
color:#<?php echo $sugar_config['theme_settings']['SuiteR']['dropdown_menu_link_hover']; ?> !important;
}

/* Action Menu CSS */

ul.clickMenu li ul.subnav, ul.clickMenu ul.subnav-sub, ul.SugarActionMenuIESub, ul.clickMenu li ul.subnav li a, ul.clickMenu li ul.subnav li input, ul.subnav-sub li a, ul.SugarActionMenuIESub li a, ul.clickMenu li ul.subnav li a, ul.clickMenu li ul.subnav li input, ul.subnav-sub li a, ul.SugarActionMenuIESub li a, ul.clickMenu li ul.subnav, ul.clickMenu ul.subnav-sub, ul.SugarActionMenuIESub, ul.clickMenu li ul.subnav li a, ul.clickMenu li ul.subnav li input, ul.subnav-sub li a, ul.SugarActionMenuIESub li a{

background:#<?php echo $sugar_config['theme_settings']['SuiteR']['action_menu_background']; ?> !important;

}

ul.clickMenu li ul.subnav li a:hover,ul.clickMenu li ul.subnav li input:hover, ul.clickMenu.subpanel.records li ul.subnav li a:hover, ul.clickMenu ul.subnav-sub li a:hover, ul.clickMenu ul.subnav-sub li a:hover{

background:#<?php echo $sugar_config['theme_settings']['SuiteR']['action_menu_background_hover']; ?> !important;

}

/* Icon CSS */

.icon{
fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon']; ?> !important;
Expand All @@ -93,8 +108,7 @@
.btn:hover, .btn-success:hover, .btn-primary:hover, .button:hover, input[type=submit]:hover, input[type=button]:hover, a#create_link.utilsLink:hover, .btn-group a:hover, #globalLinksModule ul.clickMenu.SugarActionMenu li a:hover,
#globalLinksModule ul.clickMenu li:hover span,
ul.SugarActionMenuIESub li a:hover, ul.clickMenu.SugarActionMenu li a:hover, ul.clickMenu.SugarActionMenu li span.subhover:hover,
ul#globalLinksSubnav li a:hover, ul#quickCreateULSubnav li a:hover,
ul.clickMenu li ul.subnav li a:hover,ul.clickMenu li ul.subnav li input:hover, ul.clickMenu.subpanel.records li ul.subnav li a:hover, ul.clickMenu ul.subnav-sub li a:hover {
ul#globalLinksSubnav li a:hover, ul#quickCreateULSubnav li a:hover {
background:#<?php echo $sugar_config['theme_settings']['SuiteR']['button_hover']; ?> !important;
color:#<?php echo $sugar_config['theme_settings']['SuiteR']['button_link_hover']; ?> !important;
}
12 changes: 12 additions & 0 deletions themes/SuiteR/themedef.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@
'default' => '#ffffff'
),

'action_menu_background' => array(
'vname' => 'LBL_ACTION_MENU_BACKGROUND',
'type' => 'colour',
'default' => '#ffffff'
),

'action_menu_background_hover' => array(
'vname' => 'LBL_ACTION_MENU_BACKGROUND_HOVER',
'type' => 'colour',
'default' => '#3C8DBC'
),

'button' => array(
'vname' => 'LBL_COLOUR_ADMIN_BTNTOP',
'type' => 'colour',
Expand Down

0 comments on commit 2b30827

Please sign in to comment.