From 46d38b10b8823d2a13329edb939e4811636c9aba Mon Sep 17 00:00:00 2001 From: David Date: Fri, 2 Nov 2012 15:04:34 +0100 Subject: Prevent IE8 from misplacing imgs Fixed imgs in a nav that were misplaced on IE8. --- less/navs.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 1944f8441..4cffa8a68 100644 --- a/less/navs.less +++ b/less/navs.less @@ -21,6 +21,11 @@ background-color: @grayLighter; } +// Prevent IE8 from misplacing imgs +.nav > li > a > img { + max-width: none; +} + // Redeclare pull classes because of specifity .nav > .pull-right { float: right; -- cgit v1.2.3 From 701f871e7db41a8c427b84fb045f89d1656f758d Mon Sep 17 00:00:00 2001 From: Zulfiqar Ali Date: Tue, 27 Nov 2012 07:30:54 +0800 Subject: help-block margin-top should also apply after a span.input --- less/forms.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 172ed027d..6a8edfb67 100644 --- a/less/forms.less +++ b/less/forms.less @@ -672,7 +672,8 @@ legend + .control-group { // And apply it only to .help-block instances that follow a form control input, select, - textarea { + textarea, + span.input { + .help-block { margin-top: @baseLineHeight / 2; } -- cgit v1.2.3 From dc10e6bbf8d051d763ec0c14dd8f5307ac356654 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:19:35 -0800 Subject: Fixes #5935: Updated vertical gradient 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 b734bab2d..109aa61e6 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -425,7 +425,7 @@ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 + background-image: linear-gradient(top, @startColor, @endColor); // Standard, IE10 background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down } -- cgit v1.2.3 From 02097700e8ab24506dda5332778398119dc8b728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:31:52 -0800 Subject: Fixes #6035: use font-size vars in button groups --- less/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 8c3b9ff04..002a3ff07 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -46,13 +46,13 @@ // Reset fonts for other sizes .btn-group > .btn-mini { - font-size: 11px; + font-size: @fontSizeMini; } .btn-group > .btn-small { - font-size: 12px; + font-size: @fontSizeSmall; } .btn-group > .btn-large { - font-size: 16px; + font-size: @fontSizeLarge; } // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -- cgit v1.2.3 From 74f51105e980176caddda430959ffc536b3610ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:42:17 -0800 Subject: Fixes #6010: Navbar dropdown caret should match link hover color --- less/navbar.less | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 2b186f10e..b292b72bb 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -245,6 +245,7 @@ } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; + } // Hover @@ -334,6 +335,12 @@ } } +// Caret should match text color on hover +.navbar .nav li.dropdown > a:hover .caret { + border-top-color: @navbarLinkColorActive; + border-bottom-color: @navbarLinkColorActive; +} + // Remove background color from open dropdown .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, @@ -436,6 +443,10 @@ background-color: @navbarInverseLinkBackgroundActive; color: @navbarInverseLinkColorActive; } + .nav li.dropdown > a:hover .caret { + border-top-color: @navbarInverseLinkColorActive; + border-bottom-color: @navbarInverseLinkColorActive; + } .nav li.dropdown > .dropdown-toggle .caret { border-top-color: @navbarInverseLinkColor; border-bottom-color: @navbarInverseLinkColor; -- cgit v1.2.3 From fda5bb135e0a91f335f1e3bd4e5313070f6e0708 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:46:09 -0800 Subject: Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons --- less/buttons.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index e0afbed96..78371c6ff 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -73,7 +73,7 @@ } .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 2px; + margin-top: 4px; } // Small -- cgit v1.2.3 From 693fd0db2a91ce6c8bc5ac354a6c8d97552013b7 Mon Sep 17 00:00:00 2001 From: Zulfiqar Ali Date: Wed, 28 Nov 2012 16:47:59 +0800 Subject: help-block margin-top should also apply after a span.uneditable-input --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 6a8edfb67..4e7617365 100644 --- a/less/forms.less +++ b/less/forms.less @@ -673,7 +673,7 @@ legend + .control-group { input, select, textarea, - span.input { + span.uneditable-input { + .help-block { margin-top: @baseLineHeight / 2; } -- cgit v1.2.3 From bfc97fdaf6cefceb4091e745977b5bac2ffda1c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 01:38:21 -0800 Subject: Fixes #4852: IE8 popover carets fixed * IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles. * .arrow is the gray border/background, .arrow:after is now the white inner arrow * Added a hex IE8 fallback to ensure the arrow shows for Date: Wed, 28 Nov 2012 01:48:34 -0800 Subject: Fixes #5940: Prevent @headingsColor from changing alert colors --- less/alerts.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index 9abb226d6..37e50f903 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -13,6 +13,10 @@ background-color: @warningBackground; border: 1px solid @warningBorder; .border-radius(@baseBorderRadius); +} +.alert, +.alert h4 { + // Specified for the h4 to prevent conflicts of changing @headingsColor color: @warningText; } .alert h4 { -- cgit v1.2.3 From 783120dffaab396955b0ad237bf3a82a73a6e1dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 01:51:04 -0800 Subject: Fixes #5927: Scope button group 5px button left margin to immediate children --- less/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 002a3ff07..2963c75de 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -24,9 +24,9 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn + .btn, - .btn-group + .btn, - .btn + .btn-group { + > .btn + .btn, + > .btn-group + .btn, + > .btn + .btn-group { margin-left: 5px; } } -- cgit v1.2.3 From bf3a5df371dc58cc4030bf0177b2be964054d4d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:10:23 -0800 Subject: Fixes #5930: redeclare font-size for popoves in btn-groups --- 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 2963c75de..c830852b2 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -40,7 +40,8 @@ margin-left: -1px; } .btn-group > .btn, -.btn-group > .dropdown-menu { +.btn-group > .dropdown-menu, +.btn-group > .popover { font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack } -- cgit v1.2.3 From 296b8384050746b11c02bde2e68954981c3ec5fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:17:50 -0800 Subject: Fixes #5616: scope carousel state classes to immediate children only --- less/carousel.less | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 33f98ac4d..072884d4f 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -17,48 +17,48 @@ .carousel { - .item { + > .item { display: none; position: relative; .transition(.6s ease-in-out left); } // Account for jankitude on images - .item > img { + > .item > img { display: block; line-height: 1; } - .active, - .next, - .prev { display: block; } + > .active, + > .next, + > .prev { display: block; } - .active { + > .active { left: 0; } - .next, - .prev { + > .next, + > .prev { position: absolute; top: 0; width: 100%; } - .next { + > .next { left: 100%; } - .prev { + > .prev { left: -100%; } - .next.left, - .prev.right { + > .next.left, + > .prev.right { left: 0; } - .active.left { + > .active.left { left: -100%; } - .active.right { + > .active.right { left: 100%; } -- cgit v1.2.3 From 8fb36cb3dd60c34afdbb8e46cc457b2e8795b3c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:21:34 -0800 Subject: Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only --- less/button-groups.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index c830852b2..d6054c808 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -203,25 +203,25 @@ display: inline-block; // makes buttons only take up the width they need .ie7-inline-block(); } -.btn-group-vertical .btn { +.btn-group-vertical > .btn { display: block; float: none; - width: 100%; + max-width: 100%; .border-radius(0); } -.btn-group-vertical .btn + .btn { +.btn-group-vertical > .btn + .btn { margin-left: 0; margin-top: -1px; } -.btn-group-vertical .btn:first-child { +.btn-group-vertical > .btn:first-child { .border-radius(@baseBorderRadius @baseBorderRadius 0 0); } -.btn-group-vertical .btn:last-child { +.btn-group-vertical > .btn:last-child { .border-radius(0 0 @baseBorderRadius @baseBorderRadius); } -.btn-group-vertical .btn-large:first-child { +.btn-group-vertical > .btn-large:first-child { .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); } -.btn-group-vertical .btn-large:last-child { +.btn-group-vertical > .btn-large:last-child { .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); } -- cgit v1.2.3 From f1349a245096da5e29fd83fa99346e5e40faf077 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 02:22:37 -0800 Subject: Fixes #5533: Remove filter gradient from disabled links on dropdowns --- less/dropdowns.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 90f3741e8..484bd3dda 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -115,6 +115,7 @@ text-decoration: none; background-color: transparent; background-image: none; // Remove CSS gradient + .reset-filter(); cursor: default; } -- cgit v1.2.3 From 78390d12afe2bc6f2b15f21f8ba87f8ba69738c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 15:40:51 -0800 Subject: Fix the carousel after we scoped selectors --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/carousel.less b/less/carousel.less index 072884d4f..2dc050603 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -15,7 +15,7 @@ position: relative; } -.carousel { +.carousel-inner { > .item { display: none; -- cgit v1.2.3 From acc037de15665614e61563903dbcdc3e4115eea6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 20:59:14 -0800 Subject: add holder and replace placehold.it --- less/tests/css-tests.html | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'less') diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index c0cb1485e..f4df422aa 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -107,13 +107,13 @@
- +
- +
- +
@@ -121,13 +121,13 @@
- +
- +
- +
@@ -996,16 +996,16 @@

Default thumbnails (no grid sizing)

  • - +
  • - +
  • - +
  • - +
@@ -1014,17 +1014,17 @@ @@ -1034,17 +1034,17 @@ @@ -1055,17 +1055,17 @@ -- cgit v1.2.3 From 721b56830358f283caf1e7887e3308a79e98b825 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 23:27:09 -0800 Subject: update comment --- less/navs.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 4cffa8a68..2d08e79da 100644 --- a/less/navs.less +++ b/less/navs.less @@ -22,6 +22,7 @@ } // Prevent IE8 from misplacing imgs +// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989 .nav > li > a > img { max-width: none; } -- cgit v1.2.3 From f087b3428c6b48ee34b8da3991fc692e04719898 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 23:33:09 -0800 Subject: remove element from selector --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 4e7617365..1e1a04bdf 100644 --- a/less/forms.less +++ b/less/forms.less @@ -673,7 +673,7 @@ legend + .control-group { input, select, textarea, - span.uneditable-input { + .uneditable-input { + .help-block { margin-top: @baseLineHeight / 2; } -- cgit v1.2.3 From bca3ff4ed6f42701ceae1405f518c35ec8c623be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 23:39:33 -0800 Subject: Fixes #5853: Maintain 10px margin above help block when following input groups --- less/forms.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 1e1a04bdf..2dff22919 100644 --- a/less/forms.less +++ b/less/forms.less @@ -673,7 +673,9 @@ legend + .control-group { input, select, textarea, - .uneditable-input { + .uneditable-input, + .input-prepend, + .input-append { + .help-block { margin-top: @baseLineHeight / 2; } -- cgit v1.2.3