Skip to content

B
bootstrap
Commit d9cd5e4e authored by Chris Rebert's avatar Chris Rebert Committed by Chris Rebert
Browse files
Options

more nesting in navbar.less

parent 084291aa
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 57 deletions
docs/assets/css/bootstrap.css
View file @ d9cd5e4e
...@@ -2948,11 +2948,6 @@ button.close { ...@@ -2948,11 +2948,6 @@ button.close {
background-color: #d5d5d5; background-color: #d5d5d5;
} }
.navbar-nav > .dropdown > a .caret {
border-top-color: #777777;
border-bottom-color: #777777;
}
.navbar-nav > .open > a .caret, .navbar-nav > .open > a .caret,
.navbar-nav > .open > a:hover .caret, .navbar-nav > .open > a:hover .caret,
.navbar-nav > .open > a:focus .caret { .navbar-nav > .open > a:focus .caret {
...@@ -2960,6 +2955,11 @@ button.close { ...@@ -2960,6 +2955,11 @@ button.close {
border-bottom-color: #555555; border-bottom-color: #555555;
} }
.navbar-nav > .dropdown > a .caret {
border-top-color: #777777;
border-bottom-color: #777777;
}
.navbar-nav.pull-right > li > .dropdown-menu, .navbar-nav.pull-right > li > .dropdown-menu,
.navbar-nav > li > .dropdown-menu.pull-right { .navbar-nav > li > .dropdown-menu.pull-right {
right: 0; right: 0;
......
less/navbar.less
View file @ d9cd5e4e
...@@ -30,23 +30,27 @@ ...@@ -30,23 +30,27 @@
color: @navbar-link-color; color: @navbar-link-color;
line-height: 20px; line-height: 20px;
border-radius: @border-radius-base; border-radius: @border-radius-base;
&:hover,
&:focus {
color: @navbar-link-hover-color;
background-color: @navbar-link-hover-bg;
}
} }
> li > a:hover, > .active > a {
> li > a:focus { &,
color: @navbar-link-hover-color; &:hover,
background-color: @navbar-link-hover-bg; &:focus {
} color: @navbar-link-active-color;
> .active > a, background-color: @navbar-link-active-bg;
> .active > a:hover, }
> .active > a:focus {
color: @navbar-link-active-color;
background-color: @navbar-link-active-bg;
} }
> .disabled > a, > .disabled > a {
> .disabled > a:hover, &,
> .disabled > a:focus { &:hover,
color: @navbar-link-disabled-color; &:focus {
background-color: @navbar-link-disabled-bg; color: @navbar-link-disabled-color;
background-color: @navbar-link-disabled-bg;
}
} }
// Right aligned contents // Right aligned contents
...@@ -168,22 +172,22 @@ ...@@ -168,22 +172,22 @@
} }
// Remove background color from open dropdown // Remove background color from open dropdown
> .open > a, > .open > a {
> .open > a:hover, &,
> .open > a:focus { &:hover,
background-color: @navbar-link-active-bg; &:focus {
color: @navbar-link-active-color; background-color: @navbar-link-active-bg;
color: @navbar-link-active-color;
.caret {
border-top-color: @navbar-link-active-color;
border-bottom-color: @navbar-link-active-color;
}
}
} }
> .dropdown > a .caret { > .dropdown > a .caret {
border-top-color: @navbar-link-color; border-top-color: @navbar-link-color;
border-bottom-color: @navbar-link-color; border-bottom-color: @navbar-link-color;
} }
> .open > a .caret,
> .open > a:hover .caret,
> .open > a:focus .caret {
border-top-color: @navbar-link-active-color;
border-bottom-color: @navbar-link-active-color;
}
} }
// Right aligned menus need alt position // Right aligned menus need alt position
...@@ -217,23 +221,28 @@ ...@@ -217,23 +221,28 @@
.navbar-nav { .navbar-nav {
> li > a { > li > a {
color: @navbar-inverse-link-color; color: @navbar-inverse-link-color;
&:hover,
&:focus {
color: @navbar-inverse-link-hover-color;
background-color: @navbar-inverse-link-hover-bg;
}
} }
> li > a:hover, > .active > a {
> li > a:focus { &,
color: @navbar-inverse-link-hover-color; &:hover,
background-color: @navbar-inverse-link-hover-bg; &:focus {
} color: @navbar-inverse-link-active-color;
> .active > a, background-color: @navbar-inverse-link-active-bg;
> .active > a:hover, }
> .active > a:focus {
color: @navbar-inverse-link-active-color;
background-color: @navbar-inverse-link-active-bg;
} }
> .disabled > a, > .disabled > a {
> .disabled > a:hover, &,
> .disabled > a:focus { &:hover,
color: @navbar-inverse-link-disabled-color; &:focus {
background-color: @navbar-inverse-link-disabled-bg; color: @navbar-inverse-link-disabled-color;
background-color: @navbar-inverse-link-disabled-bg;
}
} }
} }
...@@ -251,11 +260,13 @@ ...@@ -251,11 +260,13 @@
// Dropdowns // Dropdowns
.navbar-nav { .navbar-nav {
> .open > a, > .open > a {
> .open > a:hover, &,
> .open > a:focus { &:hover,
background-color: @navbar-inverse-link-active-bg; &:focus {
color: @navbar-inverse-link-active-color; background-color: @navbar-inverse-link-active-bg;
color: @navbar-inverse-link-active-color;
}
} }
> .dropdown > a:hover .caret { > .dropdown > a:hover .caret {
border-top-color: @navbar-inverse-link-hover-color; border-top-color: @navbar-inverse-link-hover-color;
...@@ -265,13 +276,16 @@ ...@@ -265,13 +276,16 @@
border-top-color: @navbar-inverse-link-color; border-top-color: @navbar-inverse-link-color;
border-bottom-color: @navbar-inverse-link-color; border-bottom-color: @navbar-inverse-link-color;
} }
> .open > a .caret, > .open > a {
> .open > a:hover .caret, &,
> .open > a:focus .caret { &:hover,
border-top-color: @navbar-inverse-link-active-color; &:focus {
border-bottom-color: @navbar-inverse-link-active-color; .caret {
border-top-color: @navbar-inverse-link-active-color;
border-bottom-color: @navbar-inverse-link-active-color;
}
}
} }
} }
} }
......
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