From 9a2d16976285bd2f552a9c81bae719b4e7607bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 23 Oct 2013 22:14:34 +0200 Subject: Add quick fix to labels and badges in buttons --- less/badges.less | 12 ++++++------ less/labels.less | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/badges.less b/less/badges.less index 0b69753ef..166b2be5e 100644 --- a/less/badges.less +++ b/less/badges.less @@ -22,6 +22,12 @@ &:empty { display: none; } + + // Quick fix for badges in buttons + .btn & { + position: relative; + top: -1px; + } } // Hover state, but only for links @@ -34,12 +40,6 @@ a.badge { } } -// Quick fix for labels/badges in buttons -.btn .badge { - position: relative; - top: -1px; -} - // Account for counters in navs a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { diff --git a/less/labels.less b/less/labels.less index cad5ce516..5db1ed12c 100644 --- a/less/labels.less +++ b/less/labels.less @@ -28,6 +28,12 @@ &:empty { display: none; } + + // Quick fix for labels in buttons + .btn & { + position: relative; + top: -1px; + } } // Colors -- cgit v1.2.3 From 441f9d67179f766377eed4b0cedc5dc6eec290e4 Mon Sep 17 00:00:00 2001 From: Kevin Locke Date: Wed, 30 Oct 2013 18:37:17 -0600 Subject: Support .h1 in place of h1 inside .jumbotron As in #7284, it can often be useful to style text like a heading in places where using the heading tag would be either semantically incorrect, less accessible, or otherwise invalid. Support this in .jumbotron as in the rest of the document by allowing elements with class .h1 to stand in for the h1 element. Signed-off-by: Kevin Locke --- less/jumbotron.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 22c29780a..720bda7d3 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -12,7 +12,8 @@ color: @jumbotron-color; background-color: @jumbotron-bg; - h1 { + h1, + .h1 { line-height: 1; color: @jumbotron-heading-color; } @@ -33,7 +34,8 @@ padding-right: (@jumbotron-padding * 2); } - h1 { + h1, + .h1 { font-size: (@font-size-base * 4.5); } } -- cgit v1.2.3 From 96109d3138fd6f5b67fb1108754e81c077630b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 7 Nov 2013 09:53:33 +0100 Subject: Simplify table state styles --- less/mixins.less | 28 ++++++++++++++-------------- less/tables.less | 22 ++++------------------ 2 files changed, 18 insertions(+), 32 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 3d24e668a..0e29c9d3d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -430,27 +430,27 @@ // Tables // ------------------------- -.table-row-variant(@state; @background; @border) { +.table-row-variant(@state; @background) { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. - .table > thead > tr, - .table > tbody > tr, - .table > tfoot > tr { - > td.@{state}, - > th.@{state}, - &.@{state} > td, - &.@{state} > th { - background-color: @background; + .table { + > thead, + > tbody, + > tfoot { + > tr > .@{state}, + > .@{state} > td, + > .@{state} > th { + background-color: @background; + } } } // Hover states for `.table-hover` // Note: this is not available for cells or rows within `thead` or `tfoot`. - .table-hover > tbody > tr { - > td.@{state}:hover, - > th.@{state}:hover, - &.@{state}:hover > td, - &.@{state}:hover > th { + .table-hover > tbody { + > tr > .@{state}:hover, + > .@{state}:hover > td, + > .@{state}:hover > th { background-color: darken(@background, 5%); } } diff --git a/less/tables.less b/less/tables.less index 4c4284cb1..7192c4d5e 100644 --- a/less/tables.less +++ b/less/tables.less @@ -152,25 +152,11 @@ table { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. -.table { - > thead, - > tbody, - > tfoot { - > tr { - > td.active, - > th.active, - &.active > td, - &.active > th { - background-color: @table-bg-active; - } - } - } -} - // Generate the contextual variants -.table-row-variant(success; @state-success-bg; @state-success-border); -.table-row-variant(danger; @state-danger-bg; @state-danger-border); -.table-row-variant(warning; @state-warning-bg; @state-warning-border); +.table-row-variant(active; @table-bg-active); +.table-row-variant(success; @state-success-bg); +.table-row-variant(danger; @state-danger-bg); +.table-row-variant(warning; @state-warning-bg); // Responsive tables -- cgit v1.2.3 From 15fbc4bd06db91de3ee81a1894428e0ab17a5b82 Mon Sep 17 00:00:00 2001 From: Luke McDonald Date: Thu, 7 Nov 2013 09:57:55 -0600 Subject: Don't print .clearfix() comment references --- less/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 3d24e668a..667642a5e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -19,8 +19,8 @@ .clearfix() { &:before, &:after { - content: " "; /* 1 */ - display: table; /* 2 */ + content: " "; // 1 + display: table; // 2 } &:after { clear: both; -- cgit v1.2.3 From 0da3901ed5a6d498af8b7c76b61d004a003f716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 8 Nov 2013 10:30:15 +0100 Subject: Add missing `.small` styles and docs --- 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 437c70b76..982d94f59 100644 --- a/less/type.less +++ b/less/type.less @@ -233,7 +233,8 @@ blockquote { p:last-child { margin-bottom: 0; } - small { + small, + .small { display: block; line-height: @line-height-base; color: @blockquote-small-color; -- cgit v1.2.3 From 4386650e60efea3fe8ecaab0e0e14b303eea4cac Mon Sep 17 00:00:00 2001 From: Mario Bonito Date: Sat, 9 Nov 2013 13:03:21 -0500 Subject: Corrected color contrast to WCAG 2.0 AA --- less/variables.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index e596215d0..6f2551e2c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -375,19 +375,19 @@ // Form states and alerts // ------------------------- -@state-success-text: #468847; +@state-success-text: #3c763d; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); -@state-info-text: #3a87ad; +@state-info-text: #31708f; @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); -@state-warning-text: #c09853; +@state-warning-text: #8a6d3b; @state-warning-bg: #fcf8e3; @state-warning-border: darken(spin(@state-warning-bg, -10), 5%); -@state-danger-text: #b94a48; +@state-danger-text: #a94442; @state-danger-bg: #f2dede; @state-danger-border: darken(spin(@state-danger-bg, -10), 5%); -- cgit v1.2.3 From 1f340023e20049cc11eda3fcd3dbc0d7c3e48d49 Mon Sep 17 00:00:00 2001 From: Sam Blowes Date: Fri, 15 Nov 2013 16:17:40 +0000 Subject: Fixed button group button not being 100% width Example of issue here. https://dl.dropboxusercontent.com/u/14037764/Development/stackoverflow/bootstrap/vertical-btn.PNG --- 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 c25357622..cbe03f742 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -178,7 +178,8 @@ .btn-group-vertical { > .btn, - > .btn-group { + > .btn-group, + > .btn-group > .btn { display: block; float: none; width: 100%; -- cgit v1.2.3 From 283c86db38df3c9273749cdd0c401e06a4e66c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 17 Nov 2013 21:15:25 +0100 Subject: There are xs-offsets, -pushes and -pulls! --- less/grid.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 67e78f760..8f8794339 100644 --- a/less/grid.less +++ b/less/grid.less @@ -18,8 +18,8 @@ // Extra small grid // -// Grid classes for extra small devices like smartphones. No offset, push, or -// pull classes are present here due to the size of the target. +// Columns, offsets, pushes, and pulls for extra small devices like +// smartphones. // // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since // it's full-width. -- cgit v1.2.3 From 55af0036699573be96c4ad33a54836d31fb737b5 Mon Sep 17 00:00:00 2001 From: Mario Bonito Date: Tue, 19 Nov 2013 22:24:26 -0500 Subject: removed color treatment of outline --- less/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index e76d8d697..83b93eeb6 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -30,8 +30,8 @@ // WebKit-style focus .tab-focus() { // Default - outline: thin dotted #333; - // WebKit + outline: thin dotted; + //Webkit outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -- cgit v1.2.3 From bd44a4b5f35c38c75744e9c6cdc500f4e451c059 Mon Sep 17 00:00:00 2001 From: Jerri Christiansen Date: Mon, 25 Nov 2013 20:41:00 +0100 Subject: Removed unnecessary semicolon --- 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 e76d8d697..dff49cb4d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -392,7 +392,7 @@ // Panels // ------------------------- -.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) { +.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) { border-color: @border; & > .panel-heading { -- cgit v1.2.3 From bff8ba2b794305842d7a712a1bf6e400b898b7c0 Mon Sep 17 00:00:00 2001 From: Jesse Mandel Date: Mon, 25 Nov 2013 15:19:11 -0800 Subject: Fix for Issue #11411 --- less/panels.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index a107ff1d4..9a72732ab 100644 --- a/less/panels.less +++ b/less/panels.less @@ -57,7 +57,7 @@ .panel { > .table, - > .table-responsive { + > .table-responsive > .table { margin-bottom: 0; } > .panel-body + .table, -- cgit v1.2.3 From ea782486082251c5e28e974f5843b6c37147cf51 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 17:41:43 +0100 Subject: removed all caret border color settings. --- less/button-groups.less | 31 ------------------------------- less/dropdowns.less | 4 ++-- less/mixins.less | 3 --- less/navbar.less | 36 +----------------------------------- less/navs.less | 20 -------------------- less/variables.less | 3 --- 6 files changed, 3 insertions(+), 94 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index c25357622..0a07a4bc8 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -2,37 +2,6 @@ // Button groups // -------------------------------------------------- -// Button carets -// -// Match the button text color to the arrow/caret for indicating dropdown-ness. - -.caret { - .btn-default & { - border-top-color: @btn-default-color; - } - .btn-primary &, - .btn-success &, - .btn-warning &, - .btn-danger &, - .btn-info & { - border-top-color: #fff; - } -} -.dropup { - .btn-default .caret { - border-bottom-color: @btn-default-color; - } - .btn-primary, - .btn-success, - .btn-warning, - .btn-danger, - .btn-info { - .caret { - border-bottom-color: #fff; - } - } -} - // Make the div behave like a button .btn-group, .btn-group-vertical { diff --git a/less/dropdowns.less b/less/dropdowns.less index dbaf31fe0..1a8f1973f 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -10,7 +10,7 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: @caret-width-base solid @dropdown-caret-color; + border-top: @caret-width-base solid; border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; } @@ -161,7 +161,7 @@ // Reverse the caret .caret { border-top: 0; - border-bottom: @caret-width-base solid @dropdown-caret-color; + border-bottom: @caret-width-base solid; content: ""; } // Different positioning for bottom up menu diff --git a/less/mixins.less b/less/mixins.less index dff49cb4d..a91977984 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -403,9 +403,6 @@ + .panel-collapse .panel-body { border-top-color: @border; } - & > .dropdown .caret { - border-color: @heading-text-color transparent; - } } & > .panel-footer { + .panel-collapse .panel-body { diff --git a/less/navbar.less b/less/navbar.less index 21cffc250..d2ad023e1 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -414,15 +414,8 @@ border-color: @navbar-default-border; } - // Dropdown menu items and carets + // Dropdown menu items .navbar-nav { - // Caret should match text color on hover - > .dropdown > a:hover .caret, - > .dropdown > a:focus .caret { - border-top-color: @navbar-default-link-hover-color; - border-bottom-color: @navbar-default-link-hover-color; - } - // Remove background color from open dropdown > .open > a { &, @@ -430,17 +423,8 @@ &:focus { background-color: @navbar-default-link-active-bg; color: @navbar-default-link-active-color; - .caret { - border-top-color: @navbar-default-link-active-color; - border-bottom-color: @navbar-default-link-active-color; - } } } - > .dropdown > a .caret { - border-top-color: @navbar-default-link-color; - border-bottom-color: @navbar-default-link-color; - } - @media (max-width: @screen-xs-max) { // Dropdowns get custom display when collapsed @@ -561,24 +545,6 @@ color: @navbar-inverse-link-active-color; } } - > .dropdown > a:hover .caret { - border-top-color: @navbar-inverse-link-hover-color; - border-bottom-color: @navbar-inverse-link-hover-color; - } - > .dropdown > a .caret { - border-top-color: @navbar-inverse-link-color; - border-bottom-color: @navbar-inverse-link-color; - } - > .open > a { - &, - &:hover, - &:focus { - .caret { - border-top-color: @navbar-inverse-link-active-color; - border-bottom-color: @navbar-inverse-link-active-color; - } - } - } @media (max-width: @screen-xs-max) { // Dropdowns get custom display diff --git a/less/navs.less b/less/navs.less index 6cddcd494..859d5d866 100644 --- a/less/navs.less +++ b/less/navs.less @@ -48,11 +48,6 @@ &:focus { background-color: @nav-link-hover-bg; border-color: @link-color; - - .caret { - border-top-color: @link-hover-color; - border-bottom-color: @link-hover-color; - } } } @@ -138,11 +133,6 @@ &:focus { color: @nav-pills-active-link-hover-color; background-color: @nav-pills-active-link-hover-bg; - - .caret { - border-top-color: @nav-pills-active-link-hover-color; - border-bottom-color: @nav-pills-active-link-hover-color; - } } } } @@ -243,16 +233,6 @@ // Dropdowns // ------------------------- -// Make dropdown carets use link color in navs -.nav .caret { - border-top-color: @link-color; - border-bottom-color: @link-color; -} -.nav a:hover .caret { - border-top-color: @link-hover-color; - border-bottom-color: @link-hover-color; -} - // Specific dropdowns .nav-tabs .dropdown-menu { // make dropdown border overlap tab border diff --git a/less/variables.less b/less/variables.less index 08bb701db..cf217b366 100644 --- a/less/variables.less +++ b/less/variables.less @@ -186,8 +186,6 @@ @dropdown-header-color: @gray-light; -@dropdown-caret-color: #000; - // COMPONENT VARIABLES // -------------------------------------------------- @@ -321,7 +319,6 @@ @nav-disabled-link-hover-color: @gray-light; @nav-open-link-hover-color: #fff; -@nav-open-caret-border-color: #fff; // Tabs @nav-tabs-border-color: #ddd; -- cgit v1.2.3 From 9f68a5b241fff2adce3b95b5c5b486e84a1d88d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:39:39 -0800 Subject: Fixes #11516: Invert dropdown divider border in navbars --- less/navbar.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index d2ad023e1..a1d3bddb7 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -552,6 +552,9 @@ > .dropdown-header { border-color: @navbar-inverse-border; } + .divider { + background-color: @navbar-inverse-border; + } > li > a { color: @navbar-inverse-link-color; &:hover, -- cgit v1.2.3 From c13524e7e0f3d2a62935bbe2cb57c1388e04e052 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 12:49:51 -0800 Subject: Fixes #11553: Prevent double border on tables in panels without thead content --- less/panels.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 9a72732ab..549588073 100644 --- a/less/panels.less +++ b/less/panels.less @@ -64,6 +64,10 @@ > .panel-body + .table-responsive { border-top: 1px solid @table-border-color; } + > .table > tbody:first-child th, + > .table > tbody:first-child td { + border-top: 0; + } > .table-bordered, > .table-responsive > .table-bordered { border: 0; -- cgit v1.2.3 From 9d939080e6536277ec47d19e113bff7376489ff9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 14:22:31 -0800 Subject: Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class --- less/grid.less | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 67e78f760..329f68bd3 100644 --- a/less/grid.less +++ b/less/grid.less @@ -5,6 +5,16 @@ // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); + + @media (min-width: @screen-sm) { + width: @container-sm; + } + @media (min-width: @screen-md) { + width: @container-md; + } + @media (min-width: @screen-lg-min) { + width: @container-lg; + } } // mobile first defaults @@ -40,10 +50,6 @@ // it's full-width. @media (min-width: @screen-sm-min) { - .container { - width: @container-sm; - } - .make-grid-columns-float(sm); .make-grid(@grid-columns, sm, width); .make-grid(@grid-columns, sm, pull); @@ -60,10 +66,6 @@ // it's full-width. @media (min-width: @screen-md-min) { - .container { - width: @container-md; - } - .make-grid-columns-float(md); .make-grid(@grid-columns, md, width); .make-grid(@grid-columns, md, pull); @@ -80,10 +82,6 @@ // it's full-width. @media (min-width: @screen-lg-min) { - .container { - width: @container-lg; - } - .make-grid-columns-float(lg); .make-grid(@grid-columns, lg, width); .make-grid(@grid-columns, lg, pull); -- cgit v1.2.3 From d654f905028a40893fa553f529d12dceec879cf7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 15:37:11 -0800 Subject: Fixes #10147: Remove outline from carousel controls on focus --- less/carousel.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 317963b7f..e53365df4 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -91,6 +91,7 @@ // Hover/focus state &:hover, &:focus { + outline: none; color: @carousel-control-color; text-decoration: none; .opacity(.9); -- cgit v1.2.3 From 08e41d769a5fc34b60a307721dacc34eb36f1a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 29 Nov 2013 08:37:54 +0100 Subject: Add missing last column float --- less/mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index d5c63ee0c..f74d22b29 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -736,11 +736,11 @@ @item: ~".col-@{class}-@{index}"; .col(@index + 1, @item); } - .col(@index, @list) when (@index < @grid-columns) { // general + .col(@index, @list) when (@index =< @grid-columns) { // general @item: ~".col-@{class}-@{index}"; .col(@index + 1, ~"@{list}, @{item}"); } - .col(@index, @list) when (@index = @grid-columns) { // terminal + .col(@index, @list) when (@index > @grid-columns) { // terminal @{list} { float: left; } -- cgit v1.2.3 From 702ad4c3025c8db0ec482e5eccd339cf1e6c2a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 29 Nov 2013 11:37:06 +0100 Subject: Remove redundant comments --- less/grid.less | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 329f68bd3..e1f134e6d 100644 --- a/less/grid.less +++ b/less/grid.less @@ -30,9 +30,6 @@ // // Grid classes for extra small devices like smartphones. No offset, push, or // pull classes are present here due to the size of the target. -// -// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since -// it's full-width. .make-grid-columns-float(xs); .make-grid(@grid-columns, xs, width); @@ -45,9 +42,6 @@ // // Columns, offsets, pushes, and pulls for the small device range, from phones // to tablets. -// -// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-sm-min) { .make-grid-columns-float(sm); @@ -61,9 +55,6 @@ // Medium grid // // Columns, offsets, pushes, and pulls for the desktop device range. -// -// Note that `.col-md-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-md-min) { .make-grid-columns-float(md); @@ -77,9 +68,6 @@ // Large grid // // Columns, offsets, pushes, and pulls for the large desktop device range. -// -// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-lg-min) { .make-grid-columns-float(lg); -- cgit v1.2.3 From 09cd5289ab540486a9c601e79860b34a2fe1873c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 17:47:27 -0800 Subject: Fixes #11468: Prevent default gradient on in Firefox for Android --- less/navbar.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index a1d3bddb7..bae180be7 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -180,6 +180,7 @@ padding: 9px 10px; .navbar-vertical-align(34px); background-color: transparent; + background-image: none; // Fix for at least Firefox on Android, per #11468 border: 1px solid transparent; border-radius: @border-radius-base; -- cgit v1.2.3 From a4c54b5e5d948e9ec7cdd22bc0efa2241d2605c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 18:33:59 -0800 Subject: Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar --- less/jumbotron.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 22c29780a..4b0bf220d 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -24,6 +24,10 @@ border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container } + .container { + max-width: 100%; + } + @media screen and (min-width: @screen-sm-min) { padding-top: (@jumbotron-padding * 1.6); padding-bottom: (@jumbotron-padding * 1.6); -- cgit v1.2.3 From 36b82c37ecbedd13f9a2f3eca545745eb8eedf75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 21:59:28 -0800 Subject: Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index cf217b366..8f3ffedbc 100644 --- a/less/variables.less +++ b/less/variables.less @@ -157,7 +157,7 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); +@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @legend-color: @gray-dark; -- cgit v1.2.3 From bf9f39270c7c6d50b0355a0b1a5e470c0820af07 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 22:03:49 -0800 Subject: Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop --- less/modals.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 99cf76469..c9feb7f18 100644 --- a/less/modals.less +++ b/less/modals.less @@ -38,7 +38,7 @@ margin-left: auto; margin-right: auto; width: auto; - padding: 10px; + margin: 10px; z-index: (@zindex-modal-background + 10); } @@ -122,8 +122,8 @@ .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin-top: 30px; + margin-bottom: 30px; } .modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); -- cgit v1.2.3 From e4848286c86af39c5a30c845748fdc46de8b8dd5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 23:19:04 -0800 Subject: Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles --- less/thumbnails.less | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index bc4178bbf..43e7d1d26 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -5,9 +5,14 @@ // Mixin and adjust the regular image class .thumbnail { - .img-thumbnail(); - display: block; // Override the inline-block from `.img-thumbnail` + display: block; + padding: @thumbnail-padding; margin-bottom: @line-height-computed; + line-height: @line-height-base; + background-color: @thumbnail-bg; + border: 1px solid @thumbnail-border; + border-radius: @thumbnail-border-radius; + .transition(all .2s ease-in-out); > img { .img-responsive(); -- cgit v1.2.3 From a52e528d2771e0f150682532b06c0f29fa6b0ad6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 11:56:06 -0800 Subject: Fix up new margins on modals by not setting auto until screen-sm-min --- less/modals.less | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index c9feb7f18..e65dbf7f1 100644 --- a/less/modals.less +++ b/less/modals.less @@ -35,8 +35,6 @@ // Shell div to position the modal with bottom padding .modal-dialog { position: relative; - margin-left: auto; - margin-right: auto; width: auto; margin: 10px; z-index: (@zindex-modal-background + 10); @@ -122,8 +120,7 @@ .modal-dialog { width: 600px; - margin-top: 30px; - margin-bottom: 30px; + margin: 30px auto; } .modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); -- cgit v1.2.3 From 853b69f2dfe66a839efa6216e9e7c1a530f92f62 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 12:52:08 -0800 Subject: Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas --- less/input-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index 8516a79e9..d19c4c64a 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -10,7 +10,7 @@ border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table // Undo padding and float of grid classes - &.col { + &[class*="col-"] { float: none; padding-left: 0; padding-right: 0; -- cgit v1.2.3 From 21e2ae94897376ff0303144a703f7eb54be9bf3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 14:53:54 -0800 Subject: Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color --- less/panels.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 549588073..d782ffcde 100644 --- a/less/panels.less +++ b/less/panels.less @@ -110,6 +110,8 @@ margin-top: 0; margin-bottom: 0; font-size: ceil((@font-size-base * 1.125)); + color: inherit; + > a { color: inherit; } -- cgit v1.2.3 From d2f8b5327b36b9a9839d595070d841146aa4c6ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 14:58:35 -0800 Subject: Fixes #11515: Reorder the headings with body text and text emphasis classes --- less/type.less | 100 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 982d94f59..9a359685d 100644 --- a/less/type.less +++ b/less/type.less @@ -3,12 +3,62 @@ // -------------------------------------------------- +// Headings +// ------------------------- + +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { + font-family: @headings-font-family; + font-weight: @headings-font-weight; + line-height: @headings-line-height; + color: @headings-color; + + small, + .small { + font-weight: normal; + line-height: 1; + color: @headings-small-color; + } +} + +h1, +h2, +h3 { + margin-top: @line-height-computed; + margin-bottom: (@line-height-computed / 2); + + small, + .small { + font-size: 65%; + } +} +h4, +h5, +h6 { + margin-top: (@line-height-computed / 2); + margin-bottom: (@line-height-computed / 2); + + small, + .small { + font-size: 75%; + } +} + +h1, .h1 { font-size: @font-size-h1; } +h2, .h2 { font-size: @font-size-h2; } +h3, .h3 { font-size: @font-size-h3; } +h4, .h4 { font-size: @font-size-h4; } +h5, .h5 { font-size: @font-size-h5; } +h6, .h6 { font-size: @font-size-h6; } + + // Body text // ------------------------- p { margin: 0 0 (@line-height-computed / 2); } + .lead { margin-bottom: @line-height-computed; font-size: floor(@font-size-base * 1.15); @@ -72,55 +122,6 @@ cite { font-style: normal; } .text-center { text-align: center; } -// Headings -// ------------------------- - -h1, h2, h3, h4, h5, h6, -.h1, .h2, .h3, .h4, .h5, .h6 { - font-family: @headings-font-family; - font-weight: @headings-font-weight; - line-height: @headings-line-height; - color: @headings-color; - - small, - .small { - font-weight: normal; - line-height: 1; - color: @headings-small-color; - } -} - -h1, -h2, -h3 { - margin-top: @line-height-computed; - margin-bottom: (@line-height-computed / 2); - - small, - .small { - font-size: 65%; - } -} -h4, -h5, -h6 { - margin-top: (@line-height-computed / 2); - margin-bottom: (@line-height-computed / 2); - - small, - .small { - font-size: 75%; - } -} - -h1, .h1 { font-size: @font-size-h1; } -h2, .h2 { font-size: @font-size-h2; } -h3, .h3 { font-size: @font-size-h3; } -h4, .h4 { font-size: @font-size-h4; } -h5, .h5 { font-size: @font-size-h5; } -h6, .h6 { font-size: @font-size-h6; } - - // Page header // ------------------------- @@ -131,7 +132,6 @@ h6, .h6 { font-size: @font-size-h6; } } - // Lists // -------------------------------------------------- -- cgit v1.2.3 From 7aa6b4190be5316756fa179bb192258ce3b47548 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 15:57:25 -0800 Subject: Fixes #11402: Set width: auto; to select.form-control within .form-inline --- less/forms.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index a74babdb3..af1f5ac9e 100644 --- a/less/forms.less +++ b/less/forms.less @@ -309,6 +309,11 @@ input[type="checkbox"], display: inline-block; } + // Override `width: 100%;` when not within a `.form-group` + select.form-control { + width: auto; + } + // Remove default margin on radios/checkboxes that were used for stacking, and // then undo the floating of radios and checkboxes to match (which also avoids // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969). -- cgit v1.2.3 From 6a2ca0ab3a00a41bcd3c274af552f8a6e5c408fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:08:49 -0800 Subject: Fixes #11444: Use @navbar-padding-vertical for nav links padding --- less/navbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index bae180be7..202edb57c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -247,8 +247,8 @@ > li { float: left; > a { - padding-top: ((@navbar-height - @line-height-computed) / 2); - padding-bottom: ((@navbar-height - @line-height-computed) / 2); + padding-top: @navbar-padding-vertical; + padding-bottom: @navbar-padding-vertical; } } } -- cgit v1.2.3 From 67d4e3323d322ec7c6719204ca02732576c7ee7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:18:07 -0800 Subject: Fixes #11277: Drop the abbr element from the .initialism selector --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 9a359685d..fdf982fce 100644 --- a/less/type.less +++ b/less/type.less @@ -215,7 +215,7 @@ abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @abbr-border-color; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } -- cgit v1.2.3 From 6bc09dd94949e05827c541795e4133b0cdbf7cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:29:52 -0800 Subject: Fixes #11268: Account for badges within buttons by matching background to text color and text color to background --- less/mixins.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 51a4cc5a4..b587a69e5 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -489,6 +489,11 @@ border-color: @border; } } + + .badge { + color: @background; + background-color: #fff; + } } // Button sizes -- cgit v1.2.3 From cf40b5db60fa238b24a92567860006c1581261f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:04:55 -0800 Subject: Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox --- less/tables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 7192c4d5e..ca565f4b7 100644 --- a/less/tables.less +++ b/less/tables.less @@ -133,6 +133,7 @@ th { // Reset default table behavior table col[class*="col-"] { + position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623) float: none; display: table-column; } -- cgit v1.2.3 From 841da88f3fc93740cca07b6e4581a333d77964f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:08:41 -0800 Subject: Remove browser default top margin from dl elements --- less/type.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/type.less b/less/type.less index fdf982fce..ac07ac7ce 100644 --- a/less/type.less +++ b/less/type.less @@ -171,6 +171,7 @@ ol { // Description Lists dl { + margin-top: 0; // Remove browser default margin-bottom: @line-height-computed; } dt, -- cgit v1.2.3 From 48269dcd282f05be79c9bb8cba032c745b3b337a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:17:43 -0800 Subject: Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below --- less/forms.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index af1f5ac9e..dc425ecc1 100644 --- a/less/forms.less +++ b/less/forms.less @@ -350,6 +350,12 @@ input[type="checkbox"], margin-bottom: 0; padding-top: (@padding-base-vertical + 1); // Default padding plus a border } + // Account for padding we're adding to ensure the alignment and of help text + // and other content below items + .radio, + .checkbox { + min-height: @line-height-computed + (@padding-base-vertical + 1); + } // Make form groups behave like rows .form-group { -- cgit v1.2.3