aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorAndreas Cederström <[email protected]>2012-02-17 13:31:36 +0100
committerAndreas Cederström <[email protected]>2012-02-17 13:31:36 +0100
commit1e6d386b8df2d7235b23a96ddd0489c1ab2650dc (patch)
tree00a0032fdf582d39da1d1609bf40f9e4b90d464e /less
parent60826077e7384e548c44c26531e7ae94e12fbcf4 (diff)
parent091622644a0c619e1afbb21041c141da30df76b7 (diff)
downloadbootstrap-1e6d386b8df2d7235b23a96ddd0489c1ab2650dc.tar.xz
bootstrap-1e6d386b8df2d7235b23a96ddd0489c1ab2650dc.zip
Keep origin in track
Diffstat (limited to 'less')
-rw-r--r--less/buttons.less7
-rw-r--r--less/code.less1
-rw-r--r--less/forms.less13
-rw-r--r--less/mixins.less4
-rw-r--r--less/responsive.less4
5 files changed, 23 insertions, 6 deletions
diff --git a/less/buttons.less b/less/buttons.less
index ab372f0b0..14093fb36 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -92,6 +92,13 @@
margin-top: -1px;
}
+// Mini
+.btn-mini {
+ padding: 2px 6px;
+ font-size: @baseFontSize - 2px;
+ line-height: @baseLineHeight - 4px;
+}
+
// Alternate buttons
// --------------------------------------------------
diff --git a/less/code.less b/less/code.less
index 35a8ae6b8..e2157d8ab 100644
--- a/less/code.less
+++ b/less/code.less
@@ -34,6 +34,7 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
+ word-wrap: break-word;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
diff --git a/less/forms.less b/less/forms.less
index 81e5bb42c..0a5fa2b86 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -42,7 +42,13 @@ input,
button,
select,
textarea {
- #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
+ #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
+}
+input,
+button,
+select,
+textarea {
+ #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
}
// Identify controls by their labels
@@ -90,9 +96,12 @@ input[type="radio"] {
margin: 3px 0;
*margin-top: 0; /* IE7 */
line-height: normal;
- border: 0;
cursor: pointer;
.border-radius(0);
+ border: 0 \9; /* IE9 and down */
+}
+input[type="image"] {
+ border: 0;
}
// Reset the file input to browser defaults
diff --git a/less/mixins.less b/less/mixins.less
index 93bb229b5..3cf1a3704 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -9,7 +9,7 @@
// Clearfix
// --------
// For clearing floats like a boss h5bp.com/q
-.clearfix() {
+.clearfix {
*zoom: 1;
&:before,
&:after {
@@ -25,7 +25,7 @@
// ------------------
.tab-focus() {
// Default
- outline: thin dotted;
+ outline: thin dotted #333;
// Webkit
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
diff --git a/less/responsive.less b/less/responsive.less
index c55af0236..5b85776e9 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -154,7 +154,7 @@
// PORTRAIT TABLET TO DEFAULT DESKTOP
// ----------------------------------
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
// Fixed grid
#gridSystem > .generate(12, 42px, 20px);
@@ -171,7 +171,7 @@
// TABLETS AND BELOW
// -----------------
-@media (max-width: 980px) {
+@media (max-width: 979px) {
// UNFIX THE TOPBAR
// ----------------