Commit 86d1319c authored by chibaguy's avatar chibaguy

[FIX] More consistent and appropriate colors for menus.

parent be3933b4
......@@ -4,7 +4,7 @@
@import "../../../vendor/twitter/bootstrap/less/bootstrap.less";
@import "bootstrap-variables.less";
@import "tiki-selector-variables.less"; // Provides values for "legacy" Tiki CSS selectors (not covered by Bootstrap).
@import "../../base_files/less/tiki-color_selectors.less"; // Tiki non-Bootstrap CSS selectors related to color
//@import "../../base_files/less/tiki-color_selectors.less"; // Tiki non-Bootstrap CSS selectors related to color
@import "tiki-selectors.less";
@import "../../base_files/less/tablesorter-custom.less";
......@@ -7,6 +7,7 @@
//
// If Glyphicons should be rendered in a color other than the Bootstrap default or the theme default, uncomment and specify the color.
// .glyphicon {color: @gray-lighter;}
@imagePath: ~"../images/";
.middle_outer {
......@@ -23,15 +24,69 @@
background: #ffffff;
}
// @navbar-default-link-background: #bfbd23;
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: @navbar-default-navbar-nav-li-a-background; // #cdbe23;
}
//.navbar-default .navbar-nav > li > a:hover {
// background: lighten(@navbar-default-navbar-nav-li-a-background, 5%);
//}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0; // override default ul
// font-size: @font-size-base;
background-color: @navbar-default-navbar-nav-li-a-background;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border;
// border-radius: @border-radius-base;
.box-shadow(0 6px 12px rgba(0,0,0,.175));
background-clip: padding-box;
// Links within the dropdown menu
> li > a {
padding: 3px 20px;
font-weight: normal;
// line-height: @line-height-base;
color: @dropdown-link-color;
background: @dropdown-bg;
}
}
// Hover/Focus state
.cssmenu_horiz > li > a,
.cssmenu_vert > li > a,
.cssmenu_horiz ul > li > a,
.cssmenu_vert ul > li > a {
&:hover,
&:focus {
text-decoration: none;
color: @dropdown-link-hover-color;
background-color: @dropdown-link-hover-bg; //@dropdown-link-hover-bg;
}
}
.topbar .navbar {margin-bottom: 0;}
.topbar .cssmenu_horiz li a:hover {
background: @navbar-default-link-hover-bg;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: @navbar-default-link-color;
background: @navbar-default-navbar-nav-li-a-background;
}
#col2 .panel,
#col3 .panel,
#bottom_modules .panel {
......@@ -122,16 +177,6 @@ textarea,
// padding-top: 5px;
// }
// @navbar-default-link-background: #bfbd23;
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: @navbar-default-navbar-nav-li-a-background; // #cdbe23;
}
.navbar-default .navbar-nav > li > a:hover {
background: lighten(@navbar-default-navbar-nav-li-a-background, 5%);
}
.postbody-title {
background: @postbody-title-background; //url('@{imagePath}siteheader.png') no-repeat -480px -200px;
......
......@@ -294,7 +294,7 @@ hr {
border-color: #0d5865;
}
.dropdown-menu {
background-color: #005064;
background-color: #18a3bb;
border: 1px solid rgba(0, 0, 0, 0.15);
}
.dropdown-menu > li > a {
......@@ -546,14 +546,55 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #19a5be;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #19a5be;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #18a3bb;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #003c4a;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #14899e;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
background: #19a5be;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +672,6 @@ textarea,
.footer_liner a:visited {
color: #19a5be;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #19a5be;
}
.navbar-default .navbar-nav > li > a:hover {
background: #1cb9d5;
}
.postbody-title {
background: url('../images/siteheader.png') no-repeat -480px -200px;
}
......
......@@ -10,3 +10,4 @@
// These files are used/shared by all FiveAlive/FiveAlive-lite theme options:
@import "../../../less/bootstrap-less-for-options.less"; // Contains relevant Bootstrap .less file sections to expose variables for the theme options to provide values for.]
@import "../../../less/tiki-selectors-for-options.less"; // Contains CSS for styling Tiki elements not covered by Bootstrap.
......@@ -208,7 +208,7 @@
//## Dropdown menu container and contents.
//** Background for the dropdown menu.
@dropdown-bg: #005064;
@dropdown-bg: @navbar-default-bg; // #005064;
//** Dropdown menu `border-color`.
@dropdown-border: rgba(0,0,0,.15);
//** Dropdown menu `border-color` **for IE8**.
......
......@@ -546,14 +546,54 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #a82a76;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #a82a76;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #3b284a;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #2e1f39;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #8d2363;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +671,6 @@ textarea,
.footer_liner a:visited {
color: #a52873;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #a82a76;
}
.navbar-default .navbar-nav > li > a:hover {
background: #bc2f84;
}
.postbody-title {
background: url('../images/siteheader.png') no-repeat -480px -200px;
}
......
......@@ -546,14 +546,55 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #e9db15;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #e9db15;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #658838;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #587631;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #a09d1e;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
background: #e9db15;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +672,6 @@ textarea,
.footer_liner a:visited {
color: #a9a9a9;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #cdbe23;
}
.navbar-default .navbar-nav > li > a:hover {
background: #dbcc2e;
}
.postbody-title {
background: url('../images/siteheader.png') no-repeat -480px -200px;
}
......@@ -656,12 +689,12 @@ textarea,
color: #638637;
}
.secondary_site_menu .navbar-default .navbar-nav li ul li a {
background: #cdbe23;
background: #e9db15;
color: #fff;
}
.secondary_site_menu .navbar-default .navbar-nav li ul li a:hover,
.secondary_site_menu .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover {
background: #b3a61f;
background: #cdc112;
color: #fff;
}
.siteloginbar_popup .dropdown-menu > li > a {
......
......@@ -15,7 +15,7 @@
@footer-color: #696969;
@footer-border-color: #ebdc14;
@footer-link-color: #a9a9a9;
@navbar-default-navbar-nav-li-a-background: #cdbe23;
@navbar-default-navbar-nav-li-a-background: #e9db15; // #cdbe23;
@postbody-title-background: url('@{imagePath}siteheader.png') no-repeat -480px -200px;
// @brand-primary-of-option: @brand-primary;
......
......@@ -546,14 +546,55 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #ffc506;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #ffc506;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #c75a29;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #b25025;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #e4af00;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
background: #ffc506;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +672,6 @@ textarea,
.footer_liner a:visited {
color: #ffc506;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #ffc506;
}
.navbar-default .navbar-nav > li > a:hover {
background: #ffcb20;
}
.postbody-title {
background: url('../images/siteheader.png') no-repeat -480px -200px;
}
......@@ -704,12 +737,3 @@ header.header .sitesubtitle {
background-color: #b25025;
color: #f2f2f2;
}
header.header .sitetitle,
header.header .sitesubtitle {
color: #c75a28;
text-shadow: none;
}
header.header a,
header.header a:visited {
color: #c75a28;
}
......@@ -13,12 +13,12 @@
@import "../../../less/tiki-selectors-for-options.less"; // Contains CSS for styling Tiki elements not covered by Bootstrap.
// This comes last to enable site title color of theme options under FiveAlive-lite to have priority over the default set by FiveAlive.
header.header {
.sitetitle,
.sitesubtitle {
color: @brand-primary;
text-shadow: none;}
a,
a:visited {color: @brand-primary;
}
}
\ No newline at end of file
//header.header {
// .sitetitle,
// .sitesubtitle {
// color: @brand-primary;
// text-shadow: none;}
// a,
// a:visited {color: @brand-primary;
// }
//}
\ No newline at end of file
......@@ -546,14 +546,55 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #ec6223;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #ec6223;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #c44a23;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #ae421f;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #e36732;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
background: #ec6223;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +672,6 @@ textarea,
.footer_liner a:visited {
color: #a9a9a9;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #e77d4f;
}
.navbar-default .navbar-nav > li > a:hover {
background: #ea8e65;
}
.postbody-title {
background: url('../images/siteheader.png') no-repeat -480px -200px;
}
......@@ -656,12 +689,12 @@ textarea,
color: #c74b23;
}
.secondary_site_menu .navbar-default .navbar-nav li ul li a {
background: #e77d4f;
background: #ec6223;
color: #fff;
}
.secondary_site_menu .navbar-default .navbar-nav li ul li a:hover,
.secondary_site_menu .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover {
background: #e36934;
background: #dd5213;
color: #fff;
}
.siteloginbar_popup .dropdown-menu > li > a {
......
......@@ -15,7 +15,7 @@
@footer-color: #696969;
@footer-border-color: #ebdc14;
@footer-link-color: #a9a9a9;
@navbar-default-navbar-nav-li-a-background: #e77d4f;
@navbar-default-navbar-nav-li-a-background: #ec6223;
@postbody-title-background: url('@{imagePath}siteheader.png') no-repeat -480px -200px;
// @brand-primary-of-option: @brand-primary;
......
......@@ -546,14 +546,55 @@ hr {
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #15001f;
}
.cssmenu_horiz li ul,
.cssmenu_vert li ul {
padding: 5px 0;
margin: 2px 0 0;
background-color: #15001f;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
background-clip: padding-box;
}
.cssmenu_horiz li ul > li > a,
.cssmenu_vert li ul > li > a {
padding: 3px 20px;
font-weight: normal;
color: #ffffff;
background: #49006c;
}
.cssmenu_horiz > li > a:hover,
.cssmenu_vert > li > a:hover,
.cssmenu_horiz ul > li > a:hover,
.cssmenu_vert ul > li > a:hover,
.cssmenu_horiz > li > a:focus,
.cssmenu_vert > li > a:focus,
.cssmenu_horiz ul > li > a:focus,
.cssmenu_vert ul > li > a:focus {
text-decoration: none;
color: #f2f2f2;
background-color: #380052;
}
.topbar .navbar {
margin-bottom: 0;
}
.topbar .cssmenu_horiz li a:hover {
background: #5a0186;
}
.topbar .navbar-nav > li > a,
.topbar .navbar > li > a {
.topbar .navbar > li > a,
.topbar .cssmenu_horiz > li > a {
padding-top: 4px;
padding-bottom: 4px;
line-height: 1;
color: #ffffff;
background: #15001f;
}
#col2 .panel,
#col3 .panel,
......@@ -631,14 +672,6 @@ textarea,
.footer_liner a:visited {
color: #ce57df;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
background: #49006c;
}
.navbar-default .navbar-nav > li > a:hover {
background: #5a0086;
}
.postbody-title {
background: url('../images/siteheader.jpg') no-repeat -480px -200px;
}
......@@ -656,12 +689,12 @@ textarea,
color: #7a04b5;
}
.secondary_site_menu .navbar-default .navbar-nav li ul li a {
background: #49006c;
background: #15001f;
color: #fff;