1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-23 13:43:11 +02:00

change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation

This commit is contained in:
Mark Otto
2012-09-12 15:48:56 -07:00
parent 0489c708c7
commit bbadd429a8
6 changed files with 8 additions and 8 deletions

View File

@@ -120,7 +120,7 @@
.btn-group > .btn + .dropdown-toggle { .btn-group > .btn + .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 5px; *padding-top: 5px;
*padding-bottom: 5px; *padding-bottom: 5px;
} }
@@ -147,7 +147,7 @@
// Remove the gradient and set the same inset shadow as the :active state // Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle { .dropdown-toggle {
background-image: none; background-image: none;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
} }
// Keep the hover's background when dropdown is open // Keep the hover's background when dropdown is open

View File

@@ -24,7 +24,7 @@
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px); .border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love .ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
// Hover state // Hover state
&:hover { &:hover {
@@ -51,7 +51,7 @@
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
background-image: none; background-image: none;
outline: 0; outline: 0;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
} }
// Disabled state // Disabled state

View File

@@ -126,7 +126,7 @@ input[type="color"],
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
outline: 0; outline: 0;
outline: thin dotted \9; /* IE6-9 */ outline: thin dotted \9; /* IE6-9 */
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
} }
} }

View File

@@ -274,7 +274,7 @@
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
.buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
.box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
} }
.navbar .btn-navbar .icon-bar { .navbar .btn-navbar .icon-bar {
display: block; display: block;

View File

@@ -66,7 +66,7 @@
.transition(width .6s ease); .transition(width .6s ease);
} }
.progress .bar + .bar { .progress .bar + .bar {
.box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)); .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
} }
// Striped bars // Striped bars

View File

@@ -129,7 +129,7 @@
margin: (@baseLineHeight / 2) 0; margin: (@baseLineHeight / 2) 0;
border-top: 1px solid @navbarBackground; border-top: 1px solid @navbarBackground;
border-bottom: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground;
.box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
} }
.navbar-inverse .nav-collapse .navbar-form, .navbar-inverse .nav-collapse .navbar-form,
.navbar-inverse .nav-collapse .navbar-search { .navbar-inverse .nav-collapse .navbar-search {