diff options
| author | Mark Otto <[email protected]> | 2012-03-25 12:42:47 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-25 12:42:47 -0700 |
| commit | a5552a1d700a1caa2d87ea4bbccc59205b6e72f9 (patch) | |
| tree | d4fe028438ba26d839dbdca0a57d27a848aa7f5b /less | |
| parent | b81a082cd13759bd5f0ff2a90513a56d59ace313 (diff) | |
| download | bootstrap-a5552a1d700a1caa2d87ea4bbccc59205b6e72f9.tar.xz bootstrap-a5552a1d700a1caa2d87ea4bbccc59205b6e72f9.zip | |
revert bart's mixin fix
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 12 | ||||
| -rw-r--r-- | less/buttons.less | 10 | ||||
| -rw-r--r-- | less/forms.less | 5 | ||||
| -rw-r--r-- | less/mixins.less | 46 | ||||
| -rw-r--r-- | less/navbar.less | 1 |
5 files changed, 39 insertions, 35 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 81961123d..65c974a39 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 4381fe995..46115248c 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 e21845834..2164fe0ee 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 eb4e10379..e5471cabd 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 711e67f7a..7d82e84a0 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; |
