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

38303dd9 · Mark Otto · bbadd429 · 38303dd9 · 38303dd9 · 38303dd9
Commit 38303dd9 authored Sep 12, 2012 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5798 deletions

docs/assets/css/bootstrap.css docs/assets/css/bootstrap.css +0 -5788

less/mixins.less less/mixins.less +5 -7

less/navbar.less less/navbar.less +3 -3

No files found.
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
--- 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, ...){
+.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

--- 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);