Skip to content

B
bootstrap
Commit a5552a1d authored by Mark Otto's avatar Mark Otto
Browse files
Options

revert bart's mixin fix

parent b81a082c
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 50 deletions
docs/assets/css/bootstrap.css
View file @ a5552a1d
...@@ -750,9 +750,9 @@ textarea { ...@@ -750,9 +750,9 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82, 168, 236, 0.8); 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); -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); -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); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0; outline: 0;
outline: thin dotted \9; outline: thin dotted \9;
/* IE6-9 */ /* IE6-9 */
...@@ -1995,9 +1995,9 @@ table .span24 { ...@@ -1995,9 +1995,9 @@ table .span24 {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
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); -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); -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); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
cursor: pointer; cursor: pointer;
*margin-left: .3em; *margin-left: .3em;
} }
...@@ -2034,9 +2034,9 @@ table .span24 { ...@@ -2034,9 +2034,9 @@ table .span24 {
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none; 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); -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); -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); 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: #e6e6e6;
background-color: #d9d9d9 \9; background-color: #d9d9d9 \9;
outline: 0; outline: 0;
...@@ -2361,9 +2361,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2361,9 +2361,9 @@ input[type="submit"].btn.btn-mini {
.btn-group .dropdown-toggle { .btn-group .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 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); -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); -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); 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-top: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
...@@ -2383,9 +2383,9 @@ input[type="submit"].btn.btn-mini { ...@@ -2383,9 +2383,9 @@ input[type="submit"].btn.btn-mini {
} }
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
background-image: none; 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); -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); -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); 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 { .btn-group.open .btn.dropdown-toggle {
background-color: #e6e6e6; background-color: #e6e6e6;
......
less/button-groups.less
View file @ a5552a1d
...@@ -93,9 +93,10 @@ ...@@ -93,9 +93,10 @@
.btn-group .dropdown-toggle { .btn-group .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125), @shadow: inset 1px 0 0 rgba(255,255,255,.125),
inset 0 1px 0 rgba(255,255,255,.2), inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05)); 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
*padding-top: 3px; *padding-top: 3px;
*padding-bottom: 3px; *padding-bottom: 3px;
} }
...@@ -120,8 +121,9 @@ ...@@ -120,8 +121,9 @@
// Remove the gradient and set the same inset shadow as the :active state // Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle { .dropdown-toggle {
background-image: none; background-image: none;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), @shadow: inset 0 2px 4px rgba(0,0,0,.15),
0 1px 2px rgba(0,0,0,.05)); 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
} }
// Keep the hover's background when dropdown is open // Keep the hover's background when dropdown is open
......
less/buttons.less
View file @ a5552a1d
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
border: 1px solid @btnBorder; border: 1px solid @btnBorder;
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px); .border-radius(4px);
.box-shadow(inset 0 1px 0 rgba(255,255,255,.2), @shadow: inset 0 1px 0 rgba(255,255,255,.2),
0 1px 2px rgba(0,0,0,.05)); 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
cursor: pointer; cursor: pointer;
// Give IE7 some love // Give IE7 some love
...@@ -50,8 +51,9 @@ ...@@ -50,8 +51,9 @@
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none; background-image: none;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), @shadow: inset 0 2px 4px rgba(0,0,0,.15),
0 1px 2px rgba(0,0,0,.05)); 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
outline: 0; outline: 0;
......
less/forms.less
View file @ a5552a1d
...@@ -213,8 +213,9 @@ textarea { ...@@ -213,8 +213,9 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), @shadow: inset 0 1px 1px rgba(0,0,0,.075),
0 0 8px rgba(82,168,236,.6)); 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
outline: 0; outline: 0;
outline: thin dotted \9; /* IE6-9 */ outline: thin dotted \9; /* IE6-9 */
} }
......
less/mixins.less
View file @ a5552a1d
...@@ -192,26 +192,26 @@ ...@@ -192,26 +192,26 @@
// -------------------------------------------------- // --------------------------------------------------
// Border Radius // Border Radius
.border-radius(@radius: 5px, ...) { .border-radius(@radius: 5px) {
-webkit-border-radius: @arguments; -webkit-border-radius: @radius;
-moz-border-radius: @arguments; -moz-border-radius: @radius;
border-radius: @arguments; border-radius: @radius;
} }
// Drop shadows // Drop shadows
.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25), ...) { .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
-webkit-box-shadow: @arguments; -webkit-box-shadow: @shadow;
-moz-box-shadow: @arguments; -moz-box-shadow: @shadow;
box-shadow: @arguments; box-shadow: @shadow;
} }
// Transitions // Transitions
.transition(@transition, ...) { .transition(@transition) {
-webkit-transition: @arguments; -webkit-transition: @transition;
-moz-transition: @arguments; -moz-transition: @transition;
-ms-transition: @arguments; -ms-transition: @transition;
-o-transition: @arguments; -o-transition: @transition;
transition: @arguments; transition: @transition;
} }
// Transformations // Transformations
...@@ -253,18 +253,18 @@ ...@@ -253,18 +253,18 @@
// Background clipping // Background clipping
// Heads up: FF 3.6 and under need "padding" instead of "padding-box" // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
.background-clip(@clip, ...) { .background-clip(@clip) {
-webkit-background-clip: @arguments; -webkit-background-clip: @clip;
-moz-background-clip: @arguments; -moz-background-clip: @clip;
background-clip: @arguments; background-clip: @clip;
} }
// Background sizing // Background sizing
.background-size(@size, ...){ .background-size(@size){
-webkit-background-size: @arguments; -webkit-background-size: @size;
-moz-background-size: @arguments; -moz-background-size: @size;
-o-background-size: @arguments; -o-background-size: @size;
background-size: @arguments; background-size: @size;
} }
......
less/navbar.less
View file @ a5552a1d
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
// Vertically center the text given @navbarHeight // Vertically center the text given @navbarHeight
@elementHeight: 20px; @elementHeight: 20px;
padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2); padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2);
margin-left: -20px; // negative indent to left-align the text down the page margin-left: -20px; // negative indent to left-align the text down the page
font-size: 20px; font-size: 20px;
font-weight: 200; font-weight: 200;
......
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