Commit 38303dd9 authored by Mark Otto's avatar Mark Otto

revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows

parent bbadd429
This diff is collapsed.
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus { &:focus {
border-color: darken(@borderColor, 10%); 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 // Give a small background color for input-prepend/-append
...@@ -248,12 +248,10 @@ ...@@ -248,12 +248,10 @@
} }
// Drop shadows // Drop shadows
.box-shadow(@shadowA, @shadowB:X, ...){ .box-shadow(@shadow){
// Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ -webkit-box-shadow: @shadow;
@props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; -moz-box-shadow: @shadow;
-webkit-box-shadow: @props; box-shadow: @shadow;
-moz-box-shadow: @props;
box-shadow: @props;
} }
// Transitions // Transitions
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
.navbar-fixed-top, .navbar-fixed-top,
.navbar-static-top { .navbar-static-top {
.navbar-inner { .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 @@ ...@@ -210,7 +210,7 @@
.navbar-fixed-bottom { .navbar-fixed-bottom {
bottom: 0; bottom: 0;
.navbar-inner { .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 @@ ...@@ -446,7 +446,7 @@
color: @white; color: @white;
background-color: @navbarInverseSearchBackground; background-color: @navbarInverseSearchBackground;
border-color: @navbarInverseSearchBorder; 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); .transition(none);
.placeholder(@navbarInverseSearchPlaceholderColor); .placeholder(@navbarInverseSearchPlaceholderColor);
......
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