diff options
| author | Mark Otto <[email protected]> | 2012-09-12 15:53:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-12 15:53:29 -0700 |
| commit | 38303dd9975a8f1bca89b9f0f8ef06a26dd3f1e0 (patch) | |
| tree | 51043529b214b60da997786998bc8cb85aaee834 /less | |
| parent | bbadd429a8e4704c55ac0d9a228decf4a77f484a (diff) | |
| download | bootstrap-38303dd9975a8f1bca89b9f0f8ef06a26dd3f1e0.tar.xz bootstrap-38303dd9975a8f1bca89b9f0f8ef06a26dd3f1e0.zip | |
revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 12 | ||||
| -rw-r--r-- | less/navbar.less | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/less/mixins.less b/less/mixins.less index 67f1c0af7..9204d8cde 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -183,7 +183,7 @@ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)"); } } // Give a small background color for input-prepend/-append @@ -248,12 +248,10 @@ } // Drop shadows -.box-shadow(@shadowA, @shadowB:X, ...){ - // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ - @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; - -webkit-box-shadow: @props; - -moz-box-shadow: @props; - box-shadow: @props; +.box-shadow(@shadow){ + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; } // Transitions diff --git a/less/navbar.less b/less/navbar.less index c1203df35..25651b14a 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -202,7 +202,7 @@ .navbar-fixed-top, .navbar-static-top { .navbar-inner { - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)); + .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)"); } } @@ -210,7 +210,7 @@ .navbar-fixed-bottom { bottom: 0; .navbar-inner { - .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)); + .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)"); } } @@ -446,7 +446,7 @@ color: @white; background-color: @navbarInverseSearchBackground; border-color: @navbarInverseSearchBorder; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)); + .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); .transition(none); .placeholder(@navbarInverseSearchPlaceholderColor); |