From ab3d0a27b3d93eebff3852728f94ddc4fcb35199 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Mon, 16 Sep 2013 12:38:26 +0300 Subject: Dropdown in panel header does not inherit its colors Fix for issue #10627 --- less/mixins.less | 3 +++ less/panels.less | 3 +++ 2 files changed, 6 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 42523c2aa..f8afa0eeb 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -396,6 +396,9 @@ + .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/panels.less b/less/panels.less index adf463216..c02cd130e 100644 --- a/less/panels.less +++ b/less/panels.less @@ -92,6 +92,9 @@ padding: 10px 15px; border-bottom: 1px solid transparent; .border-top-radius(@panel-border-radius - 1); + & > .dropdown .dropdown-toggle { + color: inherit; + } } // Within heading, strip any `h*` tag of it's default margins for spacing. -- cgit v1.2.3 From cde1b9a1782a6592e2d41ce2ad60aadd74e5539c Mon Sep 17 00:00:00 2001 From: Kevin Lisota Date: Mon, 16 Sep 2013 08:21:09 -0700 Subject: add responsive CSS to hyperlinked images when thumbnail caption markup is used When thumbnail caption markup is used in combination with a hyperlinked image, the image is not responsive. (non-hyperlinked images are fine, like the example in the docs) Adding a selector to apply responsiveness to hyperlinked images when thumbnail captions are used. --- less/thumbnails.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index a210cac72..f6064a245 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -9,7 +9,8 @@ display: block; // Override the inline-block from `.img-thumbnail` margin-bottom: @line-height-computed; - > img { + > img, + a > img { .img-responsive(); } } -- cgit v1.2.3 From 355525b2b7b1df9119068fb1de4c411c8315ced5 Mon Sep 17 00:00:00 2001 From: Shaun Dychko Date: Mon, 30 Sep 2013 13:21:54 -0700 Subject: remove comma separating the color and the color-stop in -webkit-linear-gradient in the #gradient .vertical mixin. --- 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 6e0e399af..7438deacd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -287,7 +287,7 @@ // Color stops are not available in IE9 and below. .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @start-color, @start-percent, @end-color, @end-percent); // Safari 5.1+, Chrome 10+ + background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1+, Chrome 10+ background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+ background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10 background-repeat: repeat-x; -- cgit v1.2.3 From 6f9d980139a38c7bd09dfc9d339f7ac809b5a3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 3 Oct 2013 23:15:49 +0200 Subject: Change border to border-radius Border isn't set, but border-radius is. --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index 88bcde552..e12835401 100644 --- a/less/code.less +++ b/less/code.less @@ -42,7 +42,7 @@ pre { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } } -- cgit v1.2.3 From 38941881e9a04c2de61be86fd05e5840c93dd1fb Mon Sep 17 00:00:00 2001 From: Steven Black Date: Fri, 4 Oct 2013 21:43:31 -0400 Subject: Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. --- less/jumbotron.less | 2 +- less/variables.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index 3a2365f05..aadb4acf5 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -6,7 +6,7 @@ .jumbotron { padding: @jumbotron-padding; margin-bottom: @jumbotron-padding; - font-size: (@font-size-base * 1.5); + font-size: @font-size-jumbotron; font-weight: 200; line-height: (@line-height-base * 1.5); color: @jumbotron-color; diff --git a/less/variables.less b/less/variables.less index 1a998b946..e611c3a02 100644 --- a/less/variables.less +++ b/less/variables.less @@ -368,8 +368,8 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@font-size-jumbotron: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From b1cc07fa1525f0900d32bdcbdf7b38a616971acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 5 Oct 2013 20:14:19 +0200 Subject: Insert comma to fix validation warning BS doesn't support IE6/IE7, so comma can be inserted. --- less/scaffolding.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/scaffolding.less b/less/scaffolding.less index 046eb774a..976b4e3c2 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -114,6 +114,6 @@ hr { margin: -1px; padding: 0; overflow: hidden; - clip: rect(0 0 0 0); + clip: rect(0,0,0,0); border: 0; } -- cgit v1.2.3 From 4b27c087836018b639c08788d452892c59e6e297 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sat, 5 Oct 2013 18:37:53 -0400 Subject: The Jumbotron font-size LESS variable now conforms to the '@{bootstrapClass}-font-size' naming scheme. --- less/jumbotron.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/jumbotron.less b/less/jumbotron.less index aadb4acf5..22c29780a 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -6,7 +6,7 @@ .jumbotron { padding: @jumbotron-padding; margin-bottom: @jumbotron-padding; - font-size: @font-size-jumbotron; + font-size: @jumbotron-font-size; font-weight: 200; line-height: (@line-height-base * 1.5); color: @jumbotron-color; -- cgit v1.2.3 From 0740d01b4ccbce54b9e852df63bdf891b532baa2 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sat, 5 Oct 2013 20:48:28 -0400 Subject: Good catch by @juthilo - omitted the modified in a prior commit. --- 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 e611c3a02..aede11bac 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@font-size-jumbotron: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From 1adbe2043a0ab6adad95e823397f6444730dfb83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:32:23 -0500 Subject: Fixes #10959: round the .lead values down to nearest pixel via floor() --- 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 1e4ff9d18..55e5e1d77 100644 --- a/less/type.less +++ b/less/type.less @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: @line-height-computed; - font-size: (@font-size-base * 1.15); + font-size: floor(@font-size-base * 1.15); font-weight: 200; line-height: 1.4; -- cgit v1.2.3 From 352532cd63a2d8e03ba7db806aa3bd110c023532 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:39:11 -0500 Subject: Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere --- less/modals.less | 8 -------- 1 file changed, 8 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 4f2cf9468..776073d57 100644 --- a/less/modals.less +++ b/less/modals.less @@ -10,14 +10,6 @@ // Kill the scroll on the body .modal-open { overflow: hidden; - - - // Account for hiding of scrollbar - body&, - .navbar-fixed-top, - .navbar-fixed-bottom { - margin-right: 15px - } } // Container that the modal scrolls within -- cgit v1.2.3 From c814ad18333d7deefd3bff5446b02d6933f49f02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Oct 2013 22:00:37 -0700 Subject: Combine separate efforts for grid mixins into one, cleanup and reorganize --- less/grid.less | 297 +++++-------------------------------------------------- less/mixins.less | 75 ++++++++++++++ 2 files changed, 97 insertions(+), 275 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 39f1049b6..67e78f760 100644 --- a/less/grid.less +++ b/less/grid.less @@ -2,7 +2,6 @@ // Grid system // -------------------------------------------------- - // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); @@ -14,61 +13,7 @@ } // Common styles for small and large grid columns -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - // Prevent columns from collapsing when empty - min-height: 1px; - // Inner gutter via padding - padding-left: (@grid-gutter-width / 2); - padding-right: (@grid-gutter-width / 2); -} +.make-grid-columns(); // Extra small grid @@ -79,31 +24,11 @@ // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since // it's full-width. -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; -} -.col-xs-1 { width: percentage((1 / @grid-columns)); } -.col-xs-2 { width: percentage((2 / @grid-columns)); } -.col-xs-3 { width: percentage((3 / @grid-columns)); } -.col-xs-4 { width: percentage((4 / @grid-columns)); } -.col-xs-5 { width: percentage((5 / @grid-columns)); } -.col-xs-6 { width: percentage((6 / @grid-columns)); } -.col-xs-7 { width: percentage((7 / @grid-columns)); } -.col-xs-8 { width: percentage((8 / @grid-columns)); } -.col-xs-9 { width: percentage((9 / @grid-columns)); } -.col-xs-10 { width: percentage((10/ @grid-columns)); } -.col-xs-11 { width: percentage((11/ @grid-columns)); } -.col-xs-12 { width: 100%; } +.make-grid-columns-float(xs); +.make-grid(@grid-columns, xs, width); +.make-grid(@grid-columns, xs, pull); +.make-grid(@grid-columns, xs, push); +.make-grid(@grid-columns, xs, offset); // Small grid @@ -119,69 +44,11 @@ width: @container-sm; } - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; - } - .col-sm-1 { width: percentage((1 / @grid-columns)); } - .col-sm-2 { width: percentage((2 / @grid-columns)); } - .col-sm-3 { width: percentage((3 / @grid-columns)); } - .col-sm-4 { width: percentage((4 / @grid-columns)); } - .col-sm-5 { width: percentage((5 / @grid-columns)); } - .col-sm-6 { width: percentage((6 / @grid-columns)); } - .col-sm-7 { width: percentage((7 / @grid-columns)); } - .col-sm-8 { width: percentage((8 / @grid-columns)); } - .col-sm-9 { width: percentage((9 / @grid-columns)); } - .col-sm-10 { width: percentage((10/ @grid-columns)); } - .col-sm-11 { width: percentage((11/ @grid-columns)); } - .col-sm-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-sm-push-1 { left: percentage((1 / @grid-columns)); } - .col-sm-push-2 { left: percentage((2 / @grid-columns)); } - .col-sm-push-3 { left: percentage((3 / @grid-columns)); } - .col-sm-push-4 { left: percentage((4 / @grid-columns)); } - .col-sm-push-5 { left: percentage((5 / @grid-columns)); } - .col-sm-push-6 { left: percentage((6 / @grid-columns)); } - .col-sm-push-7 { left: percentage((7 / @grid-columns)); } - .col-sm-push-8 { left: percentage((8 / @grid-columns)); } - .col-sm-push-9 { left: percentage((9 / @grid-columns)); } - .col-sm-push-10 { left: percentage((10/ @grid-columns)); } - .col-sm-push-11 { left: percentage((11/ @grid-columns)); } - - .col-sm-pull-1 { right: percentage((1 / @grid-columns)); } - .col-sm-pull-2 { right: percentage((2 / @grid-columns)); } - .col-sm-pull-3 { right: percentage((3 / @grid-columns)); } - .col-sm-pull-4 { right: percentage((4 / @grid-columns)); } - .col-sm-pull-5 { right: percentage((5 / @grid-columns)); } - .col-sm-pull-6 { right: percentage((6 / @grid-columns)); } - .col-sm-pull-7 { right: percentage((7 / @grid-columns)); } - .col-sm-pull-8 { right: percentage((8 / @grid-columns)); } - .col-sm-pull-9 { right: percentage((9 / @grid-columns)); } - .col-sm-pull-10 { right: percentage((10/ @grid-columns)); } - .col-sm-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-sm-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-sm-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-sm-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-sm-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-sm-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-sm-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-sm-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-sm-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-sm-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-sm-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(sm); + .make-grid(@grid-columns, sm, width); + .make-grid(@grid-columns, sm, pull); + .make-grid(@grid-columns, sm, push); + .make-grid(@grid-columns, sm, offset); } @@ -196,72 +63,12 @@ .container { width: @container-md; } - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; - } - .col-md-1 { width: percentage((1 / @grid-columns)); } - .col-md-2 { width: percentage((2 / @grid-columns)); } - .col-md-3 { width: percentage((3 / @grid-columns)); } - .col-md-4 { width: percentage((4 / @grid-columns)); } - .col-md-5 { width: percentage((5 / @grid-columns)); } - .col-md-6 { width: percentage((6 / @grid-columns)); } - .col-md-7 { width: percentage((7 / @grid-columns)); } - .col-md-8 { width: percentage((8 / @grid-columns)); } - .col-md-9 { width: percentage((9 / @grid-columns)); } - .col-md-10 { width: percentage((10/ @grid-columns)); } - .col-md-11 { width: percentage((11/ @grid-columns)); } - .col-md-12 { width: 100%; } - // Push and pull columns for source order changes - .col-md-push-0 { left: auto; } - .col-md-push-1 { left: percentage((1 / @grid-columns)); } - .col-md-push-2 { left: percentage((2 / @grid-columns)); } - .col-md-push-3 { left: percentage((3 / @grid-columns)); } - .col-md-push-4 { left: percentage((4 / @grid-columns)); } - .col-md-push-5 { left: percentage((5 / @grid-columns)); } - .col-md-push-6 { left: percentage((6 / @grid-columns)); } - .col-md-push-7 { left: percentage((7 / @grid-columns)); } - .col-md-push-8 { left: percentage((8 / @grid-columns)); } - .col-md-push-9 { left: percentage((9 / @grid-columns)); } - .col-md-push-10 { left: percentage((10/ @grid-columns)); } - .col-md-push-11 { left: percentage((11/ @grid-columns)); } - - .col-md-pull-0 { right: auto; } - .col-md-pull-1 { right: percentage((1 / @grid-columns)); } - .col-md-pull-2 { right: percentage((2 / @grid-columns)); } - .col-md-pull-3 { right: percentage((3 / @grid-columns)); } - .col-md-pull-4 { right: percentage((4 / @grid-columns)); } - .col-md-pull-5 { right: percentage((5 / @grid-columns)); } - .col-md-pull-6 { right: percentage((6 / @grid-columns)); } - .col-md-pull-7 { right: percentage((7 / @grid-columns)); } - .col-md-pull-8 { right: percentage((8 / @grid-columns)); } - .col-md-pull-9 { right: percentage((9 / @grid-columns)); } - .col-md-pull-10 { right: percentage((10/ @grid-columns)); } - .col-md-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-md-offset-0 { margin-left: 0; } - .col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(md); + .make-grid(@grid-columns, md, width); + .make-grid(@grid-columns, md, pull); + .make-grid(@grid-columns, md, push); + .make-grid(@grid-columns, md, offset); } @@ -277,70 +84,10 @@ width: @container-lg; } - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; - } - .col-lg-1 { width: percentage((1 / @grid-columns)); } - .col-lg-2 { width: percentage((2 / @grid-columns)); } - .col-lg-3 { width: percentage((3 / @grid-columns)); } - .col-lg-4 { width: percentage((4 / @grid-columns)); } - .col-lg-5 { width: percentage((5 / @grid-columns)); } - .col-lg-6 { width: percentage((6 / @grid-columns)); } - .col-lg-7 { width: percentage((7 / @grid-columns)); } - .col-lg-8 { width: percentage((8 / @grid-columns)); } - .col-lg-9 { width: percentage((9 / @grid-columns)); } - .col-lg-10 { width: percentage((10/ @grid-columns)); } - .col-lg-11 { width: percentage((11/ @grid-columns)); } - .col-lg-12 { width: 100%; } - - // Push and pull columns for source order changes - .col-lg-push-0 { left: auto; } - .col-lg-push-1 { left: percentage((1 / @grid-columns)); } - .col-lg-push-2 { left: percentage((2 / @grid-columns)); } - .col-lg-push-3 { left: percentage((3 / @grid-columns)); } - .col-lg-push-4 { left: percentage((4 / @grid-columns)); } - .col-lg-push-5 { left: percentage((5 / @grid-columns)); } - .col-lg-push-6 { left: percentage((6 / @grid-columns)); } - .col-lg-push-7 { left: percentage((7 / @grid-columns)); } - .col-lg-push-8 { left: percentage((8 / @grid-columns)); } - .col-lg-push-9 { left: percentage((9 / @grid-columns)); } - .col-lg-push-10 { left: percentage((10/ @grid-columns)); } - .col-lg-push-11 { left: percentage((11/ @grid-columns)); } - - .col-lg-pull-0 { right: auto; } - .col-lg-pull-1 { right: percentage((1 / @grid-columns)); } - .col-lg-pull-2 { right: percentage((2 / @grid-columns)); } - .col-lg-pull-3 { right: percentage((3 / @grid-columns)); } - .col-lg-pull-4 { right: percentage((4 / @grid-columns)); } - .col-lg-pull-5 { right: percentage((5 / @grid-columns)); } - .col-lg-pull-6 { right: percentage((6 / @grid-columns)); } - .col-lg-pull-7 { right: percentage((7 / @grid-columns)); } - .col-lg-pull-8 { right: percentage((8 / @grid-columns)); } - .col-lg-pull-9 { right: percentage((9 / @grid-columns)); } - .col-lg-pull-10 { right: percentage((10/ @grid-columns)); } - .col-lg-pull-11 { right: percentage((11/ @grid-columns)); } - - // Offsets - .col-lg-offset-0 { margin-left: 0; } - .col-lg-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-lg-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-lg-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-lg-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-lg-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-lg-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-lg-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-lg-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-lg-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); } + .make-grid-columns-float(lg); + .make-grid(@grid-columns, lg, width); + .make-grid(@grid-columns, lg, pull); + .make-grid(@grid-columns, lg, push); + .make-grid(@grid-columns, lg, offset); } + diff --git a/less/mixins.less b/less/mixins.less index 6e0e399af..654215b54 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -565,6 +565,7 @@ td& { display: none !important; } } + // Grid System // ----------- @@ -696,6 +697,80 @@ } +// Framework grid generation +// +// Used only by Bootstrap to generate the correct number of grid classes given +// any value of `@grid-columns`. + +.make-grid-columns() { + // Common styles for all sizes of grid columns, widths 1-12 + .col(@index) when (@index = 1) { // initial + @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; + .col(@index + 1, @item); + } + .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo + @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; + .col(@index + 1, ~"@{list}, @{item}"); + } + .col(@index, @list) when (@index > @grid-columns) { // terminal + @{list} { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: (@grid-gutter-width / 2); + padding-right: (@grid-gutter-width / 2); + } + } + .col(1); // kickstart it +} + +.make-grid-columns-float(@class) { + .col(@index) when (@index = 1) { // initial + @item: ~".col-@{class}-@{index}"; + .col(@index + 1, @item); + } + .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 + @{list} { + float: left; + } + } + .col(1); // kickstart it +} + +.calc-grid(@index, @class, @type) when (@type = width) { + .col-@{class}-@{index} { + width: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = push) { + .col-@{class}-push-@{index} { + left: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = pull) { + .col-@{class}-pull-@{index} { + right: percentage((@index / @grid-columns)); + } +} +.calc-grid(@index, @class, @type) when (@type = offset) { + .col-@{class}-offset-@{index} { + margin-left: percentage((@index / @grid-columns)); + } +} + +// Basic looping in LESS +.make-grid(@index, @class, @type) when (@index > 0) { + .calc-grid(@index, @class, @type); + // next iteration + .make-grid(@index - 1, @class, @type); +} + + // Form validation states // // Used in forms.less to generate the form validation CSS for warnings, errors, -- cgit v1.2.3 From 8098f4e5ba36814030304867092aa268aaf370f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 12 Oct 2013 23:28:50 +0200 Subject: Add more functionality to .small --- less/type.less | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 55e5e1d77..e5544ab3e 100644 --- a/less/type.less +++ b/less/type.less @@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6, line-height: @headings-line-height; color: @headings-color; - small { + small, + .small { font-weight: normal; line-height: 1; color: @headings-small-color; @@ -95,7 +96,8 @@ h3 { margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 65%; } } @@ -105,7 +107,8 @@ h6 { margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 75%; } } @@ -240,10 +243,12 @@ blockquote { border-right: 5px solid @blockquote-border-color; border-left: 0; p, - small { + small, + .small { text-align: right; } - small { + small, + .small { &:before { content: ''; } -- cgit v1.2.3 From 590975b4077ae6a2d5cba7d01403bbc09484bd6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:55:13 -0700 Subject: remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 --- less/navs.less | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 3b6a43a7d..b1d4fcd23 100644 --- a/less/navs.less +++ b/less/navs.less @@ -227,13 +227,11 @@ .clearfix(); } -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content, -.pill-content { +// Hide tabbable panes to start, show them when `.active` +.tab-content { + > .tab-pane { + display: none; + } > .active { display: block; } -- cgit v1.2.3 From 6085973e258a50e829405b1c6cca743f7782017d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 18:56:31 -0700 Subject: drop .tabbable since it's unused and undocumented /cc #10102 --- less/navs.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index b1d4fcd23..90aacd7ea 100644 --- a/less/navs.less +++ b/less/navs.less @@ -222,11 +222,6 @@ // Tabbable tabs // ------------------------- -// Clear any floats -.tabbable { - .clearfix(); -} - // Hide tabbable panes to start, show them when `.active` .tab-content { > .tab-pane { -- cgit v1.2.3 From 6351c30782a87fe03d5c27e75f2287cc657ba06d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 18:58:09 -0700 Subject: comment and spacing --- less/navs.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 90aacd7ea..bebb63311 100644 --- a/less/navs.less +++ b/less/navs.less @@ -190,6 +190,8 @@ } // Move borders to anchors instead of bottom of list +// +// Mixin for adding on top the shared `.nav-justified` styles for our tabs .nav-tabs-justified { border-bottom: 0; @@ -233,7 +235,6 @@ } - // Dropdowns // ------------------------- -- cgit v1.2.3 From f946ff5d254d0d8383200101f19b64bcd8ba2c58 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:57:14 -0700 Subject: fix #10257 --- less/theme.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index b510b7a8d..38e5e7f84 100644 --- a/less/theme.less +++ b/less/theme.less @@ -104,6 +104,7 @@ // Default navbar .navbar-default { #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); + .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); @@ -121,6 +122,7 @@ // Inverted navbar .navbar-inverse { #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 > .active > a { #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); -- cgit v1.2.3 From 44b32a30366440b2127b343fbd1990fe15e88185 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 19:59:42 -0700 Subject: move .hidden to utilities; fixes #10997 --- less/responsive-utilities.less | 10 ---------- less/utilities.less | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 6b4566266..df53e479d 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -22,16 +22,6 @@ } -// Hide from screenreaders and browsers -// -// Credit: HTML5 Boilerplate - -.hidden { - display: none !important; - visibility: hidden !important; -} - - // Visibility utilities .visible-xs { diff --git a/less/utilities.less b/less/utilities.less index ae2ae4be2..a26031214 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -38,6 +38,16 @@ } +// Hide from screenreaders and browsers +// +// Credit: HTML5 Boilerplate + +.hidden { + display: none !important; + visibility: hidden !important; +} + + // For Affix plugin // ------------------------- -- cgit v1.2.3 From be4e951b7dc254dac08a5d2c6b88be0cda6e420f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:02:24 -0700 Subject: scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 --- less/forms.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index cb9d30a37..f6bbce596 100644 --- a/less/forms.less +++ b/less/forms.less @@ -267,7 +267,6 @@ input[type="checkbox"], .form-control-static { margin-bottom: 0; // Remove default margin from `p` - padding-top: (@padding-base-vertical + 1); } @@ -354,6 +353,10 @@ input[type="checkbox"], .make-row(); } + .form-control-static { + padding-top: (@padding-base-vertical + 1); + } + // Only right align form labels here when the columns stop stacking @media (min-width: @screen-sm-min) { .control-label { -- cgit v1.2.3 From e7379f75bdeba88868dd4d4f169122a932e73822 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:04:28 -0700 Subject: no trailing decimal place --- 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 aede11bac..9b55f13b6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@jumbotron-font-size: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts -- cgit v1.2.3 From b3c04c95d3d378f8473e76169e40e044895ec849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 14 Oct 2013 15:06:58 +0200 Subject: Nuke trailing zeros --- 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 9b55f13b6..e596215d0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,9 +48,9 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px @font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px @font-size-h4: ceil(@font-size-base * 1.25); // ~18px @font-size-h5: @font-size-base; @font-size-h6: ceil(@font-size-base * 0.85); // ~12px -- cgit v1.2.3 From 4ce1b08c32013cca8094c71463f088c9b406c5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 14 Oct 2013 18:22:31 +0200 Subject: Unhardcode .table-responsive bottom margin --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index f9f0041e4..6ca19ad58 100644 --- a/less/tables.less +++ b/less/tables.less @@ -174,7 +174,7 @@ table { @media (max-width: @screen-sm-min) { .table-responsive { width: 100%; - margin-bottom: 15px; + margin-bottom: (@line-height-computed * 0.75); overflow-y: hidden; overflow-x: scroll; -ms-overflow-style: -ms-autohiding-scrollbar; -- cgit v1.2.3 From 5c64ef393caf1331129e2360e1b7f3aaf1e5150e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 10:58:12 -0700 Subject: fix .table-responsive media query; refs #11067 --- less/tables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index f9f0041e4..1e4a4d14e 100644 --- a/less/tables.less +++ b/less/tables.less @@ -171,7 +171,7 @@ table { // by enabling horizontal scrolling. Only applies <768px. Everything above that // will display normally. -@media (max-width: @screen-sm-min) { +@media (max-width: @screen-xs-max) { .table-responsive { width: 100%; margin-bottom: 15px; -- cgit v1.2.3 From 710071157751dc9aac1b531d283c1ae756a3c902 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Oct 2013 13:45:32 -0700 Subject: unnest the list-group-item link variation for #11085 and #11088 --- less/list-group.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 46cda4085..2cee52973 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -39,21 +39,21 @@ > .badge + .badge { margin-right: 5px; } +} - // Linked list items - a& { - color: @list-group-link-color; +// Linked list items +a.list-group-item { + color: @list-group-link-color; - .list-group-item-heading { - color: @list-group-link-heading-color; - } + .list-group-item-heading { + color: @list-group-link-heading-color; + } - // Hover state - &:hover, - &:focus { - text-decoration: none; - background-color: @list-group-hover-bg; - } + // Hover state + &:hover, + &:focus { + text-decoration: none; + background-color: @list-group-hover-bg; } // Active class on item itself, not parent -- cgit v1.2.3 From e20b02ad0b1253c8e3d9703409a256927f55ede8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Yokomizo?= Date: Mon, 14 Oct 2013 20:10:49 -0300 Subject: extended hover state of linked versions of .thumbnail --- less/thumbnails.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index a210cac72..df46fbdc2 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -17,7 +17,8 @@ // Add a hover state for linked versions only a.thumbnail:hover, -a.thumbnail:focus { +a.thumbnail:focus, +a.thumbnail.active { border-color: @link-color; } -- cgit v1.2.3 From a28d9539c76e4ba4b3dba3df6137a8400840974d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 20:45:43 -0700 Subject: fix #10952 --- less/glyphicons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 89aad0b35..709d31865 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -14,7 +14,7 @@ src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), - url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg'); + url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg'); } // Catchall baseclass -- cgit v1.2.3 From 042363561415939fb046092705c9624fd8008177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 15 Oct 2013 17:35:11 +0200 Subject: Ditch `&`, as `+ ...` is enought --- less/breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index aded518ce..60b33ea72 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -11,7 +11,7 @@ border-radius: @border-radius-base; > li { display: inline-block; - &+li:before { + + li:before { content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: @breadcrumb-color; -- cgit v1.2.3 From 976f6dfdad663e43237a3da07cb64a41932f264e Mon Sep 17 00:00:00 2001 From: jeonghwan Date: Wed, 16 Oct 2013 23:20:34 +0900 Subject: Fixes issue #11122 -- navbar-fixed-bottom border Enable border-top in .navbar-fixed-bottom --- less/navbar.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index d054b400d..cc3e1f213 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -128,7 +128,6 @@ position: fixed; right: 0; left: 0; - border-width: 0 0 1px; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -138,10 +137,12 @@ .navbar-fixed-top { z-index: @zindex-navbar-fixed; top: 0; + border-width: 0 0 1px; } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; // override .navbar defaults + border-width: 1px 0 0; } -- cgit v1.2.3 From 0c2055ef381d55388540496996788861fa04b7d8 Mon Sep 17 00:00:00 2001 From: Aaron Borden Date: Wed, 16 Oct 2013 19:02:04 -0700 Subject: Adding contextual styles to list-items --- less/list-group.less | 5 +++++ less/mixins.less | 15 +++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index 2cee52973..cf4ce3eea 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -41,6 +41,11 @@ } } +// Contextual variants +.list-group-item-variant(success; @state-success-bg; @state-success-border); +.list-group-item-variant(danger; @state-danger-bg; @state-danger-border); +.list-group-item-variant(warning; @state-warning-bg; @state-warning-border); + // Linked list items a.list-group-item { color: @list-group-link-color; diff --git a/less/mixins.less b/less/mixins.less index 654215b54..09c656ca2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -448,6 +448,21 @@ } } +// List Groups +// ------------------------- +.list-group-item-variant(@state; @background; @border) { + .list-group > .list-group-item.@{state} { + background-color: @background; + border-color: @border; + } + + // Hover states + .list-group > .list-group-item.@{state}:hover { + background-color: darken(@background, 5%); + border-color: darken(@border, 5%); + } +} + // Button variants // ------------------------- // Easily pump out default styles, as well as :hover, :focus, :active, -- cgit v1.2.3 From 693915d1277d465844c6757fc107110342229d76 Mon Sep 17 00:00:00 2001 From: Max Edmands Date: Wed, 16 Oct 2013 22:55:40 -0700 Subject: Active state overrides contextual list-item styles --- 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 09c656ca2..04bd10ee0 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -451,13 +451,13 @@ // List Groups // ------------------------- .list-group-item-variant(@state; @background; @border) { - .list-group > .list-group-item.@{state} { + .list-group-item.@{state} { background-color: @background; border-color: @border; } // Hover states - .list-group > .list-group-item.@{state}:hover { + .list-group-item.@{state}:hover { background-color: darken(@background, 5%); border-color: darken(@border, 5%); } -- cgit v1.2.3 From 5f79354dbea3ec5b0d99d2b6cd2376f3e4ee268e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 17 Oct 2013 21:25:08 +0200 Subject: FIx invalid element selector `kbd` (keyboard) is right, not `kdb`. :P --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index e12835401..54ab46ac8 100644 --- a/less/code.less +++ b/less/code.less @@ -5,7 +5,7 @@ // Inline and block code styles code, -kdb, +kbd, pre, samp { font-family: @font-family-monospace; -- cgit v1.2.3 From 6a93a6b88a4b874fba5a1d1edd817cbd91ccfacc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 16:46:38 -0700 Subject: Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it --- less/carousel.less | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 59e4fadf7..d0d90736f 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -160,6 +160,17 @@ border: 1px solid @carousel-indicator-border-color; border-radius: 10px; cursor: pointer; + + // IE8-9 hack for event handling + // + // Internet Explorer 8-9 does not support clicks on elements without a set + // `background-color`. We cannot use `filter` since that's not viewed as a + // background color by the browser. Thus, a hack is needed. + // + // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we + // set alpha transparency for the best results possible. + background-color: #000 \9; // IE8 + background-color: rgba(0,0,0,0); // IE9 } .active { margin: 0; -- cgit v1.2.3 From f45c05a97a4dda6a657ff89fcbfa283308d0b329 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:40:19 -0700 Subject: fixes #11151: remove unused h5bp class from print CSS --- less/print.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/print.less b/less/print.less index 1e4bffe3f..2a5b154fe 100644 --- a/less/print.less +++ b/less/print.less @@ -26,7 +26,6 @@ } // Don't show links for images, or javascript/internal links - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; -- cgit v1.2.3 From 23a85d6a7af6fdfdf59756515a760d332f51aa95 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 17:59:15 -0700 Subject: fixes #11126: remove box-shadow from open dropdown toggle with .btn-link --- less/button-groups.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 43ada11d9..d236dcb8d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -150,6 +150,11 @@ // Remove the gradient and set the same inset shadow as the :active state .btn-group.open .dropdown-toggle { .box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + + // Show no shadow for `.btn-link` since it has no other button styles. + &.btn-link { + .box-shadow(none); + } } -- cgit v1.2.3 From dd34102cb6bb601c3103f2c74804d2382271c0e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 19:54:22 -0700 Subject: Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline --- less/mixins.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 654215b54..5c9672bcb 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -779,7 +779,11 @@ .form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { // Color the label and help text .help-block, - .control-label { + .control-label, + .radio, + .checkbox, + .radio-inline, + .checkbox-inline { color: @text-color; } // Set the border and box shadow on specific inputs to match -- cgit v1.2.3 From 5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:04:10 -0700 Subject: fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect --- less/modals.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 776073d57..99cf76469 100644 --- a/less/modals.less +++ b/less/modals.less @@ -34,6 +34,7 @@ // Shell div to position the modal with bottom padding .modal-dialog { + position: relative; margin-left: auto; margin-right: auto; width: auto; -- cgit v1.2.3 From e486bb4f39e79dd55b3c68af134a4624b2fa4c08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:30:16 -0700 Subject: Fixes #10433: Navbar z-index refactor * Resets the default navbar z-index to auto at a certain breakpoint * Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar) --- less/navbar.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index cc3e1f213..a6f7b40f6 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -19,6 +19,7 @@ .clearfix(); @media (min-width: @grid-float-breakpoint) { + z-index: auto; border-radius: @navbar-border-radius; } } @@ -128,6 +129,7 @@ position: fixed; right: 0; left: 0; + z-index: @zindex-navbar-fixed; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -135,7 +137,6 @@ } } .navbar-fixed-top { - z-index: @zindex-navbar-fixed; top: 0; border-width: 0 0 1px; } @@ -153,6 +154,7 @@ padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; line-height: @line-height-computed; + &:hover, &:focus { text-decoration: none; -- cgit v1.2.3 From 76baacf2c94bec03273639ef0ed966dad87cf37a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 21:12:09 -0700 Subject: Remove default z-index on navbar and only set on static and fixed variants --- 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 a6f7b40f6..577e20ed5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -10,7 +10,6 @@ .navbar { position: relative; - z-index: @zindex-navbar; min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) margin-bottom: @navbar-margin-bottom; border: 1px solid transparent; @@ -19,7 +18,6 @@ .clearfix(); @media (min-width: @grid-float-breakpoint) { - z-index: auto; border-radius: @navbar-border-radius; } } @@ -117,7 +115,9 @@ // Static top (unfixed, but 100% wide) navbar .navbar-static-top { + z-index: @zindex-navbar; border-width: 0 0 1px; + @media (min-width: @grid-float-breakpoint) { border-radius: 0; } -- cgit v1.2.3 From d8fab5aa6e828567feaa4cb3a171255e29f42165 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 22:41:57 -0700 Subject: Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners --- less/theme.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 38e5e7f84..0addce3f2 100644 --- a/less/theme.less +++ b/less/theme.less @@ -33,6 +33,7 @@ // Mixin for generating new styles .btn-styles(@btn-color: #555) { #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); + .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners background-repeat: repeat-x; border-color: darken(@btn-color, 14%); -- cgit v1.2.3 From 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 22:46:21 -0700 Subject: spacing --- less/mixins.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 5c9672bcb..e892b88db 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -389,10 +389,12 @@ // ------------------------- .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) { border-color: @border; + & > .panel-heading { color: @heading-text-color; background-color: @heading-bg-color; border-color: @heading-border; + + .panel-collapse .panel-body { border-top-color: @border; } @@ -410,6 +412,7 @@ background-color: @background; border-color: @border; color: @text-color; + hr { border-top-color: darken(@border, 5%); } -- cgit v1.2.3 From 9a0849d81882a55dcc7a3fbd1148f4c75dbc84d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 22:56:29 -0700 Subject: more spacing --- less/panels.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 50bf419d7..84a12d1ed 100644 --- a/less/panels.less +++ b/less/panels.less @@ -95,6 +95,7 @@ padding: 10px 15px; border-bottom: 1px solid transparent; .border-top-radius(@panel-border-radius - 1); + & > .dropdown .dropdown-toggle { color: inherit; } -- cgit v1.2.3 From eed53d781188914c8328fb0ab77b700c3462fdbf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 21 Oct 2013 01:53:41 -0700 Subject: Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x --- 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 577e20ed5..ca531daf7 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -74,7 +74,7 @@ } &.in { - overflow-y: visible; + overflow-y: auto; } // Account for first and last children spacing -- cgit v1.2.3 From 214a78978dadfc9714139e23ffcfad33824f8514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 21 Oct 2013 16:34:18 +0200 Subject: Change upper case to lower case --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/code.less b/less/code.less index 54ab46ac8..44e9e8937 100644 --- a/less/code.less +++ b/less/code.less @@ -1,5 +1,5 @@ // -// Code (inline and blocK) +// Code (inline and block) // -------------------------------------------------- -- cgit v1.2.3 From 5f2bd59abb06fa86b7ac06eb2b51282e7f894796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Yokomizo?= Date: Tue, 22 Oct 2013 02:50:08 -0200 Subject: variable way to set @caret-width-base --- less/dropdowns.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index e6bd18779..5d7e0fb4e 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -166,7 +166,7 @@ // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this // gets fixed, restore `border-top: 0;`. border-top: 0 dotted; - border-bottom: 4px solid @dropdown-caret-color; + border-bottom: @caret-width-base solid @dropdown-caret-color; content: ""; } // Different positioning for bottom up menu -- cgit v1.2.3 From b034362363769e185418329c9ea17ec25a1c2bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 22 Oct 2013 18:34:43 +0200 Subject: Put a space before { due to code style --- less/glyphicons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 709d31865..5a8231448 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -28,7 +28,7 @@ line-height: 1; -webkit-font-smoothing: antialiased; - &:empty{ + &:empty { width: 1em; } } -- cgit v1.2.3 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 c865a68e212e6ba35a5049b568f63730ee870a82 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:20:08 -0700 Subject: fix WebKit caps in comments --- less/carousel.less | 2 +- less/mixins.less | 4 ++-- less/progress-bars.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index d0d90736f..317963b7f 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -75,7 +75,7 @@ color: @carousel-control-color; text-align: center; text-shadow: @carousel-text-shadow; - // We can't have this transition here because webkit cancels the carousel + // We can't have this transition here because WebKit cancels the carousel // animation if you trip this while in the middle of another animation. // Set gradients for backgrounds diff --git a/less/mixins.less b/less/mixins.less index 62b91f27b..9a4ce3a4c 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -27,11 +27,11 @@ } } -// Webkit-style focus +// WebKit-style focus .tab-focus() { // Default outline: thin dotted #333; - // Webkit + // WebKit outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } diff --git a/less/progress-bars.less b/less/progress-bars.less index 0bb3b5852..d0bb19e02 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -6,7 +6,7 @@ // Bar animations // ------------------------- -// Webkit +// WebKit @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0; } to { background-position: 0 0; } -- cgit v1.2.3 From 3cd744fd5ec725b0fbba0d69b36e1c1f3bcf018a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:42:48 -0700 Subject: remove ref to nonexistent branch --- less/mixins.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 9a4ce3a4c..4e842ed87 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -203,7 +203,6 @@ // Backface visibility // Prevent browsers from flickering when using CSS 3D transforms. // Default value is `visible`, but can be changed to `hidden` -// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples .backface-visibility(@visibility){ -webkit-backface-visibility: @visibility; -moz-backface-visibility: @visibility; -- cgit v1.2.3 From f31aae469ec912833003a05a9a46acc4acf37db4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:48:42 -0700 Subject: fix misspelling in comment --- 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 ca531daf7..da9baa320 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -110,7 +110,7 @@ // // Navbar alignment options // -// Display the navbar across the entirity of the page or fixed it to the top or +// Display the navbar across the entirety of the page or fixed it to the top or // bottom of the page. // Static top (unfixed, but 100% wide) navbar -- cgit v1.2.3 From aafe3f90bd5641a01123867bab2df1d5281959cd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:50:08 -0700 Subject: fix misspelling in comment --- 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 da9baa320..987cde6b0 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -257,7 +257,7 @@ // Component alignment // -// Repurpose the pull utilities as their own navbar utilities to avoid specifity +// 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. -- cgit v1.2.3 From a58c83a317f9fa741fe2f6df213616d5538b5c9b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:56:44 -0700 Subject: add missing space before open curly brace --- 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 e5544ab3e..58dd545c1 100644 --- a/less/type.less +++ b/less/type.less @@ -141,7 +141,7 @@ ol { margin-top: 0; margin-bottom: (@line-height-computed / 2); ul, - ol{ + ol { margin-bottom: 0; } } -- cgit v1.2.3 From aff291e1ca998591b6615f6bde3e10e1dae2403b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 26 Oct 2013 14:11:59 +0200 Subject: Add .animation() mixin --- less/mixins.less | 7 ++++++- less/progress-bars.less | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 4e842ed87..f06d6a89b 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -193,12 +193,17 @@ -moz-perspective-origin: @perspective; perspective-origin: @perspective; } -.transform-origin(@origin){ +.transform-origin(@origin) { -webkit-transform-origin: @origin; -moz-transform-origin: @origin; transform-origin: @origin; } +// Animations +.animation(@animation) { + -webkit-animation: @animation; + animation: @animation; +} // Backface visibility // Prevent browsers from flickering when using CSS 3D transforms. diff --git a/less/progress-bars.less b/less/progress-bars.less index d0bb19e02..507c82dbd 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -67,11 +67,7 @@ // Call animation for the active one .progress.active .progress-bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; + .animation(progress-bar-stripes 2s linear infinite); } -- cgit v1.2.3 From 4cfe307abeee4f0193a0bcbc54aad08d1115b002 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Oct 2013 14:13:34 +0100 Subject: Fixes #11206: remove left padding on first inline list item --- less/type.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/type.less b/less/type.less index 58dd545c1..c01a6fe0c 100644 --- a/less/type.less +++ b/less/type.less @@ -153,13 +153,19 @@ ol { padding-left: 0; list-style: none; } + // Inline turns list items into inline-block .list-inline { .list-unstyled(); + > li { display: inline-block; padding-left: 5px; padding-right: 5px; + + &:first-child { + padding-left: 0; + } } } -- cgit v1.2.3 From b09417fd75b068f0eee37bef089f0d08d8ba9b58 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 26 Oct 2013 21:32:29 +0200 Subject: Fixes #11245 --- less/print.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less') diff --git a/less/print.less b/less/print.less index 2a5b154fe..6362129e5 100644 --- a/less/print.less +++ b/less/print.less @@ -66,6 +66,12 @@ page-break-after: avoid; } + // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245 + // Once fixed, we can just straight up remove this. + select { + background: white !important; + } + // Bootstrap components .navbar { display: none; -- cgit v1.2.3 From 58cb85be3732888c42003cbe42142ee0e77a9639 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 26 Oct 2013 21:52:38 +0200 Subject: #fff of course --- less/print.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/print.less b/less/print.less index 6362129e5..07277a3ca 100644 --- a/less/print.less +++ b/less/print.less @@ -69,7 +69,7 @@ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245 // Once fixed, we can just straight up remove this. select { - background: white !important; + background: #fff !important; } // Bootstrap components -- cgit v1.2.3 From 92f007157aa2c9c0e3502f42ce2d135f4a0b37b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 27 Oct 2013 13:43:51 +0100 Subject: Ditch amp --- less/button-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index d236dcb8d..c25357622 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -19,7 +19,7 @@ } } .dropup { - & .btn-default .caret { + .btn-default .caret { border-bottom-color: @btn-default-color; } .btn-primary, -- cgit v1.2.3 From f9eec5b60a1e84c6ffa1ae6bd53b9e064018d961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 28 Oct 2013 09:59:24 +0100 Subject: Add -moz-osx-font-smoothing --- less/glyphicons.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 5a8231448..9de2dd3b6 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -27,6 +27,7 @@ font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; &:empty { width: 1em; -- cgit v1.2.3 From 67cab7fa05b31d5e9579a9b96c95a434489f5548 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 28 Oct 2013 20:51:39 -0700 Subject: Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering --- less/navs.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index bebb63311..6cddcd494 100644 --- a/less/navs.less +++ b/less/navs.less @@ -178,6 +178,11 @@ } } + > .dropdown .dropdown-menu { + top: auto; + left: auto; + } + @media (min-width: @screen-sm-min) { > li { display: table-cell; -- cgit v1.2.3 From c6e76d97bab6f174f2f877433985cb11ff9368b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 28 Oct 2013 21:19:48 -0700 Subject: Fixes #10341: don't change border color on contextual table classes --- less/mixins.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index f06d6a89b..4718cb2c0 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -441,7 +441,6 @@ &.@{state} > td, &.@{state} > th { background-color: @background; - border-color: @border; } } @@ -453,7 +452,6 @@ &.@{state}:hover > td, &.@{state}:hover > th { background-color: darken(@background, 5%); - border-color: darken(@border, 5%); } } } -- cgit v1.2.3 From 8a881c78a10892102d3b303e9fc19b23f9039a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 29 Oct 2013 20:06:45 +0100 Subject: Change tense to imperative Matches this comment with the commit messages and other comments. --- less/type.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index c01a6fe0c..437c70b76 100644 --- a/less/type.less +++ b/less/type.less @@ -210,7 +210,7 @@ dd { // Abbreviations and acronyms abbr[title], -// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 +// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @abbr-border-color; @@ -238,7 +238,7 @@ blockquote { line-height: @line-height-base; color: @blockquote-small-color; &:before { - content: '\2014 \00A0';// EM DASH, NBSP + content: '\2014 \00A0'; // EM DASH, NBSP } } @@ -259,7 +259,7 @@ blockquote { content: ''; } &:after { - content: '\00A0 \2014';// NBSP, EM DASH + content: '\00A0 \2014'; // NBSP, EM DASH } } } -- cgit v1.2.3 From 688ca328c995d112848f93266d8ffb11b5923827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 30 Oct 2013 10:00:28 +0100 Subject: Combine multiple .thumbnail > img styles --- less/thumbnails.less | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index df46fbdc2..a09aa9b83 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -11,6 +11,8 @@ > img { .img-responsive(); + margin-left: auto; + margin-right: auto; } } @@ -22,11 +24,7 @@ a.thumbnail.active { border-color: @link-color; } -// Images and captions -.thumbnail > img { - margin-left: auto; - margin-right: auto; -} +// Image captions .thumbnail .caption { padding: @thumbnail-caption-padding; color: @thumbnail-caption-color; -- 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 3dc0ed35d1f07da48f2adbe585a6fd7dcf268c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 1 Nov 2013 22:09:01 +0100 Subject: Use nesting for thumbnail styles --- less/thumbnails.less | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/thumbnails.less b/less/thumbnails.less index a09aa9b83..bc4178bbf 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -14,18 +14,17 @@ margin-left: auto; margin-right: auto; } -} - -// Add a hover state for linked versions only -a.thumbnail:hover, -a.thumbnail:focus, -a.thumbnail.active { - border-color: @link-color; -} + // Add a hover state for linked versions only + a&:hover, + a&:focus, + a&.active { + border-color: @link-color; + } -// Image captions -.thumbnail .caption { - padding: @thumbnail-caption-padding; - color: @thumbnail-caption-color; + // Image captions + .caption { + padding: @thumbnail-caption-padding; + color: @thumbnail-caption-color; + } } -- cgit v1.2.3 From b75d5f5fc4063a867521b78e82538cb273d951da Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 2 Nov 2013 02:19:11 +0100 Subject: & > == > --- 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 84a12d1ed..a107ff1d4 100644 --- a/less/panels.less +++ b/less/panels.less @@ -96,7 +96,7 @@ border-bottom: 1px solid transparent; .border-top-radius(@panel-border-radius - 1); - & > .dropdown .dropdown-toggle { + > .dropdown .dropdown-toggle { color: inherit; } } -- cgit v1.2.3 From f1bc840d4368a79f0f0872000c3fdf6356af2a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 2 Nov 2013 09:35:51 +0100 Subject: Use nesting for .placeholder() --- less/forms.less | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index f6bbce596..a74babdb3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -92,14 +92,6 @@ output { vertical-align: middle; } -// Placeholder -// -// Placeholder text gets special styles because when browsers invalidate entire -// lines if it doesn't understand a selector/ -.form-control { - .placeholder(); -} - // Common form controls // @@ -142,6 +134,12 @@ output { // Customize the `:focus` state to imitate native WebKit styles. .form-control-focus(); + // Placeholder + // + // Placeholder text gets special styles because when browsers invalidate entire + // lines if it doesn't understand a selector/ + .placeholder(); + // Disabled and read-only inputs // Note: HTML5 says that controls under a fieldset > legend:first-child won't // be disabled if the fieldset is disabled. Due to implementation difficulty, -- cgit v1.2.3 From 88a06640ddc6bba4f05b41666f53c5daeb00fac8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Nov 2013 13:03:08 -0800 Subject: Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) --- 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 4718cb2c0..3d24e668a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -750,7 +750,7 @@ .col(1); // kickstart it } -.calc-grid(@index, @class, @type) when (@type = width) { +.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) { .col-@{class}-@{index} { width: percentage((@index / @grid-columns)); } @@ -772,7 +772,7 @@ } // Basic looping in LESS -.make-grid(@index, @class, @type) when (@index > 0) { +.make-grid(@index, @class, @type) when (@index >= 0) { .calc-grid(@index, @class, @type); // next iteration .make-grid(@index - 1, @class, @type); -- cgit v1.2.3 From 798e64cebf60e1d0d75b0c1c8f1cedfc259130cd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 6 Nov 2013 18:32:35 -0800 Subject: use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 --- less/tables.less | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 0deadc782..55d5aa0e1 100644 --- a/less/tables.less +++ b/less/tables.less @@ -104,10 +104,12 @@ th { // // Default zebra-stripe styles (alternating gray and transparent backgrounds) -.table-striped > tbody > tr:nth-child(odd) { - > td, - > th { - background-color: @table-bg-accent; +.table-striped { + > tbody > tr:nth-child(odd) { + > td, + > th { + background-color: @table-bg-accent; + } } } @@ -116,10 +118,12 @@ th { // // Placed here since it has to come after the potential zebra striping -.table-hover > tbody > tr:hover { - > td, - > th { - background-color: @table-bg-hover; +.table-hover { + > tbody > tr:hover { + > td, + > th { + background-color: @table-bg-hover; + } } } -- cgit v1.2.3 From 463343af63344dbbc3db04f40b0b804baa919b7e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 6 Nov 2013 18:38:27 -0800 Subject: more nesting in table.less --- less/tables.less | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 55d5aa0e1..4c4284cb1 100644 --- a/less/tables.less +++ b/less/tables.less @@ -152,14 +152,18 @@ table { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. -.table > thead > tr, -.table > tbody > tr, -.table > tfoot > tr { - > td.active, - > th.active, - &.active > td, - &.active > th { - background-color: @table-bg-active; +.table { + > thead, + > tbody, + > tfoot { + > tr { + > td.active, + > th.active, + &.active > td, + &.active > th { + background-color: @table-bg-active; + } + } } } -- 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 c2a6e950d75ece24aa856b0cd7b0f50223c9a7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 13 Nov 2013 22:32:46 +0100 Subject: Remove unusual keyframes prefixes --- less/progress-bars.less | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'less') diff --git a/less/progress-bars.less b/less/progress-bars.less index 507c82dbd..76c87be17 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -12,18 +12,6 @@ to { background-position: 0 0; } } -// Firefox -@-moz-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Opera -@-o-keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - // Spec and IE10+ @keyframes progress-bar-stripes { from { background-position: 40px 0; } -- 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 fbd3cf5f527af75f886eb08e22da3e4aa43c5135 Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Sat, 16 Nov 2013 12:03:50 +0100 Subject: Update navbar.less fix for issue #11243 --- 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 987cde6b0..130984642 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -74,7 +74,7 @@ } &.in { - overflow-y: auto; + overflow-y: visible; } // Account for first and last children spacing -- cgit v1.2.3 From a2c6daafd05a54d1c944a9d6f2dc076914121117 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Nov 2013 17:48:31 -0800 Subject: fixes #10744: back to solid borders on carets --- less/dropdowns.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 5d7e0fb4e..dbaf31fe0 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -13,9 +13,6 @@ border-top: @caret-width-base solid @dropdown-caret-color; border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; - // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed, - // we can just straight up remove this. - border-bottom: 0 dotted; } // The dropdown wrapper (div) @@ -163,9 +160,7 @@ .navbar-fixed-bottom .dropdown { // Reverse the caret .caret { - // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this - // gets fixed, restore `border-top: 0;`. - border-top: 0 dotted; + border-top: 0; border-bottom: @caret-width-base solid @dropdown-caret-color; content: ""; } -- cgit v1.2.3 From ae4d5f21a96fab3691ca33e9e3747a01c467e10e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Nov 2013 18:01:59 -0800 Subject: fixes #11449: use menlo over monaco --- 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 e596215d0..08bb701db 100644 --- a/less/variables.less +++ b/less/variables.less @@ -41,7 +41,7 @@ @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; -@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace; +@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-base: @font-family-sans-serif; @font-size-base: 14px; -- 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 cdb243706e2fa4bedc359760f4955fd9fdd3fc0c Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 17 Nov 2013 23:07:28 +0100 Subject: Fix #11513: Don't always float navbar-text `navbar-text` should only float when the navbar is expanded on larger screens, otherwise the element might be (hidden) behind `navbar-nav`. Fixes #11513. X-Ref: #8820 #8815 --- 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 987cde6b0..21cffc250 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -340,10 +340,10 @@ // Add a class to make any element properly align itself vertically within the navbars. .navbar-text { - float: left; .navbar-vertical-align(@line-height-computed); @media (min-width: @grid-float-breakpoint) { + float: left; margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; } -- cgit v1.2.3 From 50578dda6072f104921ef1563d2928e5463f64cb Mon Sep 17 00:00:00 2001 From: Erik Flowers Date: Mon, 18 Nov 2013 11:58:14 -0700 Subject: - Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color - (this is a re-commit since I messed up my branch last time and failed the travis build) --- 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 3d24e668a..50ccafa7c 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -55,7 +55,7 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; } // Firefox 19+ + &::-moz-placeholder { color: @color; opacity:1; } // Firefox 19+ &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } -- cgit v1.2.3 From 446f2325a6e4f730939e0fa3e12ba1f5fc53f27f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 18 Nov 2013 14:22:17 -0800 Subject: add explanatory comment Re: #11526 --- less/mixins.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 50ccafa7c..e76d8d697 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -55,7 +55,8 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; opacity:1; } // Firefox 19+ + &::-moz-placeholder { color: @color; // Firefox 19+ + opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } -- cgit v1.2.3 From ba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d Mon Sep 17 00:00:00 2001 From: aentan Date: Tue, 19 Nov 2013 17:24:49 +0800 Subject: add support for button dropdowns in justified button groups --- less/button-groups.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index c25357622..bba9d0295 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -238,11 +238,15 @@ width: 100%; table-layout: fixed; border-collapse: separate; - .btn { + > .btn, + > .btn-group { float: none; display: table-cell; width: 1%; } + > .btn-group .btn { + width: 100%; + } } -- 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 From ed29a99df4f9573a2f312093f3aaac9acf2b9c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 1 Dec 2013 09:18:27 +0100 Subject: Use mixin instead of whole code --- less/mixins.less | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index df515f39a..479352452 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -88,11 +88,7 @@ } // New mixin to use as of v3.0.1 .text-hide() { - font: ~"0/0" a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; + .hide-text(); } -- cgit v1.2.3 From 556d6cef3e1e5b9b6aeef42fb44d2eafcf2f38a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 00:20:47 -0800 Subject: Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory --- less/glyphicons.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 9de2dd3b6..8a68f11ef 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -10,11 +10,11 @@ // Import the fonts @font-face { font-family: 'Glyphicons Halflings'; - src: url('@{icon-font-path}@{icon-font-name}.eot'); - src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), - url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), - url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), - url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg'); + src: ~"url('@{icon-font-path}@{icon-font-name}.eot')"; + src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')", + ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')", + ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')", + ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')"; } // Catchall baseclass -- cgit v1.2.3 From d417fceceac8bec34a9f23c9a56122ba24097d35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 18:13:27 -0800 Subject: Fixes #11357: Vertically center sm and xs buttons in the navbar --- less/navbar.less | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 202edb57c..6796530f4 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -333,6 +333,13 @@ .navbar-btn { .navbar-vertical-align(@input-height-base); + + &.btn-sm { + .navbar-vertical-align(@input-height-small); + } + &.btn-xs { + .navbar-vertical-align(22); + } } -- cgit v1.2.3 From 5a0365524d8a190c718bcb4950c423c9bef75bd9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 19:27:33 -0800 Subject: Rework navbar padding and margins for right aligned last-child elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This slight reworking of the navbar spacing was brought about by a problem noted in #11530: use of `.navbar-form.navbar-right` leaves an extra 15px of space on the right. Here’s what’s new: * Removed the `padding` on `.navbar-collapse` within static top, fixed top, and fixed bottom navbars. Meaning, it’s still there for the default navbar. This was the root cause of the extra 15px padding for navbar forms. * As part of this, I also replaced the existing negative margin overrides for last-child elements with more contextual ones within their sub-components. Overall not too different, but should be more effective now and easier to work with now. For example of new changes, see http://jsbin.com/odeSiSo/1/. --- less/navbar.less | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 6796530f4..eb6031a59 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -77,15 +77,13 @@ overflow-y: auto; } - // Account for first and last children spacing - .navbar-nav.navbar-left:first-child { - margin-left: -@navbar-padding-horizontal; - } - .navbar-nav.navbar-right:last-child { - margin-right: -@navbar-padding-horizontal; - } - .navbar-text:last-child { - margin-right: 0; + // Undo the collapse side padding for navbars with containers to ensure + // alignment of right-aligned contents. + .navbar-fixed-top &, + .navbar-static-top &, + .navbar-fixed-bottom & { + padding-left: 0; + padding-right: 0; } } } @@ -251,8 +249,11 @@ padding-bottom: @navbar-padding-vertical; } } - } + &.navbar-right:last-child { + margin-right: -@navbar-padding-horizontal; + } + } } @@ -303,6 +304,11 @@ padding-top: 0; padding-bottom: 0; .box-shadow(none); + + // Outdent the form if last child to line up with content down the page + &.navbar-right:last-child { + margin-right: -@navbar-padding-horizontal; + } } } @@ -354,6 +360,11 @@ float: left; 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 { + margin-right: 0; + } } } -- cgit v1.2.3 From 3a65b2c11f43154907923535b56ea84fb84cfb78 Mon Sep 17 00:00:00 2001 From: Haley Date: Mon, 2 Dec 2013 13:29:54 -0600 Subject: Added text-justify class to type.less --- less/type.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/type.less b/less/type.less index ac07ac7ce..0c9600d50 100644 --- a/less/type.less +++ b/less/type.less @@ -120,6 +120,7 @@ cite { font-style: normal; } .text-left { text-align: left; } .text-right { text-align: right; } .text-center { text-align: center; } +.text-justify { text-align: justify; } // Page header -- cgit v1.2.3 From 92a624a31ced5ef0e70052a00253f5edc70a104b Mon Sep 17 00:00:00 2001 From: Lipis Date: Tue, 3 Dec 2013 15:03:07 +0100 Subject: Get rid of empty line before the last closing bracket --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index a0909606f..ee6f6612a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -45,7 +45,6 @@ .opacity(.65); .box-shadow(none); } - } -- cgit v1.2.3 From 199872418c1d0aac6e79218cfb86ba2b751e571e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 11:14:13 -0800 Subject: reference root issue in explanatory comment --- 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 9c5eeed4e..7188703e5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -178,7 +178,7 @@ padding: 9px 10px; .navbar-vertical-align(34px); background-color: transparent; - background-image: none; // Fix for at least Firefox on Android, per #11468 + background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; border-radius: @border-radius-base; -- cgit v1.2.3 From 303f8a33c354b5c8f6132574de55114b8f39a1f1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 13:57:28 -0800 Subject: add case to responsive-visibility mixin; see #10056 --- less/mixins.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 8da6b23ef..4f58d3060 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -560,9 +560,10 @@ // More easily include all the states for responsive-utilities.less. .responsive-visibility() { display: block !important; - tr& { display: table-row !important; } + table& { display: table; } + tr& { display: table-row !important; } th&, - td& { display: table-cell !important; } + td& { display: table-cell !important; } } .responsive-invisibility() { -- cgit v1.2.3 From 3f1e4b92eefaee617115973eba98fc7cc0905ab8 Mon Sep 17 00:00:00 2001 From: awebdeveloper Date: Tue, 19 Nov 2013 13:50:33 +0530 Subject: -moz and old webkit syntax removed for gradients based on http://caniuse.com/#search=grad --- less/mixins.less | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 8da6b23ef..3d0aa679e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -31,7 +31,7 @@ .tab-focus() { // Default outline: thin dotted; - //Webkit + // WebKit outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -274,10 +274,8 @@ // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { - background-image: -webkit-gradient(linear, @start-percent top, @end-percent top, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // FF 3.6+ - background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10 + background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+ + background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down } @@ -287,47 +285,36 @@ // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9 and below. .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { - background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+ - background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10 + background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+ + background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down } .directional(@start-color: #555; @end-color: #333; @deg: 45deg) { background-repeat: repeat-x; - background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+ - background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+ - background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10 + background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+ + background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ } .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { - background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); - background-image: -moz-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color)); background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color); - background-image: -moz-linear-gradient(top, @start-color, @mid-color @color-stop, @end-color); background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color); background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback } .radial(@inner-color: #555; @outer-color: #333) { - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color)); background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color); - background-image: -moz-radial-gradient(circle, @inner-color, @outer-color); background-image: radial-gradient(circle, @inner-color, @outer-color); background-repeat: no-repeat; } .striped(@color: rgba(255,255,255,.15); @angle: 45deg) { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, @color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, @color), color-stop(.75, @color), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); } } -- cgit v1.2.3 From 4a45650026a16d372feb1f150899e883d410a35e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 18:03:04 -0800 Subject: fix .btn-group-xs portion of #10979 --- less/buttons.less | 5 ++--- less/variables.less | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index ee6f6612a..0a484ead2 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -122,13 +122,12 @@ // line-height: ensure even-numbered height of button next to large input .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } -.btn-sm, -.btn-xs { +.btn-sm { // line-height: ensure proper height of button next to small input .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } .btn-xs { - padding: 1px 5px; + .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); } diff --git a/less/variables.less b/less/variables.less index 120a65e06..1775be080 100644 --- a/less/variables.less +++ b/less/variables.less @@ -84,6 +84,9 @@ @padding-small-vertical: 5px; @padding-small-horizontal: 10px; +@padding-xs-vertical: 1px; +@padding-xs-horizontal: 5px; + @line-height-large: 1.33; @line-height-small: 1.5; -- cgit v1.2.3 From a45d83987466e61fd613ac9e7f98fafa8697d16f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Dec 2013 21:13:33 -0800 Subject: Fixes #11712: Better support for .table-responsive within .panel's --- less/panels.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index d782ffcde..a5ada2a2d 100644 --- a/less/panels.less +++ b/less/panels.less @@ -91,6 +91,10 @@ } } } + > .table-responsive { + border: 0; + margin-bottom: 0; + } } -- cgit v1.2.3 From 45930acdf7b7d03842011b1d20779f1762e99c30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Dec 2013 22:32:56 -0800 Subject: Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization. Also addresses #10371, #10395, and #10465. --- less/navbar.less | 8 ++++---- less/variables.less | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 7188703e5..ea284fede 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -213,7 +213,7 @@ line-height: @line-height-computed; } - @media (max-width: @screen-xs-max) { + @media (max-width: @grid-float-breakpoint-max) { // Dropdowns get custom display when collapsed .open .dropdown-menu { position: static; @@ -287,7 +287,7 @@ .form-inline(); .form-group { - @media (max-width: @screen-xs-max) { + @media (max-width: @grid-float-breakpoint-max) { margin-bottom: 5px; } } @@ -445,7 +445,7 @@ } } - @media (max-width: @screen-xs-max) { + @media (max-width: @grid-float-breakpoint-max) { // Dropdowns get custom display when collapsed .open .dropdown-menu { > li > a { @@ -565,7 +565,7 @@ } } - @media (max-width: @screen-xs-max) { + @media (max-width: @grid-float-breakpoint-max) { // Dropdowns get custom display .open .dropdown-menu { > .dropdown-header { diff --git a/less/variables.less b/less/variables.less index 1775be080..8b5f2184d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -247,8 +247,13 @@ @grid-columns: 12; // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; -// Point at which the navbar stops collapsing + +// Navbar collapse + +// Point at which the navbar becomes uncollapsed @grid-float-breakpoint: @screen-sm-min; +// Point at which the navbar begins collapsing +@grid-float-breakpoint-max: (@grid-float-breakpoint - 1); // Navbar -- cgit v1.2.3 From 01afe84b316d22374ad2333b3c15b35ad17029af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 5 Dec 2013 07:43:50 +0100 Subject: Remove redundant, duplicate comment --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index ee6f6612a..d1ac7d7c7 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -6,7 +6,6 @@ // Base styles // -------------------------------------------------- -// Core styles .btn { display: inline-block; margin-bottom: 0; // For input.btn -- cgit v1.2.3 From 9ce7e5620c47b5ec205c42948c42fc468c05686f Mon Sep 17 00:00:00 2001 From: Bohdan Ganicky Date: Fri, 6 Dec 2013 14:09:55 +0100 Subject: Updated .scale() mixin so that it accepts optional vertical scale factor parameter. --- less/mixins.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 5c54c64c7..e0ff3f705 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -150,10 +150,10 @@ -ms-transform: rotate(@degrees); // IE9+ transform: rotate(@degrees); } -.scale(@ratio) { - -webkit-transform: scale(@ratio); - -ms-transform: scale(@ratio); // IE9+ - transform: scale(@ratio); +.scale(@ratio; @ratio-y...) { + -webkit-transform: scale(@ratio, @ratio-y); + -ms-transform: scale(@ratio, @ratio-y); // IE9+ + transform: scale(@ratio, @ratio-y); } .translate(@x; @y) { -webkit-transform: translate(@x, @y); -- cgit v1.2.3 From b92bee99efd95a4c0ae469e3a5f4004da0164578 Mon Sep 17 00:00:00 2001 From: Luke Noel-Storr Date: Fri, 6 Dec 2013 14:11:58 +0000 Subject: reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose) fixes issue twbs/bootstrap#11728 --- less/mixins.less | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 5c54c64c7..a820ad686 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -414,24 +414,24 @@ .table-row-variant(@state; @background) { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. - .table { - > thead, - > tbody, - > tfoot { - > tr > .@{state}, - > .@{state} > td, - > .@{state} > th { - background-color: @background; - } + .table > thead > tr, + .table > tbody > tr, + .table > tfoot > tr { + > td.@{state}, + > th.@{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 > .@{state}:hover, - > .@{state}:hover > td, - > .@{state}:hover > th { + .table-hover > tbody > tr { + > td.@{state}:hover, + > th.@{state}:hover, + &.@{state}:hover > td, + &.@{state}:hover > th { background-color: darken(@background, 5%); } } -- cgit v1.2.3 From 78b43d4c99c5b091980a977656a378f6c46c7c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 6 Dec 2013 22:34:29 +0100 Subject: Darken icon bar to meet WCAG --- 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 8b5f2184d..5b2e9044f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -286,7 +286,7 @@ // Navbar toggle @navbar-default-toggle-hover-bg: #ddd; -@navbar-default-toggle-icon-bar-bg: #ccc; +@navbar-default-toggle-icon-bar-bg: #888; @navbar-default-toggle-border-color: #ddd; -- cgit v1.2.3 From f4087df47e6347a2f28b44a18914cfebf1cc3a9c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 6 Dec 2013 12:42:21 +0200 Subject: Remove incompatible properties. --- less/forms.less | 4 ---- 1 file changed, 4 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index dc425ecc1..81840d158 100644 --- a/less/forms.less +++ b/less/forms.less @@ -89,7 +89,6 @@ output { font-size: @font-size-base; line-height: @line-height-base; color: @input-color; - vertical-align: middle; } @@ -123,7 +122,6 @@ output { font-size: @font-size-base; line-height: @line-height-base; color: @input-color; - vertical-align: middle; background-color: @input-bg; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid @input-border; @@ -179,10 +177,8 @@ output { margin-top: 10px; margin-bottom: 10px; padding-left: 20px; - vertical-align: middle; label { display: inline; - margin-bottom: 0; font-weight: normal; cursor: pointer; } -- cgit v1.2.3 From 107b334d349be065421967553f57aa186736ffcf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:45:11 -0800 Subject: Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge --- 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 5c54c64c7..4d045987e 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -475,7 +475,7 @@ .badge { color: @background; - background-color: #fff; + background-color: @color; } } -- cgit v1.2.3 From c07632e4e8398f55d796d00b520ca43df38dbf29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:47:37 -0800 Subject: Reorder button and table variants for consistent order --- less/buttons.less | 8 ++++---- less/tables.less | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 62e693bee..b728f332c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -56,6 +56,10 @@ .btn-primary { .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); } +// Success appears as green +.btn-success { + .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); +} // Warning appears as orange .btn-warning { .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); @@ -64,10 +68,6 @@ .btn-danger { .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); } -// Success appears as green -.btn-success { - .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); -} // Info appears as blue-green .btn-info { .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); diff --git a/less/tables.less b/less/tables.less index ca565f4b7..5827b6083 100644 --- a/less/tables.less +++ b/less/tables.less @@ -156,8 +156,8 @@ table { // Generate the contextual variants .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); +.table-row-variant(danger; @state-danger-bg); // Responsive tables -- cgit v1.2.3 From fe58357df182b52f5905f432a3b2629c717656f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:56:35 -0800 Subject: Fixes #10884: Adds .info variant to contextual table classes --- less/tables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index 5827b6083..f8c05fecf 100644 --- a/less/tables.less +++ b/less/tables.less @@ -158,6 +158,7 @@ table { .table-row-variant(success; @state-success-bg); .table-row-variant(warning; @state-warning-bg); .table-row-variant(danger; @state-danger-bg); +.table-row-variant(info; @state-info-bg); // Responsive tables -- cgit v1.2.3 From b1215d1b2ecd6cd3898af19ce43cc647e2ec854a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 12:18:13 -0800 Subject: Fixes #11193: Add kbd element styles to indicate user input via keyboard --- less/code.less | 10 ++++++++++ less/variables.less | 3 +++ 2 files changed, 13 insertions(+) (limited to 'less') diff --git a/less/code.less b/less/code.less index 44e9e8937..3eed26c05 100644 --- a/less/code.less +++ b/less/code.less @@ -21,6 +21,16 @@ code { border-radius: @border-radius-base; } +// User input typically entered via keyboard +kbd { + padding: 2px 4px; + font-size: 90%; + color: @kbd-color; + background-color: @kbd-bg; + border-radius: @border-radius-small; + box-shadow: inset 0 -1px 0 rgba(0,0,0,.25); +} + // Blocks of code pre { display: block; diff --git a/less/variables.less b/less/variables.less index 5b2e9044f..3681e99b5 100644 --- a/less/variables.less +++ b/less/variables.less @@ -602,6 +602,9 @@ @code-color: #c7254e; @code-bg: #f9f2f4; +@kbd-color: #fff; +@kbd-bg: #333; + @pre-bg: #f5f5f5; @pre-color: @gray-dark; @pre-border-color: #ccc; -- cgit v1.2.3 From 07de53c644b315852c5f315ab91bfd6d65660d50 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 14:09:03 -0800 Subject: Contextual list group cleanup * Adds nav link to sidebar for contextual classes * Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes * Adds default and linked variations to example in docs --- less/list-group.less | 29 +++++++++++++++++++++++------ less/mixins.less | 26 +++++++++++++++++++------- 2 files changed, 42 insertions(+), 13 deletions(-) (limited to 'less') diff --git a/less/list-group.less b/less/list-group.less index cf4ce3eea..35fff05d4 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -2,17 +2,21 @@ // List groups // -------------------------------------------------- + // Base class // // Easily usable on
    ,
      , or
      . + .list-group { // No need to set list-style: none; since .list-group-item is block level margin-bottom: 20px; padding-left: 0; // reset padding because ul and ol } + // Individual list items -// ------------------------- +// +// Use on `li`s or `div`s within the `.list-group` parent. .list-group-item { position: relative; @@ -41,12 +45,12 @@ } } -// Contextual variants -.list-group-item-variant(success; @state-success-bg; @state-success-border); -.list-group-item-variant(danger; @state-danger-bg; @state-danger-border); -.list-group-item-variant(warning; @state-warning-bg; @state-warning-border); // Linked list items +// +// Use anchor elements instead of `li`s or `div`s to create linked list items. +// Includes an extra `.active` modifier class for showing selected items. + a.list-group-item { color: @list-group-link-color; @@ -80,8 +84,21 @@ a.list-group-item { } } + +// Contextual variants +// +// Add modifier classes to change text and background color on individual items. +// Organizationally, this must come after the `:hover` states. + +.list-group-item-variant(success; @state-success-bg; @state-success-text); +.list-group-item-variant(warning; @state-warning-bg; @state-warning-text); +.list-group-item-variant(danger; @state-danger-bg; @state-danger-text); +.list-group-item-variant(info; @state-info-bg; @state-info-text); + + // Custom content options -// ------------------------- +// +// Extra classes for creating well-formatted content within `.list-group-item`s. .list-group-item-heading { margin-top: 0; diff --git a/less/mixins.less b/less/mixins.less index 04bd10ee0..9c84984ba 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -450,16 +450,28 @@ // List Groups // ------------------------- -.list-group-item-variant(@state; @background; @border) { - .list-group-item.@{state} { +.list-group-item-variant(@state; @background; @color) { + .list-group-item-@{state} { + color: @color; background-color: @background; - border-color: @border; } + a.list-group-item-@{state} { + color: @color; - // Hover states - .list-group-item.@{state}:hover { - background-color: darken(@background, 5%); - border-color: darken(@border, 5%); + .list-group-item-heading { color: inherit; } + + &:hover, + &:focus { + color: @color; + background-color: darken(@background, 5%); + } + &.active, + &.active:hover, + &.active:focus { + color: #fff; + background-color: @color; + border-color: @color; + } } } -- cgit v1.2.3 From 6273604601c58284f49b38ae4e52533b9689437c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 20:52:51 -0800 Subject: Add .container-fluid variation for full-width containers and layouts /cc #10711 #9862 --- less/grid.less | 27 ++++++++++++++++++++++++--- less/navbar.less | 22 +++++++++++++--------- 2 files changed, 37 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/grid.less b/less/grid.less index 279d80368..dfae6999b 100644 --- a/less/grid.less +++ b/less/grid.less @@ -2,7 +2,11 @@ // Grid system // -------------------------------------------------- -// Set the container width, and override it for fixed navbars in media queries + +// Container widths +// +// Set the container width, and override it for fixed navbars in media queries. + .container { .container-fixed(); @@ -17,12 +21,30 @@ } } -// mobile first defaults + +// Fluid container +// +// Utilizes the mixin meant for fixed width containers, but without any defined +// width for fluid, full width layouts. + +.container-fluid { + .container-fixed(); +} + + +// Row +// +// Rows contain and clear the floats of your columns. + .row { .make-row(); } + +// Columns +// // Common styles for small and large grid columns + .make-grid-columns(); @@ -76,4 +98,3 @@ .make-grid(@grid-columns, lg, push); .make-grid(@grid-columns, lg, offset); } - diff --git a/less/navbar.less b/less/navbar.less index ea284fede..e9633d855 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -93,14 +93,17 @@ // // When a container is present, change the behavior of the header and collapse. -.container > .navbar-header, -.container > .navbar-collapse { - margin-right: -@navbar-padding-horizontal; - margin-left: -@navbar-padding-horizontal; - - @media (min-width: @grid-float-breakpoint) { - margin-right: 0; - margin-left: 0; +.container, +.container-fluid { + > .navbar-header, + > .navbar-collapse { + margin-right: -@navbar-padding-horizontal; + margin-left: -@navbar-padding-horizontal; + + @media (min-width: @grid-float-breakpoint) { + margin-right: 0; + margin-left: 0; + } } } @@ -159,7 +162,8 @@ } @media (min-width: @grid-float-breakpoint) { - .navbar > .container & { + .navbar > .container &, + .navbar > .container-fluid & { margin-left: -@navbar-padding-horizontal; } } -- cgit v1.2.3 From b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 01:59:44 -0800 Subject: add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs --- less/forms.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 81840d158..50df399e3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -303,6 +303,7 @@ input[type="checkbox"], // In navbar-form, allow folks to *not* use `.form-group` .form-control { display: inline-block; + vertical-align: middle; } // Override `width: 100%;` when not within a `.form-group` @@ -319,6 +320,7 @@ input[type="checkbox"], margin-top: 0; margin-bottom: 0; padding-left: 0; + vertical-align: middle; } .radio input[type="radio"], .checkbox input[type="checkbox"] { -- cgit v1.2.3 From 1f9bfa89dc219654b5e096bda9233a58c69216fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 02:14:24 -0800 Subject: Fixes #11741: Don't set headings font-family again, just use inherit --- 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 3681e99b5..fea7bc75a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -58,7 +58,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; +@headings-font-family: inherit; @headings-font-weight: 500; @headings-line-height: 1.1; @headings-color: inherit; -- cgit v1.2.3 From 6df909ad9b85e5e19ff7760da8981bf7563a5bb9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 19:19:06 -0800 Subject: Fixes #11786: Nest media queries within print utilities for mixin-friendliness --- less/responsive-utilities.less | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index df53e479d..5823c8fca 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -194,16 +194,21 @@ } } + // Print utilities +// +// Media queries are placed on the inside to be mixin-friendly. + .visible-print { .responsive-invisibility(); -} -@media print { - .visible-print { + @media print { .responsive-visibility(); } - .hidden-print { +} + +.hidden-print { + @media print { .responsive-invisibility(); } } -- cgit v1.2.3 From 0016c17f9307bc71fc96d8d4680a9c861f137cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 23:18:28 -0800 Subject: Switch to `&:extend(.clearfix all)` for clearfix mixin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original discussion: https://github.com/less/less.js/issues/1437#issuecomment-21383639. Since we’re switching to `grunt-contrib-less`, we can take advantage of newer LESS features than what RECESS supported. Included in that is the ability to `:extend`, and not only that, but `:extend(.mixin-name all)`. By doing so, we remove duplicate CSS for all our elements that were being clearfix-ed. Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686, #9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652. (dem issues, tho) --- less/button-groups.less | 4 ++-- less/mixins.less | 4 ++-- less/modals.less | 2 +- less/navbar.less | 6 +++--- less/navs.less | 2 +- less/pager.less | 2 +- less/panels.less | 2 +- less/type.less | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 05fda149a..ef9c34e77 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -37,7 +37,7 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - .clearfix(); + &:extend(.clearfix all); .btn-group { float: left; @@ -157,7 +157,7 @@ // Clear floats so dropdown menus can be properly placed > .btn-group { - .clearfix(); + &:extend(.clearfix all); > .btn { float: none; } diff --git a/less/mixins.less b/less/mixins.less index 9ef72fef7..1079b947a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -597,14 +597,14 @@ margin-left: auto; padding-left: (@grid-gutter-width / 2); padding-right: (@grid-gutter-width / 2); - .clearfix(); + &:extend(.clearfix all); } // Creates a wrapper for a series of columns .make-row(@gutter: @grid-gutter-width) { margin-left: (@gutter / -2); margin-right: (@gutter / -2); - .clearfix(); + &:extend(.clearfix all); } // Generate the extra small columns diff --git a/less/modals.less b/less/modals.less index e65dbf7f1..292b5bd9c 100644 --- a/less/modals.less +++ b/less/modals.less @@ -98,7 +98,7 @@ padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid @modal-footer-border-color; - .clearfix(); // clear it in case folks use .pull-* classes on buttons + &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons .btn + .btn { diff --git a/less/navbar.less b/less/navbar.less index e9633d855..51e3df258 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -15,7 +15,7 @@ border: 1px solid transparent; // Prevent floats from breaking the navbar - .clearfix(); + &:extend(.clearfix all); @media (min-width: @grid-float-breakpoint) { border-radius: @navbar-border-radius; @@ -29,7 +29,7 @@ // styling of responsive aspects. .navbar-header { - .clearfix(); + &:extend(.clearfix all); @media (min-width: @grid-float-breakpoint) { float: left; @@ -54,7 +54,7 @@ padding-left: @navbar-padding-horizontal; border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255,255,255,.1); - .clearfix(); + &:extend(.clearfix all); -webkit-overflow-scrolling: touch; &.in { diff --git a/less/navs.less b/less/navs.less index 859d5d866..e4ac14459 100644 --- a/less/navs.less +++ b/less/navs.less @@ -10,7 +10,7 @@ margin-bottom: 0; padding-left: 0; // Override default ul/ol list-style: none; - .clearfix(); + &:extend(.clearfix all); > li { position: relative; diff --git a/less/pager.less b/less/pager.less index 16993ddc8..5205f0ee5 100644 --- a/less/pager.less +++ b/less/pager.less @@ -8,7 +8,7 @@ margin: @line-height-computed 0; list-style: none; text-align: center; - .clearfix(); + &:extend(.clearfix all); li { display: inline; > a, diff --git a/less/panels.less b/less/panels.less index a5ada2a2d..37ab67043 100644 --- a/less/panels.less +++ b/less/panels.less @@ -15,7 +15,7 @@ // Panel contents .panel-body { padding: 15px; - .clearfix(); + &:extend(.clearfix all); } diff --git a/less/type.less b/less/type.less index 0c9600d50..1eddb3f9b 100644 --- a/less/type.less +++ b/less/type.less @@ -202,7 +202,7 @@ dd { } dd { margin-left: @component-offset-horizontal; - .clearfix(); // Clear the floated `dt` if an empty `dd` is present + &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present } } } -- cgit v1.2.3 From 9ceff600571b40acd7c02ae315a6f79da3b25d74 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 8 Dec 2013 23:34:24 -0800 Subject: more nesting in .list-group-item-variant mixin --- less/mixins.less | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 9ef72fef7..59c4c9573 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -443,23 +443,24 @@ .list-group-item-@{state} { color: @color; background-color: @background; - } - a.list-group-item-@{state} { - color: @color; - - .list-group-item-heading { color: inherit; } - &:hover, - &:focus { + a& { color: @color; - background-color: darken(@background, 5%); - } - &.active, - &.active:hover, - &.active:focus { - color: #fff; - background-color: @color; - border-color: @color; + + .list-group-item-heading { color: inherit; } + + &:hover, + &:focus { + color: @color; + background-color: darken(@background, 5%); + } + &.active, + &.active:hover, + &.active:focus { + color: #fff; + background-color: @color; + border-color: @color; + } } } } -- cgit v1.2.3 From 10e74a94e6cb512f9c2d592aaf46252d95e7d498 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 9 Dec 2013 15:35:13 -0800 Subject: improve compliance with LESS's strictMath --- less/type.less | 2 +- less/variables.less | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index 1eddb3f9b..24a581fe8 100644 --- a/less/type.less +++ b/less/type.less @@ -61,7 +61,7 @@ p { .lead { margin-bottom: @line-height-computed; - font-size: floor(@font-size-base * 1.15); + font-size: floor((@font-size-base * 1.15)); font-weight: 200; line-height: 1.4; diff --git a/less/variables.less b/less/variables.less index fea7bc75a..b9b0d4f4e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -45,18 +45,18 @@ @font-family-base: @font-family-sans-serif; @font-size-base: 14px; -@font-size-large: ceil(@font-size-base * 1.25); // ~18px -@font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-large: ceil((@font-size-base * 1.25)); // ~18px +@font-size-small: ceil((@font-size-base * 0.85)); // ~12px -@font-size-h1: floor(@font-size-base * 2.6); // ~36px -@font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.7); // ~24px -@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h1: floor((@font-size-base * 2.6)); // ~36px +@font-size-h2: floor((@font-size-base * 2.15)); // ~30px +@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px +@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px @font-size-h5: @font-size-base; -@font-size-h6: ceil(@font-size-base * 0.85); // ~12px +@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px @line-height-base: 1.428571429; // 20/14 -@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px +@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px @headings-font-family: inherit; @headings-font-weight: 500; @@ -263,7 +263,7 @@ @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; @navbar-border-radius: @border-radius-base; -@navbar-padding-horizontal: floor(@grid-gutter-width / 2); +@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-default-color: #777; @@ -374,7 +374,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@jumbotron-font-size: ceil(@font-size-base * 1.5); +@jumbotron-font-size: ceil((@font-size-base * 1.5)); // Form states and alerts -- cgit v1.2.3 From 9664f8da58abe718463ee31398e5d15de37f7289 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 9 Dec 2013 15:59:50 -0800 Subject: add parens around arithmetic in recursive mixin calls to comply with LESS strictMath <3 @seven-phases-max for helping to confirm & debug this X-Ref: https://github.com/less/less.js/issues/1725 --- less/mixins.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index c107b566e..b5beaddf2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -729,11 +729,11 @@ // Common styles for all sizes of grid columns, widths 1-12 .col(@index) when (@index = 1) { // initial @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; - .col(@index + 1, @item); + .col((@index + 1), @item); } .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}"; - .col(@index + 1, ~"@{list}, @{item}"); + .col((@index + 1), ~"@{list}, @{item}"); } .col(@index, @list) when (@index > @grid-columns) { // terminal @{list} { @@ -751,11 +751,11 @@ .make-grid-columns-float(@class) { .col(@index) when (@index = 1) { // initial @item: ~".col-@{class}-@{index}"; - .col(@index + 1, @item); + .col((@index + 1), @item); } .col(@index, @list) when (@index =< @grid-columns) { // general @item: ~".col-@{class}-@{index}"; - .col(@index + 1, ~"@{list}, @{item}"); + .col((@index + 1), ~"@{list}, @{item}"); } .col(@index, @list) when (@index > @grid-columns) { // terminal @{list} { @@ -790,7 +790,7 @@ .make-grid(@index, @class, @type) when (@index >= 0) { .calc-grid(@index, @class, @type); // next iteration - .make-grid(@index - 1, @class, @type); + .make-grid((@index - 1), @class, @type); } -- cgit v1.2.3 From ab29b1a3352e89fe8756a34e49a38341edd06844 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 9 Dec 2013 16:12:41 -0800 Subject: misc strictMath compliance fixes --- less/dropdowns.less | 2 +- less/forms.less | 2 +- less/panels.less | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 1a8f1973f..4bdc223fc 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -142,7 +142,7 @@ right: 0; bottom: 0; top: 0; - z-index: @zindex-dropdown - 10; + z-index: (@zindex-dropdown - 10); } // Right aligned dropdowns diff --git a/less/forms.less b/less/forms.less index 50df399e3..f7fc5d66c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -352,7 +352,7 @@ input[type="checkbox"], // and other content below items .radio, .checkbox { - min-height: @line-height-computed + (@padding-base-vertical + 1); + min-height: (@line-height-computed + (@padding-base-vertical + 1)); } // Make form groups behave like rows diff --git a/less/panels.less b/less/panels.less index 37ab67043..a6b723c68 100644 --- a/less/panels.less +++ b/less/panels.less @@ -102,7 +102,7 @@ .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; - .border-top-radius(@panel-border-radius - 1); + .border-top-radius((@panel-border-radius - 1)); > .dropdown .dropdown-toggle { color: inherit; @@ -126,7 +126,7 @@ padding: 10px 15px; background-color: @panel-footer-bg; border-top: 1px solid @panel-inner-border; - .border-bottom-radius(@panel-border-radius - 1); + .border-bottom-radius((@panel-border-radius - 1)); } -- cgit v1.2.3 From 3e0366a3df12840cd086ff632e1455aae5c5ee65 Mon Sep 17 00:00:00 2001 From: Jan Panschab Date: Tue, 10 Dec 2013 17:15:41 +0100 Subject: transform origin mixin for explorer --- less/mixins.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index b5beaddf2..786c53437 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -193,6 +193,7 @@ .transform-origin(@origin) { -webkit-transform-origin: @origin; -moz-transform-origin: @origin; + -ms-transform-origin: @origin; transform-origin: @origin; } -- cgit v1.2.3 From 2547f1e20f94c592b4125de9006cc45b560af51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Dec 2013 14:36:26 +0100 Subject: Use variables for breadcrumb padding --- less/breadcrumbs.less | 2 +- less/variables.less | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 60b33ea72..5917778f4 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -4,7 +4,7 @@ .breadcrumb { - padding: 8px 15px; + padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal; margin-bottom: @line-height-computed; list-style: none; background-color: @breadcrumb-bg; diff --git a/less/variables.less b/less/variables.less index fea7bc75a..39b1c0a18 100644 --- a/less/variables.less +++ b/less/variables.less @@ -568,10 +568,12 @@ // Breadcrumbs // ------------------------- -@breadcrumb-bg: #f5f5f5; -@breadcrumb-color: #ccc; -@breadcrumb-active-color: @gray-light; -@breadcrumb-separator: "/"; +@breadcrumb-padding-vertical: 8px; +@breadcrumb-padding-horizontal: 15px; +@breadcrumb-bg: #f5f5f5; +@breadcrumb-color: #ccc; +@breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel -- cgit v1.2.3 From 4b47c608351d1ac40a4067a163227db29035c47f Mon Sep 17 00:00:00 2001 From: dzwillia Date: Thu, 12 Dec 2013 12:53:59 -0500 Subject: Added @dropdown-caret-color variable back to variables.less (deprecated) --- less/variables.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 8122161fd..3d7cb660c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -189,6 +189,9 @@ @dropdown-header-color: @gray-light; +// Note: Deprecated @dropdown-caret-color as of v3.1.0 +@dropdown-caret-color: #000; + // COMPONENT VARIABLES // -------------------------------------------------- -- cgit v1.2.3 From 5f9ecc7351df9bc45117ffe7c8ab51d3571ef878 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Dec 2013 23:01:11 -0800 Subject: -ms-transform is for IE9 only, IE10+ don't require it --- less/mixins.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index 786c53437..4bfd44904 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -147,17 +147,17 @@ // Transformations .rotate(@degrees) { -webkit-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); // IE9+ + -ms-transform: rotate(@degrees); // IE9 only transform: rotate(@degrees); } .scale(@ratio; @ratio-y...) { -webkit-transform: scale(@ratio, @ratio-y); - -ms-transform: scale(@ratio, @ratio-y); // IE9+ + -ms-transform: scale(@ratio, @ratio-y); // IE9 only transform: scale(@ratio, @ratio-y); } .translate(@x; @y) { -webkit-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); // IE9+ + -ms-transform: translate(@x, @y); // IE9 only transform: translate(@x, @y); } .skew(@x; @y) { @@ -172,12 +172,12 @@ .rotateX(@degrees) { -webkit-transform: rotateX(@degrees); - -ms-transform: rotateX(@degrees); // IE9+ + -ms-transform: rotateX(@degrees); // IE9 only transform: rotateX(@degrees); } .rotateY(@degrees) { -webkit-transform: rotateY(@degrees); - -ms-transform: rotateY(@degrees); // IE9+ + -ms-transform: rotateY(@degrees); // IE9 only transform: rotateY(@degrees); } .perspective(@perspective) { @@ -193,7 +193,7 @@ .transform-origin(@origin) { -webkit-transform-origin: @origin; -moz-transform-origin: @origin; - -ms-transform-origin: @origin; + -ms-transform-origin: @origin; // IE9 only transform-origin: @origin; } -- cgit v1.2.3 From b7bf212995b63d303281023e02777963b265b976 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Fri, 13 Dec 2013 12:24:20 +0100 Subject: use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop. removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index. --- less/modals.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index 292b5bd9c..717c7b355 100644 --- a/less/modals.less +++ b/less/modals.less @@ -22,7 +22,7 @@ right: 0; bottom: 0; left: 0; - z-index: @zindex-modal-background; + z-index: @zindex-modal; // When fading in the modal, animate it to slide down &.fade .modal-dialog { @@ -37,7 +37,6 @@ position: relative; width: auto; margin: 10px; - z-index: (@zindex-modal-background + 10); } // Actual modal @@ -60,7 +59,7 @@ right: 0; bottom: 0; left: 0; - z-index: (@zindex-modal-background - 10); + z-index: @zindex-modal-background; background-color: @modal-backdrop-bg; // Fade for backdrop &.fade { .opacity(0); } -- cgit v1.2.3 From e3d799fca3f64211c74c13b4ea85ad6a33d693b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 13 Dec 2013 23:15:02 +0100 Subject: ';' isn't needed --- 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 b5beaddf2..1a2a97ae4 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -353,7 +353,7 @@ // // Keep images from scaling beyond the width of their parents. -.img-responsive(@display: block;) { +.img-responsive(@display: block) { display: @display; 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 22820d7151fa155a4e083bf6c940a52e55138735 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 13 Dec 2013 23:06:04 -0800 Subject: Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS --- less/navbar.less | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 51e3df258..3f8698d09 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -161,6 +161,13 @@ text-decoration: none; } + // Prevent Glyphicons from increasing height of navbar + > .glyphicon { + float: left; + margin-top: -2px; + margin-right: 5px; + } + @media (min-width: @grid-float-breakpoint) { .navbar > .container &, .navbar > .container-fluid & { -- cgit v1.2.3 From 914f5e6a1d6faf57988cd26c31200796a4b743a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 11:44:54 -0800 Subject: Fixes #11867: Add `@panel-body-padding` variable --- less/panels.less | 2 +- less/variables.less | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index a6b723c68..ad133ad21 100644 --- a/less/panels.less +++ b/less/panels.less @@ -14,7 +14,7 @@ // Panel contents .panel-body { - padding: 15px; + padding: @panel-body-padding; &:extend(.clearfix all); } diff --git a/less/variables.less b/less/variables.less index 3d7cb660c..15db9538a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -510,8 +510,10 @@ // Panels // ------------------------- @panel-bg: #fff; -@panel-inner-border: #ddd; +@panel-body-padding: 15px; @panel-border-radius: @border-radius-base; + +@panel-inner-border: #ddd; @panel-footer-bg: #f5f5f5; @panel-default-text: @gray-dark; -- cgit v1.2.3 From 11c6ab767cab5384188a301f7c9366b212432e81 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 13:22:56 -0800 Subject: Fixes #10370: Improved and deprecated dropdown menu alignment options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Removes an old pair of selectors that didn’t properly target the right-aligned navbar alignment of dropdown menus. * Deprecates the `.pull-right` alignment in favor of a more specific and unique class name. * Adds `.dropdown-menu-right` as the new alignment class. This is then mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for auto-alignment. * To override that auto-alignment, use `.dropdown-menu-left` as needed. --- less/dropdowns.less | 28 +++++++++++++++++++++++++++- less/navbar.less | 7 ------- 2 files changed, 27 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 4bdc223fc..dde2038e3 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -46,6 +46,8 @@ background-clip: padding-box; // Aligns the dropdown menu to right + // + // Deprecated as of 3.1 in favor of `.dropdown-menu-[dir]` &.pull-right { right: 0; left: auto; @@ -126,6 +128,25 @@ } } +// Menu positioning +// +// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown +// menu with the parent. +.dropdown-menu-right { + left: auto; // Reset the default from `.dropdown-menu` + right: 0; +} +// With v3, we enabled auto-flipping if you have a dropdown within a right +// aligned nav component. To enable the undoing of that, we provide an override +// to restore the default dropdown menu alignment. +// +// This is only for left-aligning a dropdown menu within a `.navbar-right` or +// `.pull-right` nav component. +.dropdown-menu-left { + left: 0; + right: auto; +} + // Dropdown section headers .dropdown-header { display: block; @@ -180,7 +201,12 @@ @media (min-width: @grid-float-breakpoint) { .navbar-right { .dropdown-menu { - .pull-right > .dropdown-menu(); + .dropdown-menu-right(); + } + // Necessary for overrides of the default right aligned menu. + // Will remove come v4 in all likelihood. + .dropdown-menu-left { + .dropdown-menu-left(); } } } diff --git a/less/navbar.less b/less/navbar.less index 3f8698d09..d96f85e30 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -336,13 +336,6 @@ .border-bottom-radius(0); } -// Right aligned menus need alt position -.navbar-nav.pull-right > li > .dropdown-menu, -.navbar-nav > li > .dropdown-menu.pull-right { - left: auto; - right: 0; -} - // Buttons in navbars // -- cgit v1.2.3