2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00

Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto
2013-07-25 10:11:30 -07:00
5 changed files with 114 additions and 22 deletions
+7 -7
View File
@@ -123,12 +123,12 @@
height: 32px;
padding: 8px 12px;
background-color: transparent;
border: 1px solid #ddd;
border-radius: 4px;
border: 1px solid @navbar-toggle-border-color;
border-radius: @border-radius-base;
&:hover,
&:focus {
background-color: #ddd;
background-color: @navbar-toggle-hover-bg;
}
// Bars
@@ -136,7 +136,7 @@
display: block;
width: 22px;
height: 2px;
background-color: #ccc;
background-color: @navbar-toggle-icon-bar-bg;
border-radius: 1px;
}
.icon-bar + .icon-bar {
@@ -250,13 +250,13 @@
// Darken the responsive nav toggle
.navbar-toggle {
border-color: #333;
border-color: @navbar-inverse-toggle-border-color;
&:hover,
&:focus {
background-color: #333;
background-color: @navbar-inverse-toggle-hover-bg;
}
.icon-bar {
background-color: #fff;
background-color: @navbar-inverse-toggle-icon-bar-bg;
}
}