mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Fix some forgotten things for navbar-default

Browse Source 
New variable names were missing here and there.
This commit is contained in:
Julian Thilo
2013-08-18 23:30:40 +02:00
parent abca00870f
commit 546b2cc614
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/navbar.less
+34 -34
View File
@@ -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;
}
}