From a486a6f20b6502cf260368f5e0e423a7db2c6284 Mon Sep 17 00:00:00 2001 From: Jari Jokinen Date: Wed, 1 Feb 2012 12:59:38 +0200 Subject: Allow labels to be links --- less/labels.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/labels.less b/less/labels.less index c0f427750..923f1b84c 100644 --- a/less/labels.less +++ b/less/labels.less @@ -14,3 +14,7 @@ .label-warning { background-color: @orange; } .label-success { background-color: @successText; } .label-info { background-color: @infoText; } +.label:hover { + color: @white; + text-decoration: none; +} -- cgit v1.2.3 From 4211f21e39631179753d6775e3ad90be05ab5f8f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:27:11 -0800 Subject: #1571: remove fixed width on file inputs --- less/forms.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 9c9a9b8a9..ccf3c67fa 100644 --- a/less/forms.less +++ b/less/forms.less @@ -91,6 +91,7 @@ input[type="radio"] { // Reset the file input to browser defaults input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; -- cgit v1.2.3 From 8dd2b3d3f8c84ac242469ae24fe7981b0a916b25 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 23:10:37 -0800 Subject: follow up to #1501 to update notes in sprites.less --- less/sprites.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/sprites.less b/less/sprites.less index a56216c71..921c662d7 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -9,10 +9,10 @@ // All icons receive the styles of the tag with a base class // of .i and are then given a unique class to add width, height, // and background-position. Your resulting HTML will look like -// . +// . // For the white version of the icons, just add the .icon-white class: -// +// [class^="icon-"] { display: inline-block; -- cgit v1.2.3 From 41587018943ac02d91c6298008b01b808aab53fe Mon Sep 17 00:00:00 2001 From: zhongwei99 Date: Thu, 2 Feb 2012 18:01:16 +0800 Subject: Minor typo fix. --- less/reset.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/reset.less b/less/reset.less index 28d8eb60c..1115f59d8 100644 --- a/less/reset.less +++ b/less/reset.less @@ -108,7 +108,7 @@ input[type="button"], input[type="reset"], input[type="submit"] { cursor: pointer; // Cursors on all buttons applied consistently - -webkit-appearance: button; // Style clicable inputs in iOS + -webkit-appearance: button; // Style clickable inputs in iOS } input[type="search"] { // Appearance in Safari/Chrome -webkit-appearance: textfield; -- cgit v1.2.3 From ced08f69359f3a70771804a98fa3c499f388cc74 Mon Sep 17 00:00:00 2001 From: Eric Thomas Date: Thu, 2 Feb 2012 11:02:14 -0800 Subject: Wrap long breadcrumb trails --- less/breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 19b8081e1..39060bad2 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -9,7 +9,7 @@ .border-radius(3px); .box-shadow(inset 0 1px 0 @white); li { - display: inline; + display: inline-block; text-shadow: 0 1px 0 @white; } .divider { -- cgit v1.2.3 From ac98cee6092738eb431ebd4c944886358dab721f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:26:04 -0800 Subject: allow alternate form layouts to hide inputs with .hide on them --- less/forms.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index ccf3c67fa..31442fa36 100644 --- a/less/forms.less +++ b/less/forms.less @@ -462,6 +462,10 @@ select:focus:required:invalid { display: inline-block; margin-bottom: 0; } + // Re-hide hidden elements due to specifity + .hide { + display: none; + } } .form-search label, .form-inline label, -- cgit v1.2.3 From 81d1f3b96ea5c78d2e570c07c4c419a32a9b212c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:52:25 -0800 Subject: remove max-width on dropdown menus --- less/dropdowns.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 83f535ae8..118430871 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -46,7 +46,6 @@ float: left; display: none; // none by default, but block on "open" of the menu min-width: 160px; - max-width: 220px; _width: 160px; padding: 4px 0; margin: 0; // override default ul -- cgit v1.2.3 From 7e81f84b29da8ba87fb4aefcc11946002ad9962c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:22:19 -0800 Subject: buttons and icons updated for improved placement and variable support for icon paths --- less/buttons.less | 4 ++-- less/sprites.less | 5 +++-- less/variables.less | 18 +++++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 582350386..61d0bc7bf 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -76,7 +76,7 @@ line-height: normal; .border-radius(5px); } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } @@ -86,7 +86,7 @@ font-size: @baseFontSize - 2px; line-height: @baseLineHeight - 2px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } diff --git a/less/sprites.less b/less/sprites.less index 921c662d7..ce7668844 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -18,15 +18,16 @@ display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url(@iconSpritePath); background-position: 14px 14px; background-repeat: no-repeat; .ie7-restore-right-whitespace(); } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url(@iconWhiteSpritePath); } .icon-glass { background-position: 0 0; } diff --git a/less/variables.less b/less/variables.less index f01c232e4..9f58d730e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -47,15 +47,19 @@ // Z-index master list // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1020; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1020; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + +// Sprite icons path +@iconSpritePath: "../img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; // Input placeholder text color -@placeholderText: @grayLight; +@placeholderText: @grayLight; // Navbar @navbarHeight: 40px; -- cgit v1.2.3 From 468688638d69e23141ec4abda074a36e888c12c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:23:20 -0800 Subject: #1715: strip code of styles when in a pre --- less/code.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/code.less b/less/code.less index 0cc3db857..e75cfa00d 100644 --- a/less/code.less +++ b/less/code.less @@ -39,6 +39,8 @@ pre { // Account for some code outputs that place code tags in pre tags code { padding: 0; + color: inherit; background-color: transparent; + border: 0; } } -- cgit v1.2.3 From 87a8c9b677bff0d831f920922c86d5b0cff9949c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:40:50 -0800 Subject: #1707: remove rgba() background override on navbar active items for customization --- less/navbar.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 93c0400b6..3ad2a0743 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -205,7 +205,6 @@ color: @navbarLinkColorHover; text-decoration: none; background-color: @navbarBackground; - background-color: rgba(0,0,0,.5); } // Dividers (basically a vertical hr) -- cgit v1.2.3 From 35fdddbc4fdd134953ce2b1e4a88047850aa47a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:55:47 -0800 Subject: correct css selector for .control-label, required in the docs but not in the CSS files --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 31442fa36..48f80396e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -503,7 +503,7 @@ select:focus:required:invalid { .clearfix(); } // Float the labels left - .control-group > label { + .control-label { float: left; width: 140px; padding-top: 5px; -- cgit v1.2.3 From 53da88e561abf4a5802188ff1901e6915b85c18b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:49:36 -0800 Subject: add mixin for text-overflow --- less/mixins.less | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 545ccb9ba..95292a6f2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -89,6 +89,15 @@ } } +// Text overflow +// ------------------------- +// Requires inline-block or block for proper styling +.text-overflow() { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + // FONTS -- cgit v1.2.3 From 4a09cf04d8d644734f91c9a9ce97091ad698fcce Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:01:28 -0800 Subject: clean up labels per #1656 --- less/labels.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/labels.less b/less/labels.less index c0f427750..fbd192253 100644 --- a/less/labels.less +++ b/less/labels.less @@ -2,11 +2,11 @@ // ------ .label { - padding: 1px 3px 2px; - font-size: @baseFontSize * .75; + padding: 2px 4px 3px; + font-size: @baseFontSize * .85; font-weight: bold; color: @white; - text-transform: uppercase; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @grayLight; .border-radius(3px); } -- cgit v1.2.3 From 91475c865dd8fe224c574c1a15e8949fccdda8c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:14:25 -0800 Subject: fix #1631 by adding focus to radio buttons --- less/forms.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 48f80396e..a8de0f24c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -202,6 +202,7 @@ textarea:focus { outline: thin dotted \9; /* IE6-8 */ } input[type="file"]:focus, +input[type="radio"]:focus, input[type="checkbox"]:focus, select:focus { .box-shadow(none); // override for file inputs -- cgit v1.2.3 From 59b32586af807d0e4f2985ef6e927e32d8ae2df5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:16:46 -0800 Subject: close #1628 to add padding to all inline checkboxes/radios --- less/forms.less | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index a8de0f24c..3f68df01c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -166,9 +166,11 @@ input[type="hidden"] { } // Radios and checkboxes on same line +// TODO v3: Convert .inline to .control-inline .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } @@ -176,11 +178,6 @@ input[type="hidden"] { .checkbox.inline + .checkbox.inline { margin-left: 10px; // space out consecutive inline controls } -// But don't forget to remove their padding on first-child -.controls > .radio.inline:first-child, -.controls > .checkbox.inline:first-child { - padding-top: 0; -} -- cgit v1.2.3 From 546332d85de5837147b645bf6bab5fa06e2a1039 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:28:42 -0800 Subject: resolve #1602 and add table hover style --- less/tables.less | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index c069ed588..cbc013aca 100644 --- a/less/tables.less +++ b/less/tables.less @@ -113,6 +113,16 @@ table { } +// HOVER EFFECT +// ------------ +// Placed here since it has to come after the potential zebra striping +.table { + tbody tr:hover td, + tbody tr:hover th { + background-color: #f5f5f5; + } +} + // TABLE CELL SIZING // ----------------- -- cgit v1.2.3 From 85e401a6567e51016357acfe6b01cd5b5c330652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:36:21 -0800 Subject: add label hover style for ability to make it a link --- less/labels.less | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/labels.less b/less/labels.less index 6337d0e70..268435a0b 100644 --- a/less/labels.less +++ b/less/labels.less @@ -1,6 +1,7 @@ // LABELS // ------ +// Base .label { padding: 2px 4px 3px; font-size: @baseFontSize * .85; @@ -10,11 +11,22 @@ background-color: @grayLight; .border-radius(3px); } -.label-important { background-color: @errorText; } -.label-warning { background-color: @orange; } -.label-success { background-color: @successText; } -.label-info { background-color: @infoText; } + +// Hover state .label:hover { color: @white; text-decoration: none; } + +// Colors +.label-important { background-color: @errorText; } +.label-important:hover { background-color: darken(@errorText, 10%); } + +.label-warning { background-color: @orange; } +.label-warning:hover { background-color: darken(@orange, 10%); } + +.label-success { background-color: @successText; } +.label-success:hover { background-color: darken(@successText, 10%); } + +.label-info { background-color: @infoText; } +.label-info:hover { background-color: darken(@infoText, 10%); } -- cgit v1.2.3 From 9ba9185afc6a91d8047bb76654af429d7efba96b Mon Sep 17 00:00:00 2001 From: Torsten Baldes Date: Mon, 6 Feb 2012 09:59:23 +0100 Subject: Removed double declaration of Skew + added translate3d to mixins.less --- less/mixins.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 545ccb9ba..33def6488 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -313,12 +313,12 @@ -o-transform: translate(@x, @y); transform: translate(@x, @y); } -.skew(@x: 0, @y: 0) { - -webkit-transform: translate(@x, @y); - -moz-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); - -o-transform: translate(@x, @y); - transform: translate(@x, @y); +.translate3d(@x: 0, @y: 0, @z: 0) { + -webkit-transform: translate(@x, @y, @z); + -moz-transform: translate(@x, @y, @z); + -ms-transform: translate(@x, @y, @z); + -o-transform: translate(@x, @y, @z); + transform: translate(@x, @y, @z); } .skew(@x: 0, @y: 0) { -webkit-transform: skew(@x, @y); -- cgit v1.2.3 From 575b82473f8d248ca3782fa86ce1c92eea03905c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:34:03 -0800 Subject: rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query --- less/buttons.less | 4 +++- less/responsive.less | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 61d0bc7bf..880d1f64a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -9,11 +9,13 @@ .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; // For input.btn font-size: @baseFontSize; line-height: @baseLineHeight; color: @grayDark; text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); + vertical-align: middle; #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient border: 1px solid #ccc; border-bottom-color: #bbb; @@ -147,7 +149,7 @@ button.btn, input[type="submit"].btn { &::-moz-focus-inner { - padding: 0; + padding: 0; border: 0; } diff --git a/less/responsive.less b/less/responsive.less index 7d494a357..7ed58bb4e 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -123,7 +123,7 @@ // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- -@media (max-width: 768px) { +@media (max-width: 767px) { // GRID & CONTAINERS // ----------------- // Remove width from containers -- cgit v1.2.3 From 1a97cce19bf4e4be082d8724a30b3c1425c660b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:39:22 -0800 Subject: manual patch of #1449 to make thumbnails use grid vars --- less/thumbnails.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index 541fbd6a7..3a12d4e50 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -2,13 +2,13 @@ // ---------- .thumbnails { - margin-left: -20px; + margin-left: -@gridGutterWidth; list-style: none; .clearfix(); } .thumbnails > li { float: left; - margin: 0 0 @baseLineHeight 20px; + margin: 0 0 @baseLineHeight @gridGutterWidth; } .thumbnail { display: block; -- cgit v1.2.3 From b5f1d2f3a46e070427eb73857c653b0bf090a1d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:48:48 -0800 Subject: rearrange order of 3d and skew mixins: --- less/mixins.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index fab1f1568..2b96d21e5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -322,13 +322,6 @@ -o-transform: translate(@x, @y); transform: translate(@x, @y); } -.translate3d(@x: 0, @y: 0, @z: 0) { - -webkit-transform: translate(@x, @y, @z); - -moz-transform: translate(@x, @y, @z); - -ms-transform: translate(@x, @y, @z); - -o-transform: translate(@x, @y, @z); - transform: translate(@x, @y, @z); -} .skew(@x: 0, @y: 0) { -webkit-transform: skew(@x, @y); -moz-transform: skew(@x, @y); @@ -336,6 +329,13 @@ -o-transform: skew(@x, @y); transform: skew(@x, @y); } +.translate3d(@x: 0, @y: 0, @z: 0) { + -webkit-transform: translate(@x, @y, @z); + -moz-transform: translate(@x, @y, @z); + -ms-transform: translate(@x, @y, @z); + -o-transform: translate(@x, @y, @z); + transform: translate(@x, @y, @z); +} // Background clipping // Heads up: FF 3.6 and under need "padding" instead of "padding-box" -- cgit v1.2.3 From 2d9b3c45d3ae5b2e4055435783d0d9428353b70a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:13:52 -0800 Subject: move formfieldstate mixin to mixins.less for #1785 --- less/forms.less | 27 --------------------------- less/mixins.less | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 29 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 3f68df01c..5bce4cebd 100644 --- a/less/forms.less +++ b/less/forms.less @@ -259,33 +259,6 @@ textarea[readonly] { // FORM FIELD FEEDBACK STATES // -------------------------- -// Mixin for form field states -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { - // Set the text color - > label, - .help-block, - .help-inline { - color: @textColor; - } - // Style inputs accordingly - input, - select, - textarea { - color: @textColor; - border-color: @borderColor; - &:focus { - border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%)); - } - } - // Give a small background color for input-prepend/-append - .input-prepend .add-on, - .input-append .add-on { - color: @textColor; - background-color: @backgroundColor; - border-color: @textColor; - } -} // Warning .control-group.warning { .formFieldState(@warningText, @warningText, @warningBackground); diff --git a/less/mixins.less b/less/mixins.less index 2b96d21e5..fffb6c1ce 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -244,8 +244,6 @@ } } - - // Input grid system // ------------------------- #inputGridSystem { @@ -274,6 +272,39 @@ +// Form field states (used in forms.less) +// -------------------------------------------------- + +// Mixin for form field states +.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { + // Set the text color + > label, + .help-block, + .help-inline { + color: @textColor; + } + // Style inputs accordingly + input, + select, + textarea { + color: @textColor; + border-color: @borderColor; + &:focus { + border-color: darken(@borderColor, 10%); + .box-shadow(0 0 6px lighten(@borderColor, 20%)); + } + } + // Give a small background color for input-prepend/-append + .input-prepend .add-on, + .input-append .add-on { + color: @textColor; + background-color: @backgroundColor; + border-color: @textColor; + } +} + + + // CSS3 PROPERTIES // -------------------------------------------------- -- cgit v1.2.3 From adff17ac03e932d09d80d68d6a5b1c0463805dc1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Feb 2012 00:16:05 -0800 Subject: fix for #1779, use line-height var --- less/dropdowns.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 118430871..1ec06b04a 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -92,7 +92,7 @@ padding: 3px 15px; clear: both; font-weight: normal; - line-height: 18px; + line-height: @baseLineHeight; color: @gray; white-space: nowrap; } -- cgit v1.2.3 From 25bf0af2492920d3da59cc64a23c1a776279a3eb Mon Sep 17 00:00:00 2001 From: Henrik N Date: Tue, 7 Feb 2012 19:29:45 +0100 Subject: Add ol.unstyled --- less/type.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 7841bb090..ae43d1940 100644 --- a/less/type.less +++ b/less/type.less @@ -110,7 +110,8 @@ ol { li { line-height: @baseLineHeight; } -ul.unstyled { +ul.unstyled, +ol.unstyled { margin-left: 0; list-style: none; } -- cgit v1.2.3 From 920d9958431b3d0a08401bfbc097416bc83211bd Mon Sep 17 00:00:00 2001 From: Jeremy Martin Date: Thu, 9 Feb 2012 15:27:42 -0500 Subject: webkit legend margin fix for non-horizontal forms --- less/forms.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 5bce4cebd..5fbb53c9a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -459,15 +459,16 @@ select:focus:required:invalid { margin-bottom: @baseLineHeight / 2; } +// Legend collapses margin, so next element is responsible for spacing +legend + .control-group { + margin-top: @baseLineHeight; + -webkit-margin-top-collapse: separate; +} + // Horizontal-specific styles // -------------------------- .form-horizontal { - // Legend collapses margin, so we're relegated to padding - legend + .control-group { - margin-top: @baseLineHeight; - -webkit-margin-top-collapse: separate; - } // Increase spacing between groups .control-group { margin-bottom: @baseLineHeight; -- cgit v1.2.3 From 451a642ae813f0b3a3f61af69eaeca927547b755 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 9 Feb 2012 23:08:14 +0100 Subject: Added a black/dark button --- less/buttons.less | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 880d1f64a..4c508d7fe 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -107,7 +107,9 @@ .btn-success, .btn-success:hover, .btn-info, -.btn-info:hover { +.btn-info:hover, +.btn-dark, +.btn-dark:hover { text-shadow: 0 -1px 0 rgba(0,0,0,.25); color: @white; } @@ -116,7 +118,8 @@ .btn-warning.active, .btn-danger.active, .btn-success.active, -.btn-info.active { +.btn-info.active, +.btn-dark.active { color: rgba(255,255,255,.75); } @@ -141,6 +144,10 @@ .btn-info { .buttonBackground(#5bc0de, #2f96b4); } +// Dark appears as black +.btn-dark { + .buttonBackground(#454545, #262626); +} // Cross-browser Jank -- cgit v1.2.3 From d9eff8efc1ee426f3622ab131d8b6726d471040d Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 10 Feb 2012 00:31:40 +0100 Subject: Added the carret of the button --- less/button-groups.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 4b0523df2..d8957c52d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -133,7 +133,8 @@ .btn-primary, .btn-danger, .btn-info, -.btn-success { +.btn-success, +.btn-dark { .caret { border-top-color: @white; .opacity(75); -- cgit v1.2.3 From d7aefe67e3df78bde61eaa7ecab807bb03aeb1ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:07:32 -0800 Subject: scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag --- less/code.less | 10 ++++++++++ less/tables.less | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index e75cfa00d..35a8ae6b8 100644 --- a/less/code.less +++ b/less/code.less @@ -11,12 +11,16 @@ pre { color: @grayDark; .border-radius(3px); } + +// Inline code code { padding: 3px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; } + +// Blocks of code pre { display: block; padding: (@baseLineHeight - 1) / 2; @@ -44,3 +48,9 @@ pre { border: 0; } } + +// Enable scrollable blocks of code +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} \ No newline at end of file diff --git a/less/tables.less b/less/tables.less index cbc013aca..3a4066d71 100644 --- a/less/tables.less +++ b/less/tables.less @@ -25,14 +25,15 @@ table { padding: 8px; line-height: @baseLineHeight; text-align: left; + vertical-align: top; border-top: 1px solid #ddd; } th { font-weight: bold; - vertical-align: bottom; } - td { - vertical-align: top; + // Bottom align for column headings + thead th { + vertical-align: bottom; } // Remove top border from thead by default thead:first-child tr th, -- cgit v1.2.3 From 89205d9db43f6c2fb2ed14cdb11c50c858de0550 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:59:00 -0800 Subject: manually address #1895 --- less/type.less | 2 +- less/variables.less | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index ae43d1940..6ba83bc3a 100644 --- a/less/type.less +++ b/less/type.less @@ -138,7 +138,7 @@ dd { hr { margin: @baseLineHeight 0; border: 0; - border-top: 1px solid #e5e5e5; + border-top: 1px solid @hrBorder; border-bottom: 1px solid @white; } diff --git a/less/variables.less b/less/variables.less index 9f58d730e..ced64d7cd 100644 --- a/less/variables.less +++ b/less/variables.less @@ -61,6 +61,9 @@ // Input placeholder text color @placeholderText: @grayLight; +// Hr border color +@hrBorder: @grayLighter; + // Navbar @navbarHeight: 40px; @navbarBackground: @grayDarker; -- cgit v1.2.3 From 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:07:05 -0800 Subject: update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first --- less/sprites.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/sprites.less b/less/sprites.less index ce7668844..a7741661e 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -14,7 +14,8 @@ // For the white version of the icons, just add the .icon-white class: // -[class^="icon-"] { +[class^="icon-"], +[class*=" icon-"] { display: inline-block; width: 14px; height: 14px; -- cgit v1.2.3 From 8f1db4321a35851d5b726290b2d99e7ea1ec7239 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:24:06 -0800 Subject: fix inline form checkbox/radios --- less/forms.less | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 5fbb53c9a..17393b280 100644 --- a/less/forms.less +++ b/less/forms.less @@ -453,6 +453,14 @@ select:focus:required:invalid { .form-inline .input-prepend .add-on { vertical-align: middle; } +// Inline checkbox/radio labels +.form-search .radio, +.form-inline .radio, +.form-search .checkbox, +.form-inline .checkbox { + margin-bottom: 0; + vertical-align: middle; +} // Margin to space out fieldsets .control-group { -- cgit v1.2.3 From 4ddc8fd0e41a4bf76249645674806a7f11e64879 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 16:43:53 -0800 Subject: remove color on :active of buttons --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 880d1f64a..0dc9e374b 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -53,7 +53,6 @@ .box-shadow(@shadow); background-color: darken(@white, 10%); background-color: darken(@white, 15%) e("\9"); - color: rgba(0,0,0,.5); outline: 0; } -- cgit v1.2.3 From 5a3dfb72bfcf1859690c76a8ddb8457eb962bdb3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 16:50:57 -0800 Subject: support small for legend per #1544 --- less/forms.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 17393b280..f262af0db 100644 --- a/less/forms.less +++ b/less/forms.less @@ -28,6 +28,12 @@ legend { color: @grayDark; border: 0; border-bottom: 1px solid #eee; + + // Small + small { + font-size: @baseLineHeight * .75; + color: @grayLight; + } } // Set font for forms -- cgit v1.2.3 From 5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:27:08 -0800 Subject: fix tabs content wrapping per #1620 --- less/navs.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index a29cb712b..0d37ea388 100644 --- a/less/navs.less +++ b/less/navs.less @@ -249,6 +249,9 @@ .tabbable { .clearfix(); } +.tab-content { + overflow: hidden; // prevent content from running below tabs +} // Remove border on bottom, left, right .tabs-below .nav-tabs, -- cgit v1.2.3 From 5bb55e46157ec974120535acdb6335841c85fa37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 19:21:23 -0800 Subject: change fixed height on responsive textareas to min-height --- less/responsive.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/responsive.less b/less/responsive.less index 7ed58bb4e..1e3bf371c 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -56,7 +56,7 @@ .uneditable-input { display: block; width: 100%; - height: 28px; /* Make inputs at least the height of their button counterpart */ + 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; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -- cgit v1.2.3 From 158419c0455ea499197f8b7917bdfe299caaac19 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 20:00:44 -0800 Subject: reset line-height for file input in ie9 --- less/forms.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index f262af0db..7f076aca3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -122,6 +122,11 @@ input[type="file"] { line-height: 28px; } +// Reset line-height for IE +input[type="file"] { + line-height: 18px \9; +} + // Chrome on Linux and Mobile Safari need background-color select { width: 220px; // default input width + 10px of padding that doesn't get applied -- cgit v1.2.3 From b327420e524691808b59fa2d0d552e5ec65e2a45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 20:58:10 -0800 Subject: update comment to reflect ie support --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 7f076aca3..81833b064 100644 --- a/less/forms.less +++ b/less/forms.less @@ -207,7 +207,7 @@ textarea:focus { @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-8 */ + outline: thin dotted \9; /* IE6-9 */ } input[type="file"]:focus, input[type="radio"]:focus, -- cgit v1.2.3 From a2bc22bad5fd1b7ab6bba10087cea36aad63c550 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:14:13 -0800 Subject: standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover --- less/buttons.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 0dc9e374b..ff8168557 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -16,7 +16,7 @@ text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); vertical-align: middle; - #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient + .buttonBackground(@white, darken(@white, 10%)); border: 1px solid #ccc; border-bottom-color: #bbb; .border-radius(4px); @@ -25,6 +25,7 @@ cursor: pointer; // Give IE7 some love + .reset-filter(); .ie7-restore-left-whitespace(); } -- cgit v1.2.3 From b9d5ceb14bf77e62dd8b017f76b72a3a14643620 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:17:46 -0800 Subject: edit comment on IE7-8 support of :focus in navbar-search --- less/navbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 3ad2a0743..cd637acac 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -133,7 +133,7 @@ background-color: @grayLight; background-color: rgba(255,255,255,.5); } - // Focus states (we use .focused since IE8 and down doesn't support :focus) + // Focus states (we use .focused since IE7-8 and down doesn't support :focus) &:focus, &.focused { padding: 5px 10px; -- cgit v1.2.3 From 24df7f1e1d9cc018eca5f7adcca15500f5503022 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 13:20:08 -0800 Subject: update ff comment in buttons --- less/buttons.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index ff8168557..5fc423183 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -148,6 +148,8 @@ button.btn, input[type="submit"].btn { + + // Firefox 3.6 only I believe &::-moz-focus-inner { padding: 0; border: 0; -- cgit v1.2.3 From a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:01:58 -0800 Subject: add navbar background hover variable and fix uneditable-input with append/prepend controls --- less/forms.less | 1 + less/navbar.less | 2 +- less/variables.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 81833b064..eb98f1bcb 100644 --- a/less/forms.less +++ b/less/forms.less @@ -395,6 +395,7 @@ select:focus:required:invalid { .border-radius(3px 0 0 3px); } .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } .add-on { diff --git a/less/navbar.less b/less/navbar.less index cd637acac..35c209fc4 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -194,7 +194,7 @@ } // Hover .navbar .nav > li > a:hover { - background-color: transparent; + background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active color: @navbarLinkColorHover; text-decoration: none; } diff --git a/less/variables.less b/less/variables.less index ced64d7cd..3d448ab21 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,6 +68,7 @@ @navbarHeight: 40px; @navbarBackground: @grayDarker; @navbarBackgroundHighlight: @grayDark; +@navbarLinkBackgroundHover: transparent; @navbarText: @grayLight; @navbarLinkColor: @grayLight; -- cgit v1.2.3 From 0ff88f2db3b9fa4604886494a711d74652a2fb4f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:09:13 -0800 Subject: enable the use of .nav-header in dropdowns per #1827 --- less/navs.less | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 0d37ea388..06219fa62 100644 --- a/less/navs.less +++ b/less/navs.less @@ -21,6 +21,21 @@ background-color: @grayLighter; } +// Nav headers (for dropdowns and lists) +.nav .nav-header { + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: @baseLineHeight; + color: @grayLight; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + text-transform: uppercase; +} +// Space them out when they follow another list item (link) +.nav li + .nav-header { + margin-top: 9px; +} // NAV LIST @@ -33,21 +48,12 @@ } .nav-list > li > a, .nav-list .nav-header { - display: block; - padding: 3px 15px; margin-left: -15px; margin-right: -15px; text-shadow: 0 1px 0 rgba(255,255,255,.5); } -.nav-list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: @baseLineHeight; - color: @grayLight; - text-transform: uppercase; -} -.nav-list > li + .nav-header { - margin-top: 9px; +.nav-list > li > a { + padding: 3px 15px; } .nav-list .active > a, .nav-list .active > a:hover { -- cgit v1.2.3 From a57dbada0f17bc3dfd4a77de436a5e590fb0d1e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:18:20 -0800 Subject: change classname from .btn-dark to .btn-inverse, change use text --- less/button-groups.less | 2 +- less/buttons.less | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index d8957c52d..a04220a9a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -134,7 +134,7 @@ .btn-danger, .btn-info, .btn-success, -.btn-dark { +.btn-inverse { .caret { border-top-color: @white; .opacity(75); diff --git a/less/buttons.less b/less/buttons.less index 0ac2be67a..292e04626 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -108,8 +108,8 @@ .btn-success:hover, .btn-info, .btn-info:hover, -.btn-dark, -.btn-dark:hover { +.btn-inverse, +.btn-inverse:hover { text-shadow: 0 -1px 0 rgba(0,0,0,.25); color: @white; } @@ -144,8 +144,8 @@ .btn-info { .buttonBackground(#5bc0de, #2f96b4); } -// Dark appears as black -.btn-dark { +// Inverse appears as dark gray +.btn-inverse { .buttonBackground(#454545, #262626); } -- cgit v1.2.3 From 163c98ea7e321ce3a1b38128cfb2bec6cd76e6de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:43:04 -0800 Subject: clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin --- less/modals.less | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index aa14675ed..d1e06dc26 100644 --- a/less/modals.less +++ b/less/modals.less @@ -1,6 +1,7 @@ // MODALS // ------ +// Recalculate z-index where appropriate .modal-open { .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } @@ -8,6 +9,7 @@ .tooltip { z-index: @zindexTooltip + @zindexModal; } } +// Background .modal-backdrop { position: fixed; top: 0; @@ -25,6 +27,7 @@ .opacity(80); } +// Base modal .modal { position: fixed; top: 50%; @@ -53,9 +56,17 @@ // Close icon .close { margin-top: 2px; } } + +// Body (where all modal content resises) .modal-body { padding: 15px; } +// Remove bottom margin if need be +.modal-body .modal-form { + margin-bottom: 0; +} + +// Footer (for actions) .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; -- cgit v1.2.3 From 5fc62c5fcc93ab36a419c35e72674fbf632b09c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 16:59:29 -0800 Subject: clear up scaffolding page to separate fixed from fluid grid systems --- less/mixins.less | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index fffb6c1ce..c2fc2c745 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -208,13 +208,13 @@ // Setup the mixins to be used .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) { width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); - } + } .gridColumn(@fluidGridGutterWidth) { float: left; margin-left: @fluidGridGutterWidth; } // Take these values and mixins, and make 'em do their thang - .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) { + .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) { // Row surrounds the columns .row-fluid { width: 100%; @@ -228,18 +228,18 @@ margin-left: 0; } // Default columns - .span1 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); } - .span2 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); } - .span3 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); } - .span4 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); } - .span5 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); } - .span6 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); } - .span7 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); } - .span8 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); } - .span9 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); } - .span10 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); } - .span11 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); } - .span12 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); } + > .span1 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); } + > .span2 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); } + > .span3 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); } + > .span4 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); } + > .span5 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); } + > .span6 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); } + > .span7 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); } + > .span8 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); } + > .span9 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); } + > .span10 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); } + > .span11 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); } + > .span12 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); } } } } -- cgit v1.2.3 From 3e00c1261fa3d48b184874c9f5b94ce370bd6449 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:28:22 -0800 Subject: allow .input-prepend/.input-append to work in .navbar per #1681 --- less/navbar.less | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 35c209fc4..16553c1ff 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -81,7 +81,7 @@ margin-top: 5px; // make buttons vertically centered in navbar } .btn-group .btn { - margin-top: 0; + margin-top: 0; // then undo the margin here so we don't accidentally double it } } @@ -104,6 +104,14 @@ input[type="radio"] { margin-top: 3px; } + .input-append, + .input-prepend { + margin-top: 6px; + white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left + input { + margin-top: 0; // remove the margin on top since it's on the parent + } + } } // Navbar search -- cgit v1.2.3 From 944c7298d345dd46142a8338c59777827bdbde0c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:46:39 -0800 Subject: adding makeRow and makeColumn mixins for generating more semantic layouts --- less/mixins.less | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index c2fc2c745..93bb229b5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -270,6 +270,19 @@ } } +// Make a Grid +// ------------------------- +// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior +.makeRow() { + margin-left: @gridGutterWidth * -1; + .clearfix(); +} +.makeColumn(@columns: 1) { + float: left; + margin-left: @gridGutterWidth; + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); +} + // Form field states (used in forms.less) -- cgit v1.2.3 From cbe10bd591412c5bff365c86451caacb7cedb4f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 21:11:56 -0800 Subject: clean up nav-header in responsive --- less/responsive.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/responsive.less b/less/responsive.less index 1e3bf371c..c55af0236 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -215,6 +215,10 @@ .navbar .nav > .divider-vertical { display: none; } + .navbar .nav .nav-header { + color: @navbarText; + text-shadow: none; + } // Nav and dropdown links in navbar .navbar .nav > li > a, .navbar .dropdown-menu a { -- cgit v1.2.3 From ce5976fb2901ec43c132fa7d517b9e2ca6041087 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 22:49:06 -0800 Subject: ensure help-block is block per #1937 --- less/forms.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index eb98f1bcb..81e5bb42c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -327,6 +327,7 @@ select:focus:required:invalid { // --------- .help-block { + display: block; // account for any element using help-block margin-top: 5px; margin-bottom: 0; color: @grayLight; -- cgit v1.2.3 From 64ea59234f30f51ab5497830d1825c7e043a575e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Feb 2012 08:18:19 -0800 Subject: change up fonts on form elements to remove unnecessary font-family on label element, per #1950 --- less/forms.less | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 81e5bb42c..be9dbfaa9 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 -- cgit v1.2.3 From 489276f5be328773e4e4dbd7d6d8e326d3135437 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:08:52 -0800 Subject: fix responsive media queries to use 979 and 980 where appropro --- less/responsive.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') 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 // ---------------- -- cgit v1.2.3 From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:25:40 -0800 Subject: fix buttons focus state and swap a buttons for button buttons --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 93bb229b5..96af8219d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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; -- cgit v1.2.3 From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:28:16 -0800 Subject: add mini buttons per #1971 --- less/buttons.less | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 292e04626..55e9fbf1c 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 // -------------------------------------------------- -- cgit v1.2.3 From 6f6adfb52fc2f6043f84ac4fab876592c00b2894 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:04:11 -0800 Subject: change clearfix mixin to drop parens that prevent it from being a class, too --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 96af8219d..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 { -- cgit v1.2.3 From 091622644a0c619e1afbb21041c141da30df76b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:34:30 -0800 Subject: bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE --- less/code.less | 1 + less/forms.less | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'less') 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 be9dbfaa9..0a5fa2b86 100644 --- a/less/forms.less +++ b/less/forms.less @@ -96,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 -- cgit v1.2.3