mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 13:46:42 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-09-12 15:53:29 -07:00
parent bbadd429a8
commit 38303dd997
3 changed files with 8 additions and 5798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5788
docs/assets/css/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

12
less/mixins.less
View File

@@ -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 @@
} }
// 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

6
less/navbar.less
View File

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