Commit ab215a98 authored by maikelkoopman's avatar maikelkoopman
Browse files

DS-2906 by maikelkoopman: set correct default active color

parent 47e2f560
......@@ -155,8 +155,8 @@ blockquote {
}
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
color: #1a8dbe;
background-color: #f3f3f3;
color: #f3f3f3;
background-color: #1f1f1f;
}
.navbar-default .navbar-nav > li > a {
......@@ -165,23 +165,26 @@ blockquote {
}
.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
color: #1a8dbe;
background-color: #f3f3f3;
color: #f3f3f3;
background-color: #1f1f1f;
}
.navbar-default .navbar-nav > li > a:hover .navbar-nav__icon, .navbar-default .navbar-nav > li > a:focus .navbar-nav__icon {
fill: #1a8dbe;
fill: #f3f3f3;
}
.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
background-color: #f3f3f3;
color: #1a8dbe;
background-color: #1f1f1f;
color: #f3f3f3;
}
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
color: #1a8dbe;
fill: #1a8dbe;
background-color: #f3f3f3;
.navbar-default .navbar-nav > li > a.is-active, .navbar-default .navbar-nav > li > a.is-active:hover, .navbar-default .navbar-nav > li > a.is-active:focus,
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #f3f3f3;
fill: #f3f3f3;
background-color: #1f1f1f;
}
.navbar-nav__icon {
......@@ -211,7 +214,7 @@ blockquote {
color: #ffffff;
}
.navbar-collapse .dropdown-menu li a:hover, .navbar-collapse .dropdown-menu li a:focus {
color: #1a8dbe;
background-color: #f3f3f3;
color: #f3f3f3;
background-color: #1f1f1f;
}
}
......@@ -32,9 +32,9 @@
.navbar-default .navbar-nav > li > a.is-active,
.navbar-default .navbar-nav > li > a.is-active:hover,
.navbar-default .navbar-nav > li > a.is-active:focus {
color: #1a8dbe;
fill: #1a8dbe;
background-color: #f3f3f3;
color: #f3f3f3;
fill: #f3f3f3;
background-color: #1f1f1f;
}
.navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus {
......@@ -75,8 +75,8 @@
}
.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
background-color: #f3f3f3;
color: #1a8dbe;
background-color: #1f1f1f;
color: #f3f3f3;
}
.navbar-default .dropdown img {
......@@ -147,8 +147,8 @@
background-color: #1a8dbe;
}
.navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #1a8dbe;
background-color: #f3f3f3;
color: #f3f3f3;
background-color: #1f1f1f;
}
.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
color: #ccc;
......
......@@ -33,7 +33,7 @@ $info = [
'brand-link' => '#33b5e5',
'navbar-bg' => '#333333',
'navbar-text' => '#ffffff',
'navbar-active-bg' => '#1a8dbe',
'navbar-active-bg' => '#1f1f1f',
'navbar-active-text' => '#f3f3f3',
'navbar-sec-bg' => '#1f7ea7',
'navbar-sec-text' => '#f9f9f9',
......
......@@ -10,8 +10,8 @@ $navbar-default-bg: $gray-dark;
$navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: $gray-lighter;
$navbar-default-link-hover-bg: darken($brand-primary, 10%);
$navbar-default-link-active-color: darken($brand-primary, 10%);
$navbar-default-link-active-bg: $gray-lightest;
$navbar-default-link-active-color: #f3f3f3;
$navbar-default-link-active-bg: #1f1f1f;
$navbar-default-dropdown-link-active-color: $default-color;
$navbar-default-dropdown-link-active-bg: $gray-lighter;
$navbar-default-link-disabled-color: #ccc;
......
......@@ -194,6 +194,7 @@ blockquote {
}
}
> li > a.is-active,
> .active > a {
&,
&:hover,
......
......@@ -7,7 +7,7 @@ color_secondary: '#1f80aa'
color_accent: '#ffc142'
color_navbar_bg: '#333333'
color_navbar_text: '#ffffff'
color_navbar_active_bg': '#1a8dbe'
color_navbar_active_bg': '#1f1f1f'
color_navbar_active_text': '#f3f3f3'
color_navbar_sec_bg': '#1f7ea7'
color_navbar_sec_text': '#f9f9f9'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment