Skip to content

B
bootstrap
Commit 546b2cc6 authored by Julian Thilo's avatar Julian Thilo
Browse files
Options

Fix some forgotten things for navbar-default 

New variable names were missing here and there.
parent abca0087
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
less/navbar.less
View file @ 546b2cc6
......@@ -348,64 +348,64 @@
// Default navbar
.navbar-default {
background-color: @navbar-bg;
border-color: @navbar-border;
background-color: @navbar-default-bg;
border-color: @navbar-default-border;
.navbar-brand {
color: @navbar-brand-color;
color: @navbar-default-brand-color;
&:hover,
&:focus {
color: @navbar-brand-hover-color;
background-color: @navbar-brand-hover-bg;
color: @navbar-default-brand-hover-color;
background-color: @navbar-default-brand-hover-bg;
}
}
.navbar-text {
color: @navbar-color;
color: @navbar-default-color;
}
.navbar-nav {
> li > a {
color: @navbar-link-color;
color: @navbar-default-link-color;
&:hover,
&:focus {
color: @navbar-link-hover-color;
background-color: @navbar-link-hover-bg;
color: @navbar-default-link-hover-color;
background-color: @navbar-default-link-hover-bg;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: @navbar-link-active-color;
background-color: @navbar-link-active-bg;
color: @navbar-default-link-active-color;
background-color: @navbar-default-link-active-bg;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: @navbar-link-disabled-color;
background-color: @navbar-link-disabled-bg;
color: @navbar-default-link-disabled-color;
background-color: @navbar-default-link-disabled-bg;
}
}
}
.navbar-toggle {
border-color: @navbar-toggle-border-color;
border-color: @navbar-default-toggle-border-color;
&:hover,
&:focus {
background-color: @navbar-toggle-hover-bg;
background-color: @navbar-default-toggle-hover-bg;
}
.icon-bar {
background-color: @navbar-toggle-icon-bar-bg;
background-color: @navbar-default-toggle-icon-bar-bg;
}
}
.navbar-collapse,
.navbar-form {
border-color: darken(@navbar-bg, 7%);
border-color: darken(@navbar-default-bg, 7%);
}
// Dropdown menu items and carets
......@@ -413,8 +413,8 @@
// Caret should match text color on hover
> .dropdown > a:hover .caret,
> .dropdown > a:focus .caret {
border-top-color: @navbar-link-hover-color;
border-bottom-color: @navbar-link-hover-color;
border-top-color: @navbar-default-link-hover-color;
border-bottom-color: @navbar-default-link-hover-color;
}
// Remove background color from open dropdown
......@@ -422,17 +422,17 @@
&,
&:hover,
&:focus {
background-color: @navbar-link-active-bg;
color: @navbar-link-active-color;
background-color: @navbar-default-link-active-bg;
color: @navbar-default-link-active-color;
.caret {
border-top-color: @navbar-link-active-color;
border-bottom-color: @navbar-link-active-color;
border-top-color: @navbar-default-link-active-color;
border-bottom-color: @navbar-default-link-active-color;
}
}
}
> .dropdown > a .caret {
border-top-color: @navbar-link-color;
border-bottom-color: @navbar-link-color;
border-top-color: @navbar-default-link-color;
border-bottom-color: @navbar-default-link-color;
}
......@@ -440,27 +440,27 @@
// Dropdowns get custom display when collapsed
.open .dropdown-menu {
> li > a {
color: @navbar-link-color;
color: @navbar-default-link-color;
&:hover,
&:focus {
color: @navbar-link-hover-color;
background-color: @navbar-link-hover-bg;
color: @navbar-default-link-hover-color;
background-color: @navbar-default-link-hover-bg;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: @navbar-link-active-color;
background-color: @navbar-link-active-bg;
color: @navbar-default-link-active-color;
background-color: @navbar-default-link-active-bg;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: @navbar-link-disabled-color;
background-color: @navbar-link-disabled-bg;
color: @navbar-default-link-disabled-color;
background-color: @navbar-default-link-disabled-bg;
}
}
}
......@@ -473,9 +473,9 @@
// Add a class to ensure links outside the navbar nav are colored correctly.
.navbar-link {
color: @navbar-link-color;
color: @navbar-default-link-color;
&:hover {
color: @navbar-link-hover-color;
color: @navbar-default-link-hover-color;
}
}
......
less/theme.less
View file @ 546b2cc6
......@@ -93,13 +93,13 @@
// Basic navbar
.navbar {
#gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;);
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;);
border-radius: @navbar-border-radius;
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.box-shadow(@shadow);
.navbar-nav > .active > a {
background-color: @navbar-bg;
background-color: @navbar-default-bg;
}
}
.navbar-brand,
......
less/variables.less
View file @ 546b2cc6
......@@ -239,7 +239,7 @@
@navbar-margin-bottom: @line-height-computed;
@navbar-default-color: #777;
@navbar-default-bg: #f8f8f8;
@navbar-default-border: darken(@navbar-bg, 6.5%);
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
......@@ -249,13 +249,13 @@
@navbar-default-link-hover-color: #333;
@navbar-default-link-hover-bg: transparent;
@navbar-default-link-active-color: #555;
@navbar-default-link-active-bg: darken(@navbar-bg, 6.5%);
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent;
// Navbar brand label
@navbar-default-brand-color: @navbar-link-color;
@navbar-default-brand-hover-color: darken(@navbar-link-color, 10%);
@navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%);
@navbar-default-brand-hover-bg: transparent;
// Navbar toggle
......
Markdown is supported
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