aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-23 20:56:04 -0700
committerMark Otto <[email protected]>2012-03-23 20:56:04 -0700
commitc7afe382a26834cce5b8bf2fc7333ce7e945a2d4 (patch)
treef5a0f1b3db460d5a5593c8ef0aad71ade8cb502e
parent035b85eebaaec9dded4c46b8864c63ff20bdd4fd (diff)
downloadbootstrap-c7afe382a26834cce5b8bf2fc7333ce7e945a2d4.tar.xz
bootstrap-c7afe382a26834cce5b8bf2fc7333ce7e945a2d4.zip
fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition
-rw-r--r--docs/assets/bootstrap.zipbin55592 -> 55591 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css4
-rw-r--r--docs/assets/css/bootstrap.css30
-rw-r--r--less/button-groups.less9
-rw-r--r--less/buttons.less8
-rw-r--r--less/forms.less4
-rw-r--r--less/mixins.less20
7 files changed, 38 insertions, 37 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d6ecc5869..03259655f 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index d9fa91d6c..0bc6de916 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,9 +169,9 @@
width: 100%;
min-height: 28px;
/* Make inputs at least the height of their button counterpart */
-
+
/* Makes inputs behave like true block-level elements */
-
+
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 495188af7..624f599ef 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -748,9 +748,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 */
@@ -1990,9 +1990,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;
}
@@ -2029,9 +2029,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;
@@ -2356,9 +2356,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;
}
@@ -2388,9 +2388,9 @@ input[type="submit"].btn.btn-mini {
}
.btn-group.open .dropdown-toggle {
background-image: none;
- -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn .caret {
margin-top: 7px;
diff --git a/less/button-groups.less b/less/button-groups.less
index d3e7a7490..d4006f8a0 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -93,8 +93,9 @@
.btn-group .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
- @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);
+ .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));
*padding-top: 3px;
*padding-bottom: 3px;
}
@@ -127,8 +128,8 @@
.dropdown-toggle {
background-image: none;
- @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
+ .box-shadow(inset 0 1px 6px rgba(0,0,0,.15),
+ 0 1px 2px rgba(0,0,0,.05));
}
}
diff --git a/less/buttons.less b/less/buttons.less
index 83f9c737c..4381fe995 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -21,8 +21,8 @@
border: 1px solid @btnBorder;
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
- @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
+ .box-shadow(inset 0 1px 0 rgba(255,255,255,.2),
+ 0 1px 2px rgba(0,0,0,.05));
cursor: pointer;
// Give IE7 some love
@@ -50,8 +50,8 @@
.btn.active,
.btn:active {
background-image: none;
- @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
+ .box-shadow(inset 0 2px 4px rgba(0,0,0,.15),
+ 0 1px 2px rgba(0,0,0,.05));
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 8d9c25308..5e373956b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,8 +213,8 @@ textarea {
input:focus,
textarea:focus {
border-color: rgba(82,168,236,.8);
- @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
- .box-shadow(@shadow);
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075),
+ 0 0 8px rgba(82,168,236,.6));
outline: 0;
outline: thin dotted \9; /* IE6-9 */
}
diff --git a/less/mixins.less b/less/mixins.less
index 48d722a80..7b95e2b10 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -190,10 +190,10 @@
// --------------------------------------------------
// Border Radius
-.border-radius(@radius: 5px) {
- -webkit-border-radius: @radius;
- -moz-border-radius: @radius;
- border-radius: @radius;
+.border-radius(@radius: 5px, ...) {
+ -webkit-border-radius: @arguments;
+ -moz-border-radius: @arguments;
+ border-radius: @arguments;
}
// Drop shadows
@@ -204,12 +204,12 @@
}
// Transitions
-.transition(@transition) {
- -webkit-transition: @transition;
- -moz-transition: @transition;
- -ms-transition: @transition;
- -o-transition: @transition;
- transition: @transition;
+.transition(@transition, ...) {
+ -webkit-transition: @arguments;
+ -moz-transition: @arguments;
+ -ms-transition: @arguments;
+ -o-transition: @arguments;
+ transition: @arguments;
}
// Transformations