From da044d9c6923bb7472b110301b1e1d9cfc543258 Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Sat, 15 Mar 2014 17:56:24 +1100 Subject: WebKit CSS3 carousel transforms for supported devices --- less/carousel.less | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 6f5023756..9a374a447 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -230,3 +230,26 @@ bottom: 20px; } } + +// WebKit CSS3 transforms for supported devices +@media all and (-webkit-transform-3d) { + .carousel { + .item { + -webkit-transition: 0.6s -webkit-transform ease-in-out; + -webkit-backface-visibility: hidden; + -webkit-perspective: 1000; + &.next, &.active.right { + -webkit-transform: translate3d(100%,0,0); + left: 0; + } + &.prev, &.active.left { + -webkit-transform: translate3d(-100%,0,0); + left: 0; + } + &.next.left, &.prev.right, &.active { + -webkit-transform: translate3d(0%,0,0); + left: 0; + } + } + } +} -- cgit v1.2.3 From 8ab6746cbe567029400e0a50bff696599f358038 Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Sat, 15 Mar 2014 18:30:09 +1100 Subject: Utilised mixins rather than specific WebKit properties --- less/carousel.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 9a374a447..1714abdec 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -235,19 +235,19 @@ @media all and (-webkit-transform-3d) { .carousel { .item { - -webkit-transition: 0.6s -webkit-transform ease-in-out; - -webkit-backface-visibility: hidden; - -webkit-perspective: 1000; + .transition-transform(~'0.6s ease-in-out'); + .backface-visibility(~'hidden'); + .perspective(1000); &.next, &.active.right { - -webkit-transform: translate3d(100%,0,0); + .translate3d(100%, 0, 0); left: 0; } &.prev, &.active.left { - -webkit-transform: translate3d(-100%,0,0); + .translate3d(-100%, 0, 0); left: 0; } &.next.left, &.prev.right, &.active { - -webkit-transform: translate3d(0%,0,0); + .translate3d(0%, 0, 0); left: 0; } } -- cgit v1.2.3 From bab63abee80eb2ceaa0c96b6417dde6baefa4718 Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Sun, 16 Mar 2014 17:07:55 +1100 Subject: Removed unnecessary percentage sign for 3D translation --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 1714abdec..0d081928e 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -247,7 +247,7 @@ left: 0; } &.next.left, &.prev.right, &.active { - .translate3d(0%, 0, 0); + .translate3d(0, 0, 0); left: 0; } } -- cgit v1.2.3 From 4fa2d9e0ca3e3dcfc0db46329e2213550961ea7f Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Wed, 23 Apr 2014 20:36:49 +1000 Subject: Improved mixin ability with nested media query --- less/carousel.less | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 0d081928e..ea3cade88 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -24,6 +24,25 @@ &:extend(.img-responsive); line-height: 1; } + + // WebKit CSS3 transforms for supported devices + @media all and (-webkit-transform-3d) { + .transition-transform(~'0.6s ease-in-out'); + .backface-visibility(~'hidden'); + .perspective(1000); + &.next, &.active.right { + .translate3d(100%, 0, 0); + left: 0; + } + &.prev, &.active.left { + .translate3d(-100%, 0, 0); + left: 0; + } + &.next.left, &.prev.right, &.active { + .translate3d(0, 0, 0); + left: 0; + } + } } > .active, @@ -230,26 +249,3 @@ bottom: 20px; } } - -// WebKit CSS3 transforms for supported devices -@media all and (-webkit-transform-3d) { - .carousel { - .item { - .transition-transform(~'0.6s ease-in-out'); - .backface-visibility(~'hidden'); - .perspective(1000); - &.next, &.active.right { - .translate3d(100%, 0, 0); - left: 0; - } - &.prev, &.active.left { - .translate3d(-100%, 0, 0); - left: 0; - } - &.next.left, &.prev.right, &.active { - .translate3d(0, 0, 0); - left: 0; - } - } - } -} -- cgit v1.2.3 From dd0b0cd664c800e0a1c6a4848716aa85d8eec66f Mon Sep 17 00:00:00 2001 From: Nick Colley Date: Wed, 30 Apr 2014 00:57:41 +0100 Subject: Changed last-child to first-child As noted by @jerem the first child will actually be the last shown --- less/navbar.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index b5e9a5f8d..c4bd0c4a5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -271,7 +271,7 @@ } } - &.navbar-right:last-child { + &.navbar-right:first-child { margin-right: -@navbar-padding-horizontal; } } @@ -326,8 +326,8 @@ padding-bottom: 0; .box-shadow(none); - // Outdent the form if last child to line up with content down the page - &.navbar-right:last-child { + // Outdent the form if first child to line up with content down the page + &.navbar-right:first-child { margin-right: -@navbar-padding-horizontal; } } @@ -375,8 +375,8 @@ margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; - // Outdent the form if last child to line up with content down the page - &.navbar-right:last-child { + // Outdent the form if first child to line up with content down the page + &.navbar-right:first-child { margin-right: 0; } } -- cgit v1.2.3 From 128e52ff29be0f275bb92693c9db3ba34d5c003d Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Tue, 17 Jun 2014 23:35:35 +0200 Subject: Fix dismissible spelling --- less/alerts.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index c3afeb958..df070b8ab 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -33,11 +33,12 @@ } } -// Dismissable alerts +// Dismissible alerts // // Expand the right padding and account for the close button's positioning. -.alert-dismissable { +.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0. +.alert-dismissible { padding-right: (@alert-padding + 20); // Adjust close link position -- cgit v1.2.3 From de55fb85a0295553e65231e6116985863acb7ad9 Mon Sep 17 00:00:00 2001 From: ahoereth Date: Wed, 18 Jun 2014 19:07:55 +0200 Subject: Add white-space: nowrap; to .dropdown-header Dropdowns adjust their width to the width of their containing a elements - which have no line breaks ([*](https://github.com/twbs/bootstrap/commit/f226463b057f945795661c3d19fbcabf63b931f7)). Consistent to this dropdown-headers also should be prevent to contain line breaks. --- less/dropdowns.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 8d0a6a2d0..3eb7fc05c 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -155,6 +155,7 @@ font-size: @font-size-small; line-height: @line-height-base; color: @dropdown-header-color; + white-space: nowrap; // as with > li > a } // Backdrop to catch body clicks on mobile, etc. -- cgit v1.2.3 From 8c403dc1dcccc38057aba85c49a314a36a93c0af Mon Sep 17 00:00:00 2001 From: Ross Allen Date: Wed, 18 Jun 2014 14:40:50 -0700 Subject: Darken @gray-light to meet accessibility guidelines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `@gray-light` darkens from #999 to #777, which puts `.text-muted` at the threshold for the 4.5:1 WCAG minimum contrast[1]. #777:#fff is 4.48:1. The “Example” headers in docs become #959595, which is contrast ratio 3:1, the minimum for larger text. Since the headers are less important than the surrounding text, 3:1 is fine and an improvement on the previous #bbb:#fff (1.92:1). Fixes issue #13847. [1] http://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html --- 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 a2e464b6e..c6edad147 100644 --- a/less/variables.less +++ b/less/variables.less @@ -10,7 +10,7 @@ @gray-darker: lighten(#000, 13.5%); // #222 @gray-dark: lighten(#000, 20%); // #333 @gray: lighten(#000, 33.5%); // #555 -@gray-light: lighten(#000, 60%); // #999 +@gray-light: lighten(#000, 46.7%); // #777 @gray-lighter: lighten(#000, 93.5%); // #eee @brand-primary: #428bca; -- cgit v1.2.3 From 46e8a5817d0ddb98343dde1e0f0f8b335aba41e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 17:34:09 -0700 Subject: fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly --- less/mixins/image.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/mixins/image.less b/less/mixins/image.less index f233cb3e1..5d2cccb27 100644 --- a/less/mixins/image.less +++ b/less/mixins/image.less @@ -8,6 +8,7 @@ // Keep images from scaling beyond the width of their parents. .img-responsive(@display: block) { display: @display; + width: 100% \9; // Force IE10 and below to size SVG images correctly max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching } -- cgit v1.2.3 From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:19:17 -0700 Subject: fixes #13021: add .form-group-sm/-lg --- less/forms.less | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 2f629b0a1..ab23e68a3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -507,4 +507,29 @@ input[type="checkbox"] { top: 0; right: (@grid-gutter-width / 2); } + + // Form group sizes + // + // Quick utility class for applying `.input-lg` and `.input-sm` styles to the + // inputs and labels within a `.form-group`. + .form-group-lg { + @media (min-width: @screen-sm-min) { + .control-label { + padding-top: ((@padding-large-vertical * @line-height-large) + 1); + } + } + .form-control { + &:extend(.input-lg); + } + } + .form-group-sm { + @media (min-width: @screen-sm-min) { + .control-label { + padding-top: (@padding-small-vertical + 1); + } + } + .form-control { + &:extend(.input-sm); + } + } } -- cgit v1.2.3 From 20b6ae63577d2d5101a1b27cb87f44cd113d0b6f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:47:32 -0700 Subject: fixes #13020: proper color for small/.small in list group headings --- less/list-group.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 2514389b1..1946bf59f 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -94,7 +94,9 @@ a.list-group-item { border-color: @list-group-active-border; // Force color to inherit for custom content - .list-group-item-heading { + .list-group-item-heading, + .list-group-item-heading > small, + .list-group-item-heading > .small { color: inherit; } .list-group-item-text { -- cgit v1.2.3 From 43d21b97f24b0f6a593878ae4355413ce5b38884 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 19:14:26 -0700 Subject: fixes #13093: reset the background color and remove background image on disabled theme buttons --- less/theme.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 6f957fb39..820270af2 100644 --- a/less/theme.less +++ b/less/theme.less @@ -48,6 +48,12 @@ background-color: darken(@btn-color, 12%); border-color: darken(@btn-color, 14%); } + + &:disabled, + &[disabled] { + background-color: darken(@btn-color, 12%); + background-image: none; + } } // Common styles -- cgit v1.2.3 From 783b2268c2f5b11a79a2e3ba3278e53321bdc9d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 21:26:53 -0700 Subject: change skew(x,y) to skewX skewY because mdn told me so --- less/mixins/vendor-prefixes.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/mixins/vendor-prefixes.less b/less/mixins/vendor-prefixes.less index 4418ac911..b87de9cb1 100644 --- a/less/mixins/vendor-prefixes.less +++ b/less/mixins/vendor-prefixes.less @@ -131,10 +131,10 @@ transform: scaleY(@ratio); } .skew(@x; @y) { - -webkit-transform: skew(@x, @y); + -webkit-transform: skewX(@x) skewY(@y); -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ - -o-transform: skew(@x, @y); - transform: skew(@x, @y); + -o-transform: skewX(@x) skewY(@y); + transform: skewX(@x) skewY(@y); } .translate(@x; @y) { -webkit-transform: translate(@x, @y); -- cgit v1.2.3 From c7cd63107b551ddb8fe201340f1fa9cbe97f8af0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 21:52:34 -0700 Subject: fixes #13346: add a variable for .dl-horizontal's offset --- less/type.less | 4 ++-- less/variables.less | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 93414474a..5eb69f3c2 100644 --- a/less/type.less +++ b/less/type.less @@ -219,13 +219,13 @@ dd { @media (min-width: @grid-float-breakpoint) { dt { float: left; - width: (@component-offset-horizontal - 20); + width: (@dl-horizontal-offset - 20); clear: left; text-align: right; .text-overflow(); } dd { - margin-left: @component-offset-horizontal; + margin-left: @dl-horizontal-offset; } } } diff --git a/less/variables.less b/less/variables.less index c6edad147..2f339fb41 100644 --- a/less/variables.less +++ b/less/variables.less @@ -836,6 +836,8 @@ @blockquote-border-color: @gray-lighter; //** Page header border color @page-header-border-color: @gray-lighter; +//** Width of horizontal description list titles +@dl-horizontal-offset: @component-offset-horizontal; //== Miscellaneous -- cgit v1.2.3 From 2a380f6bd8c4f96ff59de88841968fd538caf538 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 21:58:29 -0700 Subject: fixes #13347: make striped progress bars its own class --- less/progress-bars.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 74b702843..0294deb0e 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -41,7 +41,8 @@ } // Striped bars -.progress-striped .progress-bar { +.progress-striped .progress-bar, +.progress-bar-striped { #gradient > .striped(); background-size: 40px 40px; } -- cgit v1.2.3 From 99f176e7ec678b4c9ea4fc973135d39a4553feab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:35:05 -0700 Subject: rewrite striped and active to deprecate the parent selectors, change the docs --- less/mixins/progress-bar.less | 2 ++ less/progress-bars.less | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins/progress-bar.less b/less/mixins/progress-bar.less index f71a57154..db68f02f7 100644 --- a/less/mixins/progress-bar.less +++ b/less/mixins/progress-bar.less @@ -2,6 +2,8 @@ .progress-bar-variant(@color) { background-color: @color; + + // Depcreated parent class requirement as of v3.2 .progress-striped & { #gradient > .striped(); } diff --git a/less/progress-bars.less b/less/progress-bars.less index 0294deb0e..5292c265e 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -41,6 +41,10 @@ } // Striped bars +// +// `.progress-striped .progress-bar` is deprecated as of v3.2 in favor of the +// `.progress-bar-striped` class, which you just add to an existing +// `.progress-bar`. .progress-striped .progress-bar, .progress-bar-striped { #gradient > .striped(); @@ -48,7 +52,11 @@ } // Call animation for the active one -.progress.active .progress-bar { +// +// `.progress.active .progress-bar` is deprecated as of v3.2 in favor of the +// `.progress-bar.active` approach. +.progress.active .progress-bar, +.progress-bar.active { .animation(progress-bar-stripes 2s linear infinite); } -- cgit v1.2.3 From a012ba465dcc54fbf91aca61bb87cbba68eec1d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 23:21:44 -0700 Subject: lol words --- less/mixins/progress-bar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins/progress-bar.less b/less/mixins/progress-bar.less index db68f02f7..56a22e54b 100644 --- a/less/mixins/progress-bar.less +++ b/less/mixins/progress-bar.less @@ -3,7 +3,7 @@ .progress-bar-variant(@color) { background-color: @color; - // Depcreated parent class requirement as of v3.2 + // Deprecated parent class requirement as of v3.2 .progress-striped & { #gradient > .striped(); } -- cgit v1.2.3 From ae793ad749ec0f39219dc7fb58fafd81d742cd74 Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 19 Jun 2014 11:09:35 +0200 Subject: Use full deprecation version --- less/mixins/progress-bar.less | 2 +- less/mixins/vendor-prefixes.less | 2 +- less/progress-bars.less | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins/progress-bar.less b/less/mixins/progress-bar.less index 56a22e54b..f07996a34 100644 --- a/less/mixins/progress-bar.less +++ b/less/mixins/progress-bar.less @@ -3,7 +3,7 @@ .progress-bar-variant(@color) { background-color: @color; - // Deprecated parent class requirement as of v3.2 + // Deprecated parent class requirement as of v3.2.0 .progress-striped & { #gradient > .striped(); } diff --git a/less/mixins/vendor-prefixes.less b/less/mixins/vendor-prefixes.less index b87de9cb1..e2008c8b2 100644 --- a/less/mixins/vendor-prefixes.less +++ b/less/mixins/vendor-prefixes.less @@ -1,6 +1,6 @@ // Vendor Prefixes // -// All vendor mixins are deprecated as of v3.2 due to the introduction of +// All vendor mixins are deprecated as of v3.2.0 due to the introduction of // Autoprefixer in our Gruntfile. They will be removed in v4. // - Animations diff --git a/less/progress-bars.less b/less/progress-bars.less index 5292c265e..3d4e6306f 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -42,7 +42,7 @@ // Striped bars // -// `.progress-striped .progress-bar` is deprecated as of v3.2 in favor of the +// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the // `.progress-bar-striped` class, which you just add to an existing // `.progress-bar`. .progress-striped .progress-bar, @@ -53,7 +53,7 @@ // Call animation for the active one // -// `.progress.active .progress-bar` is deprecated as of v3.2 in favor of the +// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the // `.progress-bar.active` approach. .progress.active .progress-bar, .progress-bar.active { -- cgit v1.2.3 From 8bd4163ad463a0f208a55a8f64ba7fc6cb826282 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 18:14:56 -0700 Subject: fixes #13881: restore existing striped progress bar behavior with theme styles --- less/theme.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 820270af2..b089424cf 100644 --- a/less/theme.less +++ b/less/theme.less @@ -197,6 +197,11 @@ .progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); } .progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); } +// Reset the striped class because our mixins don't do multiple gradients and +// the above custom styles override the new `.progress-bar-striped` in v3.2.0. +.progress-bar-striped { + #gradient > .striped(); +} // -- cgit v1.2.3 From 1e53dcd137e7d8c8abe26af610ebb14c26de1043 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 18:33:41 -0700 Subject: Fixes #13872: Always apply padding to .form-control-static for that vertical alignment --- less/forms.less | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index ab23e68a3..202cdfcc4 100644 --- a/less/forms.less +++ b/less/forms.less @@ -355,7 +355,11 @@ input[type="checkbox"] { // a horizontal form layout. .form-control-static { - margin-bottom: 0; // Remove default margin from `p` + // Size it appropriately next to real form controls + padding-top: (@padding-base-vertical + 1); + padding-bottom: (@padding-base-vertical + 1); + // Remove default margin from `p` + margin-bottom: 0; } @@ -484,11 +488,6 @@ input[type="checkbox"] { .make-row(); } - .form-control-static { - padding-top: (@padding-base-vertical + 1); - padding-bottom: (@padding-base-vertical + 1); - } - // Reset spacing and right align labels, but scope to media queries so that // labels on narrow viewports stack the same as a default form example. @media (min-width: @screen-sm-min) { -- cgit v1.2.3 From e98fc373e3ef6e4a884a0142d50c765a9db5bd01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 20 Jun 2014 13:24:14 -0700 Subject: Fixes #13872 more: add overrides for lg and sm input modifiers --- less/forms.less | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 202cdfcc4..841762f4c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -281,6 +281,26 @@ input[type="checkbox"] { } +// Static form control text +// +// Apply class to a `p` element to make any string of text align with labels in +// a horizontal form layout. + +.form-control-static { + // Size it appropriately next to real form controls + padding-top: (@padding-base-vertical + 1); + padding-bottom: (@padding-base-vertical + 1); + // Remove default margin from `p` + margin-bottom: 0; + + &.input-lg, + &.input-sm { + padding-left: 0; + padding-right: 0; + } +} + + // Form control sizing // // Build on `.form-control` with modifier classes to decrease or increase the @@ -349,20 +369,6 @@ input[type="checkbox"] { } -// Static form control text -// -// Apply class to a `p` element to make any string of text align with labels in -// a horizontal form layout. - -.form-control-static { - // Size it appropriately next to real form controls - padding-top: (@padding-base-vertical + 1); - padding-bottom: (@padding-base-vertical + 1); - // Remove default margin from `p` - margin-bottom: 0; -} - - // Help text // // Apply to any element you wish to create light text for placement immediately -- cgit v1.2.3 From 09cf618acff6e6992aa14bc11c89206f104c6748 Mon Sep 17 00:00:00 2001 From: Thomas Welton Date: Fri, 20 Jun 2014 10:31:49 +0100 Subject: Use @font-size-small variable to calculate font-size fixes #13713 #13809 --- less/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 5eb69f3c2..9b1e48bae 100644 --- a/less/type.less +++ b/less/type.less @@ -74,10 +74,10 @@ p { // Emphasis & misc // ------------------------- -// Ex: 14px base font * 85% = about 12px +// Ex: (12px small font / 14px base font) * 100% = about 85% small, .small { - font-size: 85%; + font-size: floor((100% * @font-size-small / @font-size-base)); } // Undo browser default styling -- cgit v1.2.3 From df7cfe86525252034cf85a365d09a4c2485116b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jun 2014 10:38:45 -0700 Subject: Fixes #13903: Restore side padding on .btn-block --- less/buttons.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index d4fc156be..492bdc65a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -140,8 +140,6 @@ .btn-block { display: block; width: 100%; - padding-left: 0; - padding-right: 0; } // Vertically space out multiple block buttons -- cgit v1.2.3 From e9ac7c1e1c9198753f8a7ad706cc2bb20c9976ad Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Tue, 24 Jun 2014 17:08:16 +0200 Subject: Partly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf Fixes #13911 --- less/progress-bars.less | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 3d4e6306f..3ac52a29e 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -6,6 +6,13 @@ // Bar animations // ------------------------- +// WebKit +@-webkit-keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + +// Spec and IE10+ @keyframes progress-bar-stripes { from { background-position: 40px 0; } to { background-position: 0 0; } -- cgit v1.2.3 From 8ad583063bd11e1b8841e1f27207660e0181df19 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 24 Jun 2014 18:30:24 +0200 Subject: Move variable declaration before its use for Sass In Sass, variable must be declared before it is used. This also removes Miscellaneous section, because horizontal line color and form / list paddings are Typography. --- less/variables.less | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 2f339fb41..582f0f8d3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -822,6 +822,8 @@ // //## +//** Horizontal offset for forms and lists. +@component-offset-horizontal: 180px; //** Text muted color @text-muted: @gray-light; //** Abbreviations and acronyms border color @@ -838,14 +840,7 @@ @page-header-border-color: @gray-lighter; //** Width of horizontal description list titles @dl-horizontal-offset: @component-offset-horizontal; - - -//== Miscellaneous -// -//## - //** Horizontal line color. @hr-border: @gray-lighter; -//** Horizontal offset for forms and lists. -@component-offset-horizontal: 180px; + -- cgit v1.2.3 From 71974e2f4d2d42ebb13e357245e60b4b961a3bfa Mon Sep 17 00:00:00 2001 From: Andrei Railean Date: Wed, 25 Jun 2014 14:01:34 +1000 Subject: assign background to row of .table-striped if background is not set on row, striping doesn't work properly in responsive tables where row and cells are set to display: block. --- less/tables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 2e1ef337b..e5347362e 100644 --- a/less/tables.less +++ b/less/tables.less @@ -106,6 +106,7 @@ th { .table-striped { > tbody > tr:nth-child(odd) { + background-color: @table-bg-accent; > td, > th { background-color: @table-bg-accent; -- cgit v1.2.3 From ac67bc857fb3e4a4da1240222d51dd8a76a1bacf Mon Sep 17 00:00:00 2001 From: Andrei Railean Date: Wed, 25 Jun 2014 15:16:25 +1000 Subject: removing redundant background declarations on TDs --- less/tables.less | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index e5347362e..38c7da349 100644 --- a/less/tables.less +++ b/less/tables.less @@ -107,10 +107,6 @@ th { .table-striped { > tbody > tr:nth-child(odd) { background-color: @table-bg-accent; - > td, - > th { - background-color: @table-bg-accent; - } } } @@ -121,10 +117,7 @@ th { .table-hover { > tbody > tr:hover { - > td, - > th { - background-color: @table-bg-hover; - } + background-color: @table-bg-hover; } } -- cgit v1.2.3 From 41f27fd81367f1f4bda48f02de6f3ed9999ad421 Mon Sep 17 00:00:00 2001 From: Thomas Coleman Date: Wed, 25 Jun 2014 15:00:41 +0100 Subject: Added @gray-base variable to make @gray-{shade} reference, also allows @gray-base to be modified with less#modifyVars and the vars to cascade --- less/variables.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 582f0f8d3..91cf3d5c8 100644 --- a/less/variables.less +++ b/less/variables.less @@ -7,11 +7,12 @@ // //## Gray and brand colors for use across Bootstrap. -@gray-darker: lighten(#000, 13.5%); // #222 -@gray-dark: lighten(#000, 20%); // #333 -@gray: lighten(#000, 33.5%); // #555 -@gray-light: lighten(#000, 46.7%); // #777 -@gray-lighter: lighten(#000, 93.5%); // #eee +@gray-base: #000; +@gray-darker: lighten(@gray-base, 13.5%); // #222 +@gray-dark: lighten(@gray-base, 20%); // #333 +@gray: lighten(@gray-base, 33.5%); // #555 +@gray-light: lighten(@gray-base, 46.7%); // #777 +@gray-lighter: lighten(@gray-base, 93.5%); // #eee @brand-primary: #428bca; @brand-success: #5cb85c; -- cgit v1.2.3 From fdacff229752e413f2705c8378e5023301db92de Mon Sep 17 00:00:00 2001 From: Thomas Coleman Date: Wed, 25 Jun 2014 16:09:57 +0100 Subject: Fixed @gray-base value being once space short --- 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 91cf3d5c8..aa94ab8e2 100644 --- a/less/variables.less +++ b/less/variables.less @@ -7,7 +7,7 @@ // //## Gray and brand colors for use across Bootstrap. -@gray-base: #000; +@gray-base: #000; @gray-darker: lighten(@gray-base, 13.5%); // #222 @gray-dark: lighten(@gray-base, 20%); // #333 @gray: lighten(@gray-base, 33.5%); // #555 -- cgit v1.2.3 From e40df7cfacef0b581810c8ec661923054541638c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 25 Jun 2014 16:56:36 -0700 Subject: fixes #13912: make radios/checkboxes work with inline forms again --- 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 841762f4c..2c5e9bfa9 100644 --- a/less/forms.less +++ b/less/forms.less @@ -449,7 +449,7 @@ input[type="checkbox"] { } .radio input[type="radio"], .checkbox input[type="checkbox"] { - float: none; + position: relative; margin-left: 0; } -- cgit v1.2.3 From 76ca3677f515d1a658a3360270e31e32dafc095e Mon Sep 17 00:00:00 2001 From: Thierry Goettelmann Date: Thu, 26 Jun 2014 15:50:20 +0200 Subject: Remove "pointer" cursor on disabled list-group-item --- less/list-group.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 1946bf59f..8cf6230d1 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -74,7 +74,8 @@ a.list-group-item { &.disabled:focus { background-color: @list-group-disabled-bg; color: @list-group-disabled-color; - + cursor: default; + // Force color to inherit for custom content .list-group-item-heading { color: inherit; -- cgit v1.2.3 From 165c7889bdad142d0a9553fe7eae3abd96ec5a76 Mon Sep 17 00:00:00 2001 From: Thierry Goettelmann Date: Thu, 26 Jun 2014 16:31:37 +0200 Subject: Change cursor from "default" to "not-allowed" if disabled --- less/list-group.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 8cf6230d1..7d857cfd3 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -74,7 +74,7 @@ a.list-group-item { &.disabled:focus { background-color: @list-group-disabled-bg; color: @list-group-disabled-color; - cursor: default; + cursor: not-allowed; // Force color to inherit for custom content .list-group-item-heading { -- cgit v1.2.3 From 77c1a528ab48ba695f52f4f8f7b97bf7bbde05d1 Mon Sep 17 00:00:00 2001 From: Boris Serdyuk Date: Tue, 1 Jul 2014 19:15:00 +0400 Subject: place feedback icon lower, only if it really need --- less/forms.less | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 2c5e9bfa9..cb8add4b6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -331,7 +331,7 @@ input[type="checkbox"] { // Feedback icon (requires .glyphicon classes) .form-control-feedback { position: absolute; - top: (@line-height-computed + 5); // Height of the `label` and its margin + top: 0; right: 0; z-index: 2; // Ensure icon is above input groups display: block; @@ -363,9 +363,14 @@ input[type="checkbox"] { } -// Reposition feedback icon if label is hidden with "screenreader only" state -.has-feedback label.sr-only ~ .form-control-feedback { - top: 0; +// Reposition feedback icon if input has visible label above +.has-feedback label { + & ~ .form-control-feedback { + top: (@line-height-computed + 5); // Height of the `label` and its margin + } + &.sr-only ~ .form-control-feedback { + top: 0; + } } -- cgit v1.2.3 From b4958aba69cd942271bba465d5cbc8ef4a1d0529 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 22:54:56 -0700 Subject: merge in and resolve conflicts --- less/forms.less | 9 ++------- less/mixins/forms.less | 6 +++++- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index cb8add4b6..ca9194cf2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -362,9 +362,9 @@ input[type="checkbox"] { .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); } - // Reposition feedback icon if input has visible label above .has-feedback label { + & ~ .form-control-feedback { top: (@line-height-computed + 5); // Height of the `label` and its margin } @@ -387,7 +387,6 @@ input[type="checkbox"] { } - // Inline forms // // Make forms appear inline(-block) by adding the `.form-inline` class. Inline @@ -458,10 +457,7 @@ input[type="checkbox"] { margin-left: 0; } - // Validation states - // - // Reposition the icon because it's now within a grid column and columns have - // `position: relative;` on them. Also accounts for the grid gutter padding. + // Re-override the feedback icon. .has-feedback .form-control-feedback { top: 0; } @@ -514,7 +510,6 @@ input[type="checkbox"] { // Reposition the icon because it's now within a grid column and columns have // `position: relative;` on them. Also accounts for the grid gutter padding. .has-feedback .form-control-feedback { - top: 0; right: (@grid-gutter-width / 2); } diff --git a/less/mixins/forms.less b/less/mixins/forms.less index e36c4a8cf..6f55ed967 100644 --- a/less/mixins/forms.less +++ b/less/mixins/forms.less @@ -10,7 +10,11 @@ .radio, .checkbox, .radio-inline, - .checkbox-inline { + .checkbox-inline, + &.radio label, + &.checkbox label, + &.radio-inline label, + &.checkbox-inline label { color: @text-color; } // Set the border and box shadow on specific inputs to match -- cgit v1.2.3 From 96b545c6b5ebf5f74b75a735359187bd9b80689d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 23:14:23 -0700 Subject: Fixes #13989: Don't extend the input sizes; manually chain the selectors --- less/forms.less | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index ca9194cf2..dd113013f 100644 --- a/less/forms.less +++ b/less/forms.less @@ -306,11 +306,13 @@ input[type="checkbox"] { // Build on `.form-control` with modifier classes to decrease or increase the // height and font-size of form controls. -.input-sm { +.input-sm, +.form-group-sm .form-control { .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } -.input-lg { +.input-lg, +.form-group-l .form-control { .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } @@ -523,9 +525,6 @@ input[type="checkbox"] { padding-top: ((@padding-large-vertical * @line-height-large) + 1); } } - .form-control { - &:extend(.input-lg); - } } .form-group-sm { @media (min-width: @screen-sm-min) { @@ -533,8 +532,5 @@ input[type="checkbox"] { padding-top: (@padding-small-vertical + 1); } } - .form-control { - &:extend(.input-sm); - } } } -- cgit v1.2.3 From fcf9470a20c18c36bd306d1a3a708ed09255a226 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 2 Jul 2014 23:35:37 -0700 Subject: typo --- 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 dd113013f..d3c726765 100644 --- a/less/forms.less +++ b/less/forms.less @@ -312,7 +312,7 @@ input[type="checkbox"] { } .input-lg, -.form-group-l .form-control { +.form-group-lg .form-control { .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } -- cgit v1.2.3 From 3537481c972c4b5ebb678e91cd477d1941f99424 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 3 Jul 2014 00:55:32 -0700 Subject: Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices --- 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 55bfd2942..1371865ed 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -92,7 +92,7 @@ .navbar-collapse { max-height: @navbar-collapse-max-height; - @media (max-width: @screen-xs-min) and (orientation: landscape) { + @media (max-device-width: @screen-xs-min) and (orientation: landscape) { max-height: 200px; } } -- cgit v1.2.3 From 47521fd7d0b43a6ec062c0e722bfae033eb0a4eb Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 3 Jul 2014 12:53:23 +0200 Subject: Add touch-action: manipulate to buttons --- less/.csscomb.json | 2 ++ less/buttons.less | 1 + 2 files changed, 3 insertions(+) (limited to 'less') diff --git a/less/.csscomb.json b/less/.csscomb.json index 8456e41df..16c82174b 100644 --- a/less/.csscomb.json +++ b/less/.csscomb.json @@ -109,6 +109,8 @@ "list-style-type", "list-style-image", "pointer-events", + "-ms-touch-action", + "touch-action", "cursor", "visibility", "zoom", diff --git a/less/buttons.less b/less/buttons.less index 492bdc65a..814ee235c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -12,6 +12,7 @@ font-weight: @btn-font-weight; text-align: center; vertical-align: middle; + touch-action: manipulation; cursor: pointer; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; -- cgit v1.2.3 From 497597808319c74fe52aff1be41c0695ae40ee71 Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 3 Jul 2014 13:17:14 +0200 Subject: Remove superfluous cursor:pointer --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 492bdc65a..b6a7c31d0 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -85,7 +85,6 @@ .btn-link { color: @link-color; font-weight: normal; - cursor: pointer; border-radius: 0; &, -- cgit v1.2.3 From 0378a6be2a5a42f408aeed24e20933039352ba74 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 19:59:50 -0700 Subject: Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 --- 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 582f0f8d3..085c49ba0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -368,7 +368,7 @@ // Inverted navbar // Reset inverted navbar basics -@navbar-inverse-color: @gray-light; +@navbar-inverse-color: lighten(@gray-light, 12%); @navbar-inverse-bg: #222; @navbar-inverse-border: darken(@navbar-inverse-bg, 10%); -- cgit v1.2.3 From f22e7d857a4f7aa3f1def71e863b6ce761503928 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 20:01:18 -0700 Subject: Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress --- less/progress-bars.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 3ac52a29e..d5fbfb7db 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -69,11 +69,6 @@ // Account for lower percentages .progress-bar { - &[aria-valuenow="1"], - &[aria-valuenow="2"] { - min-width: 30px; - } - &[aria-valuenow="0"] { color: @gray-light; min-width: 30px; -- cgit v1.2.3 From 9677c95d83f361b7c3a43e56ef89590305c84905 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 5 Jul 2014 20:02:02 -0700 Subject: Fixes #13967: Don't reset the cite element's font-style --- less/type.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 9b1e48bae..6ab3c0804 100644 --- a/less/type.less +++ b/less/type.less @@ -80,11 +80,6 @@ small, font-size: floor((100% * @font-size-small / @font-size-base)); } -// Undo browser default styling -cite { - font-style: normal; -} - mark, .mark { background-color: @state-warning-bg; -- cgit v1.2.3 From e2029e122c58d5bca7f439ea4c8220957acc8903 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 15:09:20 -0700 Subject: Fixes #13997: Move min-height for radio/checkbox to their inner label --- 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 d3c726765..26589b3eb 100644 --- a/less/forms.less +++ b/less/forms.less @@ -208,11 +208,11 @@ input[type="month"] { .checkbox { position: relative; display: block; - min-height: @line-height-computed; // clear the floating input if there is no label text margin-top: 10px; margin-bottom: 10px; label { + min-height: @line-height-computed; // Ensure the input doens't jump when no text padding-left: 20px; margin-bottom: 0; font-weight: normal; -- cgit v1.2.3 From 9be2bbb5efdc09eb5446719daa8ac892b93f2ede Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 16:48:41 -0700 Subject: Fixes #14053: Don't show radio/checkbox in justified button groups --- less/button-groups.less | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 7021ecd17..c2e2260f0 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -232,9 +232,14 @@ // // See https://github.com/twbs/bootstrap/pull/12794 for more. -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { - position: absolute; - z-index: -1; - .opacity(0); +[data-toggle="buttons"] { + > .btn, + > .btn-group > .btn { + input[type="radio"], + input[type="checkbox"] { + position: absolute; + z-index: -1; + .opacity(0); + } + } } -- cgit v1.2.3 From 8e2348e9eda51296eb680192379ab37f10355ca3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 18:39:37 -0700 Subject: Fixes #13746: Add docs section for brand image --- less/navbar.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 571a186d2..58cbae14d 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -173,6 +173,10 @@ text-decoration: none; } + > img { + display: block; + } + @media (min-width: @grid-float-breakpoint) { .navbar > .container &, .navbar > .container-fluid & { -- cgit v1.2.3 From d6d8e204e6fac2fbe77b91dd50c30bc0f2d472e4 Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Mon, 7 Jul 2014 12:20:06 +1000 Subject: Added Firefox support for CSS3 carousel transition --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index ea3cade88..0cd7dc68e 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -26,7 +26,7 @@ } // WebKit CSS3 transforms for supported devices - @media all and (-webkit-transform-3d) { + @media all and (transform-3d), (-webkit-transform-3d) { .transition-transform(~'0.6s ease-in-out'); .backface-visibility(~'hidden'); .perspective(1000); -- cgit v1.2.3 From e88fa909916ab8aa6e35a99b11f025470a4a067f Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Mon, 7 Jul 2014 12:56:52 +0700 Subject: Address margins on .navbar-right to fix #13325 #13464. This commit follows f9fde56. --- less/navbar.less | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 571a186d2..567825f61 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -271,26 +271,10 @@ padding-bottom: @navbar-padding-vertical; } } - - &.navbar-right:first-child { - margin-right: -@navbar-padding-horizontal; - } } } -// Component alignment -// -// Repurpose the pull utilities as their own navbar utilities to avoid specificity -// issues with parents and chaining. Only do this when the navbar is uncollapsed -// though so that navbar contents properly stack and align in mobile. - -@media (min-width: @grid-float-breakpoint) { - .navbar-left { .pull-left(); } - .navbar-right { .pull-right(); } -} - - // Navbar form // // Extension of the `.form-inline` with some extra flavor for optimum display in @@ -326,11 +310,6 @@ padding-top: 0; padding-bottom: 0; .box-shadow(none); - - // Outdent the form if first child to line up with content down the page - &.navbar-right:first-child { - margin-right: -@navbar-padding-horizontal; - } } } @@ -375,14 +354,31 @@ float: left; margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; + } +} - // Outdent the form if first child to line up with content down the page - &.navbar-right:first-child { + +// Component alignment +// +// Repurpose the pull utilities as their own navbar utilities to avoid specificity +// issues with parents and chaining. Only do this when the navbar is uncollapsed +// though so that navbar contents properly stack and align in mobile. +// +// Declared after the navbar components to ensure more specificity on the margins. + +@media (min-width: @grid-float-breakpoint) { + .navbar-left { .pull-left(); } + .navbar-right { + .pull-right(); + margin-right: -@navbar-padding-horizontal; + + ~ .navbar-right { margin-right: 0; } } } + // Alternate navbars // -------------------------------------------------- -- cgit v1.2.3 From dc22226b95adba748dfc82fddfe1d128d9d8e057 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Mon, 7 Jul 2014 09:23:12 +0200 Subject: Fix small typo introduced in e2029e1 --- 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 26589b3eb..baeea7ca6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -212,7 +212,7 @@ input[type="month"] { margin-bottom: 10px; label { - min-height: @line-height-computed; // Ensure the input doens't jump when no text + min-height: @line-height-computed; // Ensure the input doesn't jump when there is no text padding-left: 20px; margin-bottom: 0; font-weight: normal; -- cgit v1.2.3 From 9ed9eb97ee09e514da942d680dac032628124816 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Jul 2014 00:56:06 -0700 Subject: Follow up to #13907: Add .focus styles for buttons --- less/buttons.less | 6 ++++-- less/mixins/buttons.less | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index cda87cb8c..05bd89d08 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -23,13 +23,15 @@ &, &:active, &.active { - &:focus { + &:focus, + &.focus { .tab-focus(); } } &:hover, - &:focus { + &:focus, + &.focus { color: @btn-default-color; text-decoration: none; } diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less index 409f8f20a..92d8a056c 100644 --- a/less/mixins/buttons.less +++ b/less/mixins/buttons.less @@ -10,6 +10,7 @@ &:hover, &:focus, + &.focus, &:active, &.active, .open > .dropdown-toggle& { @@ -28,6 +29,7 @@ &, &:hover, &:focus, + &.focus, &:active, &.active { background-color: @background; -- cgit v1.2.3 From 30d1236a1d80dc085cd7925e64618a65300e0c03 Mon Sep 17 00:00:00 2001 From: Hayden Bleasel Date: Tue, 8 Jul 2014 09:49:08 +1000 Subject: CSS3 Carousel code formatting --- less/carousel.less | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 0cd7dc68e..671d709df 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -30,15 +30,20 @@ .transition-transform(~'0.6s ease-in-out'); .backface-visibility(~'hidden'); .perspective(1000); - &.next, &.active.right { + + &.next, + &.active.right { .translate3d(100%, 0, 0); left: 0; } - &.prev, &.active.left { + &.prev, + &.active.left { .translate3d(-100%, 0, 0); left: 0; } - &.next.left, &.prev.right, &.active { + &.next.left, + &.prev.right, + &.active { .translate3d(0, 0, 0); left: 0; } -- cgit v1.2.3 From c769d7c21ff50d3cf2b3a9a97f0627d401e11f95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Jul 2014 16:59:59 -0700 Subject: Part 1 for fixing #13996: Revert the width: 100% \9; IE hack for SVG img-responsive --- less/mixins/image.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/mixins/image.less b/less/mixins/image.less index 5d2cccb27..f233cb3e1 100644 --- a/less/mixins/image.less +++ b/less/mixins/image.less @@ -8,7 +8,6 @@ // Keep images from scaling beyond the width of their parents. .img-responsive(@display: block) { display: @display; - width: 100% \9; // Force IE10 and below to size SVG images correctly max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching } -- cgit v1.2.3 From c298fb1a8839b722596253c30049bc971d47b87f Mon Sep 17 00:00:00 2001 From: Kyle Date: Wed, 9 Jul 2014 19:21:45 -0400 Subject: Add Pointer Events --- less/forms.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index baeea7ca6..98a40cb99 100644 --- a/less/forms.less +++ b/less/forms.less @@ -341,6 +341,7 @@ input[type="checkbox"] { height: @input-height-base; line-height: @input-height-base; text-align: center; + pointer-events: none; } .input-lg + .form-control-feedback { width: @input-height-large; -- cgit v1.2.3 From bd292ca3b89da982abf34473318c77ace3417fb5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jul 2014 15:13:18 -0700 Subject: Fixes #14107: Lighten placeholder text --- 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 c797ae08a..b7f6e80d3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -188,7 +188,7 @@ @input-border-focus: #66afe9; //** Placeholder text color -@input-color-placeholder: @gray-light; +@input-color-placeholder: #999; //** Default `.form-control` height @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -- cgit v1.2.3 From 3e8cddf8671db110c1d46c46c13065f6b9a67ad1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jul 2014 15:22:29 -0700 Subject: Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness --- less/utilities.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/utilities.less b/less/utilities.less index c0becabe3..a26031214 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -53,5 +53,4 @@ .affix { position: fixed; - .translate3d(0, 0, 0); } -- cgit v1.2.3 From fe0ef388982399d8925ec7aa8a70c4b4df3aa7e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jul 2014 15:55:15 -0700 Subject: Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. --- less/tables.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 38c7da349..25db1fe40 100644 --- a/less/tables.less +++ b/less/tables.less @@ -6,6 +6,12 @@ table { background-color: @table-bg; } +caption { + padding-top: @table-cell-padding; + padding-bottom: @table-cell-padding; + color: @text-muted; + text-align: left; +} th { text-align: left; } -- cgit v1.2.3 From 8c586a8e3ef3ce31cb18e064a0e78332a785d7a2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jul 2014 17:59:02 -0700 Subject: Fixes #14074: Make open dropdown nav links in navbar use gradients --- less/theme.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index b089424cf..559e11e26 100644 --- a/less/theme.less +++ b/less/theme.less @@ -116,6 +116,7 @@ @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); + .navbar-nav > .open > a, .navbar-nav > .active > a { #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%)); .box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); @@ -131,6 +132,7 @@ #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg); .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered + .navbar-nav > .open > a, .navbar-nav > .active > a { #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); .box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); -- cgit v1.2.3 From 45acf4e0403d866f99cdd52d0bfd267f0665a707 Mon Sep 17 00:00:00 2001 From: wangsai Date: Thu, 17 Jul 2014 20:13:16 +0800 Subject: Tabs to spaces --- 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 b7f6e80d3..9670a902f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -7,7 +7,7 @@ // //## Gray and brand colors for use across Bootstrap. -@gray-base: #000; +@gray-base: #000; @gray-darker: lighten(@gray-base, 13.5%); // #222 @gray-dark: lighten(@gray-base, 20%); // #333 @gray: lighten(@gray-base, 33.5%); // #555 -- cgit v1.2.3 From 7ba5c5d5e4f8fba4877bae9e423afbecbffa3e17 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 11 Jun 2014 09:30:30 +0300 Subject: Update grunt-csscomb. --- less/.csscomb.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/.csscomb.json b/less/.csscomb.json index 16c82174b..40695a478 100644 --- a/less/.csscomb.json +++ b/less/.csscomb.json @@ -1,16 +1,21 @@ { "always-semicolon": true, "block-indent": 2, - "colon-space": [0, 1], "color-case": "lower", "color-shorthand": true, - "combinator-space": true, "element-case": "lower", "eof-newline": true, "leading-zero": false, "remove-empty-rulesets": true, - "rule-indent": 2, - "stick-brace": " ", + "space-after-colon": 1, + "space-after-combinator": 1, + "space-before-selector-delimiter": 0, + "space-between-declarations": "\n", + "space-after-opening-brace": "\n", + "space-before-closing-brace": "\n", + "space-before-colon": 0, + "space-before-combinator": 1, + "space-before-opening-brace": 1, "strip-spaces": true, "unitless-zero": true, "vendor-prefix-align": true, -- cgit v1.2.3 From 5713bd74d617126796205d4ee29bfc6ff192ad39 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 23 Jul 2014 20:32:05 -0700 Subject: Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ --- less/forms.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 98a40cb99..d3c375688 100644 --- a/less/forms.less +++ b/less/forms.less @@ -183,9 +183,11 @@ input[type="month"] { &.input-sm { line-height: @input-height-small; + line-height: @line-height-small ~"\0"; } &.input-lg { line-height: @input-height-large; + line-height: @line-height-large ~"\0"; } } -- cgit v1.2.3 From 6dde491ddf4169fd1c9b063cfc6764cdf828737a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 23 Jul 2014 20:49:47 -0700 Subject: Fixes #14168: bold nested kbd elements --- less/code.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/code.less b/less/code.less index baa13df61..a08b4d48c 100644 --- a/less/code.less +++ b/less/code.less @@ -32,6 +32,7 @@ kbd { kbd { padding: 0; font-size: 100%; + font-weight: bold; box-shadow: none; } } -- cgit v1.2.3 From 078aafe7fd5d7f44725d4de76d0a0510ce43d344 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 23 Jul 2014 20:54:07 -0700 Subject: Fixes #14221: Make .form-control-static work in inline forms as well --- less/forms.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index d3c375688..7749479d2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -421,6 +421,11 @@ input[type="checkbox"] { vertical-align: middle; } + // Make static controls behave like regular ones + .form-control-static { + display: inline-block; + } + .input-group { display: inline-table; vertical-align: middle; -- cgit v1.2.3 From 98d693ba7bff3b14f92fea198f8ad49ac44b4872 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 23 Jul 2014 21:03:46 -0700 Subject: Fixes #14142: Adding horizontal padding to captions in tables in panels. --- less/panels.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 2dc21316d..73920825d 100644 --- a/less/panels.less +++ b/less/panels.less @@ -100,6 +100,11 @@ > .table-responsive > .table, > .panel-collapse > .table { margin-bottom: 0; + + caption { + padding-left: @panel-body-padding; + padding-right: @panel-body-padding; + } } // Add border top radius for first one > .table:first-child, -- cgit v1.2.3 From feed9aed5b471c20b02c4ca6620366cac9327db8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Aug 2014 13:05:11 -0700 Subject: Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers --- less/tables.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 25db1fe40..ef745ea8e 100644 --- a/less/tables.less +++ b/less/tables.less @@ -169,11 +169,12 @@ table { // will display normally. .table-responsive { + overflow-x: auto; + @media screen and (max-width: @screen-xs-max) { width: 100%; margin-bottom: (@line-height-computed * 0.75); overflow-y: hidden; - overflow-x: auto; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid @table-border-color; -webkit-overflow-scrolling: touch; -- cgit v1.2.3 From b9e6848dc8d8c146911e0999c9f1e68780a1606e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Aug 2014 13:55:02 -0700 Subject: Fixes #14253: Add borders for tables that follow bodies in panels --- less/panels.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 73920825d..9136cbfdf 100644 --- a/less/panels.less +++ b/less/panels.less @@ -145,7 +145,9 @@ } } > .panel-body + .table, - > .panel-body + .table-responsive { + > .panel-body + .table-responsive, + > .table + .panel-body, + > .table-responsive + .panel-body { border-top: 1px solid @table-border-color; } > .table > tbody:first-child > tr:first-child th, -- cgit v1.2.3 From 9d0872b74821a72f91e8604d69e6f94054ff0490 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Aug 2014 19:05:46 -0700 Subject: Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths --- less/tables.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index ef745ea8e..4a578588c 100644 --- a/less/tables.less +++ b/less/tables.less @@ -177,7 +177,6 @@ table { overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid @table-border-color; - -webkit-overflow-scrolling: touch; // Tighten up spacing > .table { -- cgit v1.2.3 From 6424acf69ae40a916db04b5c3235f1780f11b4be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 2 Aug 2014 21:16:32 -0700 Subject: Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height --- less/forms.less | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 7749479d2..6077ae7a3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -191,6 +191,21 @@ input[type="month"] { } } +// IE 11 hack to reverse the iOS temporal input hack. +_:-ms-fullscreen, :root input[type="date"], +_:-ms-fullscreen, :root input[type="time"], +_:-ms-fullscreen, :root input[type="datetime-local"], +_:-ms-fullscreen, :root input[type="month"] { + line-height: @line-height-base; + + &.input-sm { + line-height: @line-height-small; + } + &.input-lg { + line-height: @line-height-large; + } +} + // Form groups // -- cgit v1.2.3 From b10b373c6019666dbe1152245c9efdf214ceaa6a Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Mon, 4 Aug 2014 06:19:42 +0200 Subject: Follow-up to #13074: use spec syntax instead of deprecated mixins --- less/carousel.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index c11470142..5724d8a56 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -27,24 +27,24 @@ // WebKit CSS3 transforms for supported devices @media all and (transform-3d), (-webkit-transform-3d) { - .transition-transform(~'0.6s ease-in-out'); - .backface-visibility(~'hidden'); - .perspective(1000); - + transition: transform .6s ease-in-out; + backface-visibility: hidden; + perspective: 1000; + &.next, &.active.right { - .translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); left: 0; } &.prev, &.active.left { - .translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); left: 0; } &.next.left, &.prev.right, &.active { - .translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); left: 0; } } -- cgit v1.2.3 From 6c87895eec6daf757d4c98a4edd88b975ae79c8b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Aug 2014 10:01:20 -0700 Subject: fixes #14310: reset .active as well for button links --- less/buttons.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 05bd89d08..d32c4e2d8 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -92,6 +92,7 @@ &, &:active, + &.active, &[disabled], fieldset[disabled] & { background-color: transparent; -- cgit v1.2.3 From 8d7700b2b63a8abeb96a6f309610e9e8b4b4792c Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sat, 16 Aug 2014 19:20:13 +0400 Subject: Use single .dropdown-menu --- less/dropdowns.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 3eb7fc05c..b25b6aacd 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -103,9 +103,8 @@ &:focus { color: @dropdown-link-disabled-color; } -} -// Nuke hover/focus effects -.dropdown-menu > .disabled > a { + + // Nuke hover/focus effects &:hover, &:focus { text-decoration: none; -- cgit v1.2.3 From f265137c0517266206055d306ed41e9456878652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 12:20:09 -0700 Subject: Fixes #14440: Remove unused nav variable --- less/variables.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 9670a902f..0d354d16a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -404,8 +404,6 @@ @nav-disabled-link-color: @gray-light; @nav-disabled-link-hover-color: @gray-light; -@nav-open-link-hover-color: #fff; - //== Tabs @nav-tabs-border-color: #ddd; -- cgit v1.2.3 From 9a39ee90b4fd4d5b9b6f9a6f2c9d5a29ffeafe92 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:26:37 -0700 Subject: Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 0d354d16a..d6a972ff6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,12 +369,12 @@ // Inverted navbar // Reset inverted navbar basics -@navbar-inverse-color: lighten(@gray-light, 12%); +@navbar-inverse-color: lighten(@gray-light, 15%); @navbar-inverse-bg: #222; @navbar-inverse-border: darken(@navbar-inverse-bg, 10%); // Inverted navbar links -@navbar-inverse-link-color: @gray-light; +@navbar-inverse-link-color: lighten(@gray-light, 15%); @navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; -- cgit v1.2.3 From 56bb92ac4fbf6d5773e91afd205fb8ec09e3a573 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:42:45 -0700 Subject: Fixes #14386: Reset font, text, and line-height properties in popovers --- less/popovers.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/popovers.less b/less/popovers.less index bf6af40a0..3abd0598f 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -11,7 +11,11 @@ display: none; max-width: @popover-max-width; padding: 1px; - text-align: left; // Reset given new insertion method + // Reset font and text propertes given new insertion method + font-size: @font-size-base; + font-weight: normal; + line-height: @line-height-base; + text-align: left; background-color: @popover-bg; background-clip: padding-box; border: 1px solid @popover-fallback-border-color; @@ -33,8 +37,6 @@ margin: 0; // reset heading margin padding: 8px 14px; font-size: @font-size-base; - font-weight: normal; - line-height: 18px; background-color: @popover-title-bg; border-bottom: 1px solid darken(@popover-title-bg, 5%); border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0; -- cgit v1.2.3 From a03d269287f39c22fb7d4f5a5edd94293aa0c1ae Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Tue, 26 Aug 2014 02:24:09 +0400 Subject: Less: Remove empty lines and blanks. --- less/dropdowns.less | 1 - less/list-group.less | 2 +- less/mixins/labels.less | 2 +- less/pager.less | 1 - less/popovers.less | 1 - less/print.less | 2 -- less/variables.less | 2 -- 7 files changed, 2 insertions(+), 9 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index b25b6aacd..742c91265 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -211,4 +211,3 @@ } } } - diff --git a/less/list-group.less b/less/list-group.less index 7d857cfd3..1e62d3b94 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -75,7 +75,7 @@ a.list-group-item { background-color: @list-group-disabled-bg; color: @list-group-disabled-color; cursor: not-allowed; - + // Force color to inherit for custom content .list-group-item-heading { color: inherit; diff --git a/less/mixins/labels.less b/less/mixins/labels.less index 6f9e490b8..9f7a67ee3 100644 --- a/less/mixins/labels.less +++ b/less/mixins/labels.less @@ -2,7 +2,7 @@ .label-variant(@color) { background-color: @color; - + &[href] { &:hover, &:focus { diff --git a/less/pager.less b/less/pager.less index 59103f445..73a660d64 100644 --- a/less/pager.less +++ b/less/pager.less @@ -51,5 +51,4 @@ cursor: not-allowed; } } - } diff --git a/less/popovers.less b/less/popovers.less index 3abd0598f..ab720f2fb 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -131,5 +131,4 @@ bottom: -@popover-arrow-width; } } - } diff --git a/less/print.less b/less/print.less index 3655d0395..473f361b9 100644 --- a/less/print.less +++ b/less/print.less @@ -4,7 +4,6 @@ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css @media print { - * { text-shadow: none !important; color: #000 !important; // Black prints faster: h5bp.com/s @@ -97,5 +96,4 @@ border: 1px solid #ddd !important; } } - } diff --git a/less/variables.less b/less/variables.less index d6a972ff6..5be258be7 100644 --- a/less/variables.less +++ b/less/variables.less @@ -841,5 +841,3 @@ @dl-horizontal-offset: @component-offset-horizontal; //** Horizontal line color. @hr-border: @gray-lighter; - - -- cgit v1.2.3