diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 582dc53482..fbf2c75066 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1c80a05d7a..c1d995e307 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -750,9 +750,9 @@ textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; outline: thin dotted \9; /* IE6-9 */ @@ -1995,9 +1995,9 @@ table .span24 { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; *margin-left: .3em; } @@ -2034,9 +2034,9 @@ table .span24 { .btn.active, .btn:active { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; outline: 0; @@ -2361,9 +2361,9 @@ input[type="submit"].btn.btn-mini { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); *padding-top: 3px; *padding-bottom: 3px; } @@ -2383,9 +2383,9 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .btn.dropdown-toggle { background-color: #e6e6e6; diff --git a/less/button-groups.less b/less/button-groups.less index 81961123d3..65c974a394 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -93,9 +93,10 @@ .btn-group .dropdown-toggle { padding-left: 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)); + @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(@shadow); *padding-top: 3px; *padding-bottom: 3px; } @@ -120,8 +121,9 @@ // Remove the gradient and set the same inset shadow as the :active state .dropdown-toggle { background-image: none; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), - 0 1px 2px rgba(0,0,0,.05)); + @shadow: inset 0 2px 4px rgba(0,0,0,.15), + 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); } // Keep the hover's background when dropdown is open diff --git a/less/buttons.less b/less/buttons.less index 4381fe9957..46115248cf 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -21,8 +21,9 @@ border: 1px solid @btnBorder; border-bottom-color: darken(@btnBorder, 10%); .border-radius(4px); - .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), - 0 1px 2px rgba(0,0,0,.05)); + @shadow: inset 0 1px 0 rgba(255,255,255,.2), + 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); cursor: pointer; // Give IE7 some love @@ -50,8 +51,9 @@ .btn.active, .btn:active { background-image: none; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), - 0 1px 2px rgba(0,0,0,.05)); + @shadow: inset 0 2px 4px rgba(0,0,0,.15), + 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); background-color: darken(@white, 10%); background-color: darken(@white, 15%) e("\9"); outline: 0; diff --git a/less/forms.less b/less/forms.less index e21845834f..2164fe0ee6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -213,8 +213,9 @@ textarea { input:focus, textarea:focus { border-color: rgba(82,168,236,.8); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), - 0 0 8px rgba(82,168,236,.6)); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), + 0 0 8px rgba(82,168,236,.6); + .box-shadow(@shadow); outline: 0; outline: thin dotted \9; /* IE6-9 */ } diff --git a/less/mixins.less b/less/mixins.less index eb4e103792..e5471cabdd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -192,26 +192,26 @@ // -------------------------------------------------- // Border Radius -.border-radius(@radius: 5px, ...) { - -webkit-border-radius: @arguments; - -moz-border-radius: @arguments; - border-radius: @arguments; +.border-radius(@radius: 5px) { + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; } // Drop shadows -.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25), ...) { - -webkit-box-shadow: @arguments; - -moz-box-shadow: @arguments; - box-shadow: @arguments; +.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; } // Transitions -.transition(@transition, ...) { - -webkit-transition: @arguments; - -moz-transition: @arguments; - -ms-transition: @arguments; - -o-transition: @arguments; - transition: @arguments; +.transition(@transition) { + -webkit-transition: @transition; + -moz-transition: @transition; + -ms-transition: @transition; + -o-transition: @transition; + transition: @transition; } // Transformations @@ -253,18 +253,18 @@ // Background clipping // Heads up: FF 3.6 and under need "padding" instead of "padding-box" -.background-clip(@clip, ...) { - -webkit-background-clip: @arguments; - -moz-background-clip: @arguments; - background-clip: @arguments; +.background-clip(@clip) { + -webkit-background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; } // Background sizing -.background-size(@size, ...){ - -webkit-background-size: @arguments; - -moz-background-size: @arguments; - -o-background-size: @arguments; - background-size: @arguments; +.background-size(@size){ + -webkit-background-size: @size; + -moz-background-size: @size; + -o-background-size: @size; + background-size: @size; } diff --git a/less/navbar.less b/less/navbar.less index 711e67f7ad..7d82e84a02 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -73,7 +73,6 @@ // Vertically center the text given @navbarHeight @elementHeight: 20px; padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2); - margin-left: -20px; // negative indent to left-align the text down the page font-size: 20px; font-weight: 200;