Fix whitelabel styling after updates

This commit is contained in:
Brett Sun 2016-06-09 11:09:43 +02:00
parent 9d89b0b7ca
commit 4a6d601dcb
7 changed files with 418 additions and 336 deletions

View File

@ -53,69 +53,40 @@ $vivi23--highlight-color: #de2600;
/** Navbar **/ /** Navbar **/
.navbar-default { .navbar-default {
background-color: $vivi23--nav-fg-prim-color; background-color: $vivi23--nav-fg-prim-color;
.navbar-brand .icon-ascribe-logo {
color: $vivi23--bg-color;
&:hover {
color: darken($vivi23--bg-color, 20%);
}
}
} }
.navbar-nav > li > a, .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a:focus, .navbar-nav > li > a {
.navbar-nav > li > .active a,
.navbar-nav > li > .active a:focus {
color: $vivi23--nav-bg-color; color: $vivi23--nav-bg-color;
&:focus,
&:hover {
color: darken($vivi23--nav-bg-color, 20%);
}
} }
.navbar-nav > li > a:hover { .navbar-nav > li.active > a {
color: darken($vivi23--nav-bg-color, 20%);
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
background-color: $vivi23--nav-fg-prim-color; background-color: $vivi23--nav-fg-prim-color;
border-bottom-color: $vivi23--nav-bg-color; border-bottom-color: $vivi23--nav-bg-color;
color: $vivi23--nav-bg-color; color: $vivi23--nav-bg-color;
}
.navbar-nav > .open > a, &:focus,
.dropdown-menu > .active > a, &:hover {
.dropdown-menu > li > a { color: $vivi23--nav-bg-color;
color: $vivi23--nav-fg-prim-color;
background-color: $vivi23--nav-bg-color;
}
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: lighten($vivi23--nav-fg-prim-color, 20%);
background-color: $vivi23--nav-highlight-color;
}
.navbar-collapse.collapsing,
.navbar-collapse.collapse.in {
background-color: $vivi23--nav-bg-color;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
background-color: $vivi23--nav-highlight-color;
} }
} }
.navbar-collapse.collapsing li a, .navbar-nav .open {
.navbar-collapse.collapse.in li a { .dropdown-toggle.btn {
color: $vivi23--nav-fg-prim-color; background-color: $vivi23--nav-bg-color;
} color: $vivi23--nav-fg-prim-color;
.navbar-collapse.collapse.in li a:not(.ascribe-powered-by):hover {
color: lighten($vivi23--nav-fg-prim-color, 20%); &:focus,
background-color: $vivi23--nav-highlight-color; &:hover {
background-color: $vivi23--nav-highlight-color;
color: lighten($vivi23--nav-fg-prim-color, 20%);
}
}
} }
.navbar-toggle { .navbar-toggle {
@ -124,15 +95,15 @@ $vivi23--highlight-color: #de2600;
.icon-bar { .icon-bar {
background-color: $vivi23--highlight-color; background-color: $vivi23--highlight-color;
} }
}
.navbar-toggle:hover, &:focus,
.navbar-toggle:focus { &:hover {
border-color: lighten($vivi23--highlight-color, 10%); border-color: lighten($vivi23--highlight-color, 10%);
background-color: $vivi23--nav-fg-prim-color; background-color: $vivi23--nav-fg-prim-color;
.icon-bar { .icon-bar {
background-color: lighten($vivi23--highlight-color, 10%); background-color: lighten($vivi23--highlight-color, 10%);
}
} }
} }
@ -152,6 +123,40 @@ $vivi23--highlight-color: #de2600;
} }
} }
/* For mobile toggled menu */
@media (max-width: 767px) {
.navbar-collapse {
background-color: $vivi23--nav-bg-color;
}
.navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $vivi23--nav-fg-prim-color;
&:hover {
background-color: $vivi23--nav-highlight-color;
color: lighten($vivi23--nav-fg-prim-color, 20%);
}
}
.navbar-nav .open .dropdown-menu > li > a {
color: $vivi23--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $vivi23--nav-highlight-color;
color: $vivi23--nav-fg-prim-color;
}
}
.navbar-nav > li.active > a,
.navbar-nav > li.active > a:hover,
.navbar-nav > li.active > a:focus, {
background-color: $vivi23--nav-highlight-color;
color: lighten($vivi23--nav-fg-prim-color, 20%);
}
}
/** Buttons **/ /** Buttons **/
// reset disabled button styling for btn-default // reset disabled button styling for btn-default
.btn-default.disabled, .btn-default.disabled,
@ -261,7 +266,7 @@ $vivi23--highlight-color: #de2600;
} }
// filter widget // filter widget
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;
color: $vivi23--button-default-color !important; color: $vivi23--button-default-color !important;

View File

@ -61,66 +61,47 @@ $artcity--ter-highlight-color: #EDEDF0;
.navbar-brand .icon-ascribe-logo { .navbar-brand .icon-ascribe-logo {
color: $artcity--nav-fg-prim-color; color: $artcity--nav-fg-prim-color;
&:focus,
&:hover { &:hover {
color: darken($artcity--nav-fg-prim-color, 20%); color: darken($artcity--nav-fg-prim-color, 20%);
} }
} }
} }
.navbar-nav > li > a, .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a:focus, .navbar-nav > li > a {
.navbar-nav > li > .active a,
.navbar-nav > li > .active a:focus {
color: $artcity--nav-fg-prim-color; color: $artcity--nav-fg-prim-color;
}
.navbar-nav > li > a:hover { &:focus,
color: darken($artcity--nav-fg-prim-color, 20%); &:hover {
} color: darken($artcity--nav-fg-prim-color, 20%);
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
background-color: $artcity--nav-bg-color;
border-bottom-color: $artcity--nav-fg-prim-color;
color: $artcity--nav-fg-prim-color;
}
.navbar-nav > .open > a,
.dropdown-menu > .active > a,
.dropdown-menu > li > a {
color: $artcity--nav-fg-prim-color;
background-color: $artcity--nav-bg-color;
}
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: lighten($artcity--nav-fg-prim-color, 20%);
background-color: $artcity--nav-highlight-color;
}
.navbar-collapse.collapsing,
.navbar-collapse.collapse.in {
background-color: $artcity--nav-bg-color;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
background-color: $artcity--nav-highlight-color;
} }
} }
.navbar-collapse.collapsing li a, .navbar-nav > li.active > a {
.navbar-collapse.collapse.in li a { background-color: $artcity--nav-bg-color;
border-bottom-color: $artcity--nav-fg-prim-color;
color: $artcity--nav-fg-prim-color; color: $artcity--nav-fg-prim-color;
&:focus,
&:hover {
color: $artcity--nav-fg-prim-color;
}
} }
.navbar-collapse.collapse.in li a:not(.ascribe-powered-by):hover {
color: lighten($artcity--nav-fg-prim-color, 20%); .navbar-nav .open {
background-color: $artcity--nav-highlight-color; .dropdown-toggle.btn,
.dropdown-menu a {
color: $artcity--nav-fg-prim-color;
background-color: $artcity--nav-bg-color;
&:focus,
&:hover {
background-color: $artcity--nav-highlight-color;
color: lighten($artcity--nav-fg-prim-color, 20%);
}
}
} }
.navbar-toggle { .navbar-toggle {
@ -129,15 +110,15 @@ $artcity--ter-highlight-color: #EDEDF0;
.icon-bar { .icon-bar {
background-color: $artcity--highlight-color; background-color: $artcity--highlight-color;
} }
}
.navbar-toggle:hover, &:focus,
.navbar-toggle:focus { &:hover {
border-color: lighten($artcity--highlight-color, 10%); background-color: $artcity--nav-fg-prim-color;
background-color: $artcity--nav-fg-prim-color; border-color: lighten($artcity--highlight-color, 10%);
.icon-bar { .icon-bar {
background-color: lighten($artcity--highlight-color, 10%); background-color: lighten($artcity--highlight-color, 10%);
}
} }
} }
@ -157,6 +138,41 @@ $artcity--ter-highlight-color: #EDEDF0;
} }
} }
/* For mobile toggled menu */
@media (max-width: 767px) {
.navbar-collapse {
background-color: $artcity--nav-bg-color;
}
.navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $artcity--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $artcity--nav-highlight-color;
color: lighten($artcity--nav-fg-prim-color, 20%);
}
}
.navbar-nav .open .dropdown-menu > li > a {
color: $artcity--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $artcity--nav-highlight-color;
color: $artcity--nav-fg-prim-color;
}
}
.navbar-nav > li.active > a,
.navbar-nav > li.active > a:hover,
.navbar-nav > li.active > a:focus, {
background-color: $artcity--nav-highlight-color;
color: lighten($artcity--nav-fg-prim-color, 20%);
}
}
/** Buttons **/ /** Buttons **/
// reset disabled button styling for btn-default // reset disabled button styling for btn-default
.btn-default.disabled, .btn-default.disabled,
@ -286,7 +302,7 @@ $artcity--ter-highlight-color: #EDEDF0;
} }
// filter widget // filter widget
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;
color: $artcity--button-default-color !important; color: $artcity--button-default-color !important;

View File

@ -8,50 +8,64 @@ $cc--button-color: $cc--nav-fg-prim-color;
box-shadow: none; box-shadow: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
} }
.navbar-nav > li > a,
.navbar-nav > li > .active a { .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $cc--nav-fg-prim-color; color: $cc--nav-fg-prim-color;
background-color: $cc--nav-bg-color; background-color: $cc--nav-bg-color;
&:focus,
&:hover {
color: lighten($cc--nav-fg-prim-color, 40%);
}
} }
.navbar-nav > li > a:hover {
color: lighten($cc--nav-fg-prim-color, 40%); .navbar-nav > li.active > a {
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
color: $cc--nav-fg-prim-color; color: $cc--nav-fg-prim-color;
border-bottom-color: $cc--nav-fg-prim-color; border-bottom-color: $cc--nav-fg-prim-color;
background-color: $cc--nav-bg-color; background-color: $cc--nav-bg-color;
&:focus,
&:hover {
color: $cc--nav-fg-prim-color;
}
} }
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus { .navbar-nav .open {
color: lighten($cc--nav-fg-prim-color, 40%); .dropdown-toggle.btn {
background-color: $cc--nav-bg-color; background-color: $cc--nav-bg-color;
} color: lighten($cc--nav-fg-prim-color, 40%);
.navbar-nav > .open > a,
.navbar-nav > .open > a:hover, &:focus,
.navbar-nav > .open > a:focus, &:hover {
.dropdown-menu > .active > a, background-color: $cc--nav-bg-color;
.dropdown-menu > .active > a:hover, color: lighten($cc--nav-fg-prim-color, 40%);
.dropdown-menu > .active > a:focus { }
color: lighten($cc--nav-fg-prim-color, 40%); }
background-color: $cc--nav-bg-color;
.dropdown-menu a {
color: $cc--nav-fg-prim-color;
&:focus,
&:hover {
color: lighten($cc--nav-fg-prim-color, 40%);
}
}
} }
.dropdown-menu { .dropdown-menu {
background-color: $cc--nav-bg-color; background-color: $cc--nav-bg-color;
} }
.dropdown-menu > li > a { .navbar-toggle {
color: $cc--nav-fg-prim-color; .icon-bar {
} background-color: $cc--nav-fg-prim-color;
}
.navbar-toggle .icon-bar { &:focus,
background-color: $cc--nav-fg-prim-color; &:hover {
} background-color: $cc--nav-bg-color;
}
.navbar-toggle:hover,
.navbar-toggle:focus {
background-color: $cc--nav-bg-color;
} }
} }
@ -111,7 +125,7 @@ $cc--button-color: $cc--nav-fg-prim-color;
// thought of the day: // thought of the day:
// "every great atrocity is the result of people just following orders" // "every great atrocity is the result of people just following orders"
.client--cc { .client--cc {
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
color: $cc--button-color !important; color: $cc--button-color !important;
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;

View File

@ -9,50 +9,65 @@ $cyland--button-sec-color: #515151;
box-shadow: none; box-shadow: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
} }
.navbar-nav > li > a,
.navbar-nav > li > .active a { .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $cyland--nav-fg-prim-color; color: $cyland--nav-fg-prim-color;
background-color: $cyland--nav-bg-color; background-color: $cyland--nav-bg-color;
&:focus,
&:hover {
color: lighten($cyland--nav-fg-prim-color, 40%);
}
} }
.navbar-nav > li > a:hover {
color: lighten($cyland--nav-fg-prim-color, 40%); .navbar-nav > li.active > a {
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
color: $cyland--nav-fg-prim-color; color: $cyland--nav-fg-prim-color;
border-bottom-color: $cyland--nav-fg-prim-color; border-bottom-color: $cyland--nav-fg-prim-color;
background-color: $cyland--nav-bg-color; background-color: $cyland--nav-bg-color;
&:focus,
&:hover {
color: $cyland--nav-fg-prim-color;
}
} }
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus { .navbar-nav .open {
color: lighten($cyland--nav-fg-prim-color, 40%); .dropdown-toggle.btn {
background-color: $cyland--nav-bg-color; background-color: $cyland--nav-bg-color;
} color: lighten($cyland--nav-fg-prim-color, 40%);
.navbar-nav > .open > a,
.navbar-nav > .open > a:hover, &:focus,
.navbar-nav > .open > a:focus, &:hover {
.dropdown-menu > .active > a, background-color: $cyland--nav-bg-color;
.dropdown-menu > .active > a:hover, color: lighten($cyland--nav-fg-prim-color, 40%);
.dropdown-menu > .active > a:focus { }
color: lighten($cyland--nav-fg-prim-color, 40%); }
background-color: $cyland--nav-bg-color;
.dropdown-menu a {
color: $cc--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $cyland--nav-bg-color;
color: lighten($cc--nav-fg-prim-color, 40%);
}
}
} }
.dropdown-menu { .dropdown-menu {
background-color: $cyland--nav-bg-color; background-color: $cyland--nav-bg-color;
} }
.dropdown-menu > li > a { .navbar-toggle {
color: $cyland--nav-fg-prim-color; .icon-bar {
} background-color: $cyland--nav-fg-prim-color;
}
.navbar-toggle .icon-bar { &:focus,
background-color: $cyland--nav-fg-prim-color; &:hover {
} background-color: $cyland--nav-bg-color;
}
.navbar-toggle:hover,
.navbar-toggle:focus {
background-color: $cyland--nav-bg-color;
} }
} }
@ -64,7 +79,7 @@ $cyland--button-sec-color: #515151;
// thought of the day: // thought of the day:
// "every great atrocity is the result of people just following orders" // "every great atrocity is the result of people just following orders"
.client--cyland { .client--cyland {
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
color: $cyland--button-color !important; color: $cyland--button-color !important;
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;

View File

@ -23,76 +23,77 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
background-color: $ikono--bg-color; background-color: $ikono--bg-color;
box-shadow: none; box-shadow: none;
.navbar-nav > li > a, .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > .active a { .navbar-nav > li > a {
text-transform: uppercase;
border-bottom-color: transparent; border-bottom-color: transparent;
color: white;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
.navbar-nav > li > a { .navbar-nav > li.active {
color: white;
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
color: black;
border-bottom-color: transparent;
background-color: transparent;
font-weight: bold;
}
.navbar-nav > .active {
background-color: white; background-color: white;
& > a {
color: black;
background-color: transparent;
border-bottom-color: transparent;
font-weight: bold;
}
} }
.navbar-toggle .icon-bar { .navbar-nav .open {
background-color: white; .dropdown-toggle.btn {
} background-color: $ikono--bg-color;
color: white;
.navbar-nav > .open > a, &:focus,
.navbar-nav > .open > a:hover, &:hover {
.navbar-nav > .open > a:focus, background-color: $ikono--bg-color;
.dropdown-menu > .active > a, color: white;
.dropdown-menu > .active > a:hover, }
.dropdown-menu > .active > a:focus { }
color: white;
background-color: $ikono--bg-color; .dropdown-menu a {
color: white;
&:focus,
&:hover {
background-color: white;
color: $ikono--bg-color;
}
}
} }
.dropdown-menu { .dropdown-menu {
background-color: $ikono--bg-color; background-color: $ikono--bg-color;
} }
.dropdown-menu > li > a { .navbar-toggle {
color: white; .icon-bar {
font-weight: bold;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: $ikono--bg-color;
background-color: white;
}
.notification-menu {
.dropdown-menu {
background-color: white; background-color: white;
li:hover { }
background-color: rgba($ikono--button-color, 0.1);
} &:focus,
&:hover {
background-color: rgba(255, 255, 255, 0.1);
} }
} }
.navbar-toggle:hover, .notification-menu .dropdown-menu {
.navbar-toggle:focus { background-color: white;
background-color: rgba(255, 255, 255, 0.1);
li:hover {
background-color: rgba($ikono--button-color, 0.1);
}
}
/* For mobile toggled menu */
@media (max-width: 767px) {
padding-bottom: 5px;
} }
} }
.client--ikonotv { .client--ikonotv {
.route--landing, .route--landing,
.route--login, .route--login,
@ -356,7 +357,7 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
// thought of the day: // thought of the day:
// "every great atrocity is the result of people just following orders" // "every great atrocity is the result of people just following orders"
.client--ikonotv { .client--ikonotv {
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
color: $ikono--button-color !important; color: $ikono--button-color !important;
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;

View File

@ -58,66 +58,47 @@ $market--highlight-color: #2882fa;
.navbar-brand .icon-ascribe-logo { .navbar-brand .icon-ascribe-logo {
color: $market--nav-fg-prim-color; color: $market--nav-fg-prim-color;
&:focus,
&:hover { &:hover {
color: darken($market--nav-fg-prim-color, 20%); color: darken($market--nav-fg-prim-color, 20%);
} }
} }
} }
.navbar-nav > li > a, .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a:focus, .navbar-nav > li > a {
.navbar-nav > li > .active a,
.navbar-nav > li > .active a:focus {
color: $market--nav-fg-prim-color; color: $market--nav-fg-prim-color;
}
.navbar-nav > li > a:hover { &:focus,
color: darken($market--nav-fg-prim-color, 20%); &:hover {
} color: darken($market--nav-fg-prim-color, 20%);
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
background-color: $market--nav-bg-color;
border-bottom-color: $market--nav-fg-prim-color;
color: $market--nav-fg-prim-color;
}
.navbar-nav > .open > a,
.dropdown-menu > .active > a,
.dropdown-menu > li > a {
color: $market--nav-fg-prim-color;
background-color: $market--nav-bg-color;
}
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: lighten($market--nav-fg-prim-color, 20%);
background-color: $market--nav-highlight-color;
}
.navbar-collapse.collapsing,
.navbar-collapse.collapse.in {
background-color: $market--nav-bg-color;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
background-color: $market--nav-highlight-color;
} }
} }
.navbar-collapse.collapsing li a, .navbar-nav > li.active > a {
.navbar-collapse.collapse.in li a { background-color: $market--nav-bg-color;
border-bottom-color: $market--nav-fg-prim-color;
color: $market--nav-fg-prim-color; color: $market--nav-fg-prim-color;
&:focus,
&:hover {
color: $market--nav-fg-prim-color;
}
} }
.navbar-collapse.collapse.in li a:not(.ascribe-powered-by):hover {
color: lighten($market--nav-fg-prim-color, 20%); .navbar-nav .open {
background-color: $market--nav-highlight-color; .dropdown-toggle.btn,
.dropdown-menu a {
background-color: $market--nav-bg-color;
color: $market--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $market--nav-highlight-color;
color: lighten($market--nav-fg-prim-color, 20%);
}
}
} }
.navbar-toggle { .navbar-toggle {
@ -126,15 +107,15 @@ $market--highlight-color: #2882fa;
.icon-bar { .icon-bar {
background-color: $market--highlight-color; background-color: $market--highlight-color;
} }
}
.navbar-toggle:hover, &:focus,
.navbar-toggle:focus { &:hover {
border-color: lighten($market--highlight-color, 10%); border-color: lighten($market--highlight-color, 10%);
background-color: $market--nav-fg-prim-color; background-color: $market--nav-fg-prim-color;
.icon-bar { .icon-bar {
background-color: lighten($market--highlight-color, 10%); background-color: lighten($market--highlight-color, 10%);
}
} }
} }
@ -154,6 +135,41 @@ $market--highlight-color: #2882fa;
} }
} }
/* For mobile toggled menu */
@media (max-width: 767px) {
.navbar-collapse {
background-color: $market--nav-bg-color;
}
.navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $market--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $market--nav-highlight-color;
color: lighten($market--nav-fg-prim-color, 20%);
}
}
.navbar-nav .open .dropdown-menu > li > a {
color: $market--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $market--nav-highlight-color;
color: $market--nav-fg-prim-color;
}
}
.navbar-nav > li.active > a,
.navbar-nav > li.active > a:hover,
.navbar-nav > li.active > a:focus, {
background-color: $market--nav-highlight-color;
color: lighten($market--nav-fg-prim-color, 20%);
}
}
/** Buttons **/ /** Buttons **/
// reset disabled button styling for btn-default // reset disabled button styling for btn-default
.btn-default.disabled, .btn-default.disabled,
@ -271,7 +287,7 @@ $market--highlight-color: #2882fa;
} }
// filter widget // filter widget
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;
color: $market--button-default-color !important; color: $market--button-default-color !important;

View File

@ -53,76 +53,56 @@ $polline--highlight-color: #2882fa;
.navbar-default { .navbar-default {
background-color: $polline--bg-color; background-color: $polline--bg-color;
.navbar-brand .img-brand {
height: 100%;
}
.navbar-brand { .navbar-brand {
padding: 0 5px 0 15px; padding: 0 5px 0 15px;
}
.navbar-brand .icon-ascribe-logo { .img-brand {
color: $polline--nav-fg-prim-color; height: 100%;
&:hover { }
color: darken($polline--nav-fg-prim-color, 20%);
.icon-ascribe-logo {
color: $polline--nav-fg-prim-color;
&:focus,
&:hover {
color: darken($polline--nav-fg-prim-color, 20%);
}
} }
} }
} }
.navbar-nav > li > a, .navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a:focus, .navbar-nav > li > a {
.navbar-nav > li > .active a,
.navbar-nav > li > .active a:focus {
color: $polline--nav-fg-prim-color; color: $polline--nav-fg-prim-color;
&:focus,
&:hover {
color: darken($polline--nav-fg-prim-color, 20%);
}
} }
.navbar-nav > li > a:hover { .navbar-nav > li.active > a {
color: darken($polline--nav-fg-prim-color, 20%);
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
background-color: $polline--nav-bg-color; background-color: $polline--nav-bg-color;
border-bottom-color: $polline--nav-fg-prim-color; border-bottom-color: $polline--nav-fg-prim-color;
color: $polline--nav-fg-prim-color; color: $polline--nav-fg-prim-color;
}
.navbar-nav > .open > a, &:focus,
.dropdown-menu > .active > a, &:hover {
.dropdown-menu > li > a { color: $polline--nav-fg-prim-color;
color: $polline--nav-fg-prim-color;
background-color: $polline--nav-bg-color;
}
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: lighten($polline--nav-fg-prim-color, 20%);
background-color: $polline--nav-highlight-color;
}
.navbar-collapse.collapsing,
.navbar-collapse.collapse.in {
background-color: $polline--nav-bg-color;
.navbar-nav > .open > a,
.navbar-nav > .active > a {
background-color: $polline--nav-highlight-color;
} }
} }
.navbar-collapse.collapsing li a, .navbar-nav .open {
.navbar-collapse.collapse.in li a { .dropdown-toggle.btn,
color: $polline--nav-fg-prim-color; .dropdown-menu a {
} color: $polline--nav-fg-prim-color;
.navbar-collapse.collapse.in li a:not(.ascribe-powered-by):hover {
color: lighten($polline--nav-fg-prim-color, 20%); &:focus,
background-color: $polline--nav-highlight-color; &:hover {
background-color: $polline--nav-highlight-color;
color: lighten($polline--nav-fg-prim-color, 20%);
}
}
} }
.navbar-toggle { .navbar-toggle {
@ -159,6 +139,41 @@ $polline--highlight-color: #2882fa;
} }
} }
/* For mobile toggled menu */
@media (max-width: 767px) {
.navbar-collapse {
background-color: $polline--nav-bg-color;
}
.navbar-nav .dropdown .dropdown-toggle.btn,
.navbar-nav > li > a {
color: $polline--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $polline--nav-highlight-color;
color: lighten($polline--nav-fg-prim-color, 20%);
}
}
.navbar-nav .open .dropdown-menu > li > a {
color: $polline--nav-fg-prim-color;
&:focus,
&:hover {
background-color: $polline--nav-highlight-color;
color: $polline--nav-fg-prim-color;
}
}
.navbar-nav > li.active > a,
.navbar-nav > li.active > a:hover,
.navbar-nav > li.active > a:focus, {
background-color: $polline--nav-highlight-color;
color: lighten($polline--nav-fg-prim-color, 20%);
}
}
/** Buttons **/ /** Buttons **/
// reset disabled button styling for btn-default // reset disabled button styling for btn-default
.btn-default.disabled, .btn-default.disabled,
@ -276,7 +291,7 @@ $polline--highlight-color: #2882fa;
} }
// filter widget // filter widget
.ascribe-piece-list-toolbar-widget button { .ascribe-piece-list-toolbar-widget.dropdown-toggle.btn {
background-color: transparent !important; background-color: transparent !important;
border-color: transparent !important; border-color: transparent !important;
color: $polline--button-default-color !important; color: $polline--button-default-color !important;