Skip to content
GitLab
Commit 546b2cc6 authored by Julian Thilo's avatar Julian Thilo
Browse files

Fix some forgotten things for navbar-default 

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