aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-04-16 15:09:05 -0700
committerJacob Thornton <[email protected]>2012-04-16 15:09:05 -0700
commit498b7d984a8182442e2f543eedff6542c628cd55 (patch)
treef2ca704242b69fee4469f6f1ea7f941e63a5bb3a
parentcad8f2b43acac39958c5f3fb04e9d922900e7b89 (diff)
downloadbootstrap-498b7d984a8182442e2f543eedff6542c628cd55.tar.xz
bootstrap-498b7d984a8182442e2f543eedff6542c628cd55.zip
a few property reordering things
-rw-r--r--docs/assets/css/bootstrap-responsive.css20
-rw-r--r--docs/assets/css/bootstrap.css16
-rw-r--r--less/mixins.less9
-rw-r--r--less/reset.less4
4 files changed, 12 insertions, 37 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 57e32da35..ae78d5235 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -19,20 +19,16 @@
clear: both;
}
.hide-text {
- border: 0;
font: 0/0 a;
- text-shadow: none;
color: transparent;
+ text-shadow: none;
background-color: transparent;
+ border: 0;
}
.input-block-level {
display: block;
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;
@@ -175,10 +171,6 @@
display: block;
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;
@@ -302,10 +294,6 @@
display: block;
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;
@@ -504,10 +492,6 @@
display: block;
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 0218e595b..5cc66a3e2 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -58,9 +58,9 @@ sub {
}
img {
max-width: 100%;
+ vertical-align: middle;
border: 0;
-ms-interpolation-mode: bicubic;
- vertical-align: middle;
}
button,
input,
@@ -88,10 +88,10 @@ input[type="submit"] {
-webkit-appearance: button;
}
input[type="search"] {
- -webkit-appearance: textfield;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
+ -webkit-appearance: textfield;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
@@ -113,20 +113,16 @@ textarea {
clear: both;
}
.hide-text {
- border: 0;
font: 0/0 a;
- text-shadow: none;
color: transparent;
+ text-shadow: none;
background-color: transparent;
+ border: 0;
}
.input-block-level {
display: block;
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;
@@ -257,10 +253,6 @@ a:hover {
display: block;
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/less/mixins.less b/less/mixins.less
index 73e6ade56..da461a23a 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -102,11 +102,11 @@
// -------------------------
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
.hide-text {
- border: 0;
font: 0/0 a;
- text-shadow: none;
color: transparent;
+ text-shadow: none;
background-color: transparent;
+ border: 0;
}
@@ -152,9 +152,8 @@
.input-block-level {
display: block;
width: 100%;
- min-height: 28px; /* Make inputs at least the height of their button counterpart */
- /* Makes inputs behave like true block-level elements */
- .box-sizing(border-box);
+ min-height: 28px; // Make inputs at least the height of their button counterpart
+ .box-sizing(border-box); // Makes inputs behave like true block-level elements
}
diff --git a/less/reset.less b/less/reset.less
index d11533f03..d9ce2b110 100644
--- a/less/reset.less
+++ b/less/reset.less
@@ -76,9 +76,9 @@ sub {
img {
max-width: 100%; // Make images inherently responsive
+ vertical-align: middle;
border: 0;
-ms-interpolation-mode: bicubic;
- vertical-align: middle;
}
// Forms
@@ -111,10 +111,10 @@ input[type="submit"] {
-webkit-appearance: button; // Style clickable inputs in iOS
}
input[type="search"] { // Appearance in Safari/Chrome
- -webkit-appearance: textfield;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
+ -webkit-appearance: textfield;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {