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 --- docs/assets/css/bootstrap.css | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2da34b4ad..87602639d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2920,7 +2920,7 @@ table th[class*="span"], background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-image: linear-gradient(top, #0088cc, #0077b3); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } @@ -2934,7 +2934,7 @@ table th[class*="span"], background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-image: linear-gradient(top, #0088cc, #0077b3); background-repeat: repeat-x; outline: 0; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); @@ -3155,7 +3155,7 @@ button.close { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-image: linear-gradient(top, #ffffff, #e6e6e6); background-repeat: repeat-x; border: 1px solid #bbbbbb; *border: 0; @@ -3305,7 +3305,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-image: linear-gradient(top, #0088cc, #0044cc); background-repeat: repeat-x; border-color: #0044cc #0044cc #002a80; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3337,7 +3337,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-image: linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3369,7 +3369,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); + background-image: linear-gradient(top, #ee5f5b, #bd362f); background-repeat: repeat-x; border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3401,7 +3401,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); background-image: -webkit-linear-gradient(top, #62c462, #51a351); background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); + background-image: linear-gradient(top, #62c462, #51a351); background-repeat: repeat-x; border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3433,7 +3433,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); + background-image: linear-gradient(top, #5bc0de, #2f96b4); background-repeat: repeat-x; border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -3465,7 +3465,7 @@ input[type="button"].btn-block { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); background-image: -webkit-linear-gradient(top, #444444, #222222); background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); + background-image: linear-gradient(top, #444444, #222222); background-repeat: repeat-x; border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -4266,7 +4266,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); + background-image: linear-gradient(top, #ffffff, #f2f2f2); background-repeat: repeat-x; border: 1px solid #d4d4d4; -webkit-border-radius: 4px; @@ -4538,7 +4538,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); + background-image: linear-gradient(top, #f2f2f2, #e5e5e5); background-repeat: repeat-x; border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -4673,7 +4673,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); background-image: -webkit-linear-gradient(top, #222222, #111111); background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); + background-image: linear-gradient(top, #222222, #111111); background-repeat: repeat-x; border-color: #252525; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); @@ -4790,7 +4790,7 @@ input[type="submit"].btn.btn-mini { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); background-image: -webkit-linear-gradient(top, #151515, #040404); background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); + background-image: linear-gradient(top, #151515, #040404); background-repeat: repeat-x; border-color: #040404 #040404 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); @@ -5633,7 +5633,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); + background-image: linear-gradient(top, #f5f5f5, #f9f9f9); background-repeat: repeat-x; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -5657,7 +5657,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); background-image: -webkit-linear-gradient(top, #149bdf, #0480be); background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); + background-image: linear-gradient(top, #149bdf, #0480be); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); @@ -5706,7 +5706,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); } @@ -5728,7 +5728,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); background-image: -webkit-linear-gradient(top, #62c462, #57a957); background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); } @@ -5750,7 +5750,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); } @@ -5772,7 +5772,7 @@ a.badge:hover { background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); background-image: -webkit-linear-gradient(top, #fbb450, #f89406); background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-image: linear-gradient(top, #fbb450, #f89406); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); } -- 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 --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87602639d..6d0e3dc07 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3596,15 +3596,15 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn-mini { - font-size: 11px; + font-size: 10.5px; } .btn-group > .btn-small { - font-size: 12px; + font-size: 11.9px; } .btn-group > .btn-large { - font-size: 16px; + font-size: 17.5px; } .btn-group > .btn:first-child { -- cgit v1.2.3 From 942f9c5df4f731720cb28d126e9202ab21c28996 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Nov 2012 00:37:55 -0800 Subject: Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px --- docs/assets/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ff0ea557b..6e9bbb9be 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -867,6 +867,7 @@ form.bs-docs-example { /* When affixed, space properly */ .bs-docs-sidenav { top: 0; + width: 218px; margin-top: 30px; margin-right: 0; } @@ -874,7 +875,7 @@ form.bs-docs-example { /* Tablet to desktop ------------------------- */ -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { /* Remove any padding from the body */ body { padding-top: 0; -- 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 --- docs/assets/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6d0e3dc07..f2cd3d3e9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4619,6 +4619,11 @@ input[type="submit"].btn.btn-mini { border-bottom: 0; } +.navbar .nav li.dropdown > a:hover .caret { + border-top-color: #555555; + border-bottom-color: #555555; +} + .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { @@ -4731,6 +4736,11 @@ input[type="submit"].btn.btn-mini { background-color: #111111; } +.navbar-inverse .nav li.dropdown > a:hover .caret { + border-top-color: #ffffff; + border-bottom-color: #ffffff; +} + .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { border-top-color: #999999; border-bottom-color: #999999; -- 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 --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f2cd3d3e9..ed58d7aaf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3238,7 +3238,7 @@ button.close { .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 2px; + margin-top: 4px; } .btn-small { -- 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 --- docs/assets/css/bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9eee6fa0c..9c343dc17 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3803,7 +3803,6 @@ input[type="submit"].btn.btn-mini { .alert { padding: 8px 35px 8px 14px; margin-bottom: 20px; - color: #c09853; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; @@ -3812,6 +3811,11 @@ input[type="submit"].btn.btn-mini { border-radius: 4px; } +.alert, +.alert h4 { + color: #c09853; +} + .alert h4 { margin: 0; } -- 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 --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9c343dc17..b25535eb6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3573,9 +3573,9 @@ input[type="submit"].btn.btn-mini { font-size: 0; } -.btn-toolbar .btn + .btn, -.btn-toolbar .btn-group + .btn, -.btn-toolbar .btn + .btn-group { +.btn-toolbar > .btn + .btn, +.btn-toolbar > .btn-group + .btn, +.btn-toolbar > .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 --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b25535eb6..8bdd175d6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3591,7 +3591,8 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn, -.btn-group > .dropdown-menu { +.btn-group > .dropdown-menu, +.btn-group > .popover { font-size: 14px; } -- 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 --- docs/assets/css/bootstrap.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8bdd175d6..1088df966 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5912,7 +5912,7 @@ a.badge:hover { overflow: hidden; } -.carousel .item { +.carousel > .item { position: relative; display: none; -webkit-transition: 0.6s ease-in-out left; @@ -5921,46 +5921,46 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel .item > img { +.carousel > .item > img { display: block; line-height: 1; } -.carousel .active, -.carousel .next, -.carousel .prev { +.carousel > .active, +.carousel > .next, +.carousel > .prev { display: block; } -.carousel .active { +.carousel > .active { left: 0; } -.carousel .next, -.carousel .prev { +.carousel > .next, +.carousel > .prev { position: absolute; top: 0; width: 100%; } -.carousel .next { +.carousel > .next { left: 100%; } -.carousel .prev { +.carousel > .prev { left: -100%; } -.carousel .next.left, -.carousel .prev.right { +.carousel > .next.left, +.carousel > .prev.right { left: 0; } -.carousel .active.left { +.carousel > .active.left { left: -100%; } -.carousel .active.right { +.carousel > .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 --- docs/assets/css/bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1088df966..464771124 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3763,39 +3763,39 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } -.btn-group-vertical .btn { +.btn-group-vertical > .btn { display: block; float: none; - width: 100%; + max-width: 100%; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.btn-group-vertical .btn + .btn { +.btn-group-vertical > .btn + .btn { margin-top: -1px; margin-left: 0; } -.btn-group-vertical .btn:first-child { +.btn-group-vertical > .btn:first-child { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.btn-group-vertical .btn:last-child { +.btn-group-vertical > .btn:last-child { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.btn-group-vertical .btn-large:first-child { +.btn-group-vertical > .btn-large:first-child { -webkit-border-radius: 6px 6px 0 0; -moz-border-radius: 6px 6px 0 0; border-radius: 6px 6px 0 0; } -.btn-group-vertical .btn-large:last-child { +.btn-group-vertical > .btn-large:last-child { -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; -- 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 --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 464771124..71b486188 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2950,6 +2950,7 @@ table th[class*="span"], cursor: default; background-color: transparent; background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); } .open { -- 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 --- docs/assets/css/bootstrap.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71b486188..225f8739d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5913,7 +5913,7 @@ a.badge:hover { overflow: hidden; } -.carousel > .item { +.carousel-inner > .item { position: relative; display: none; -webkit-transition: 0.6s ease-in-out left; @@ -5922,46 +5922,46 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel > .item > img { +.carousel-inner > .item > img { display: block; line-height: 1; } -.carousel > .active, -.carousel > .next, -.carousel > .prev { +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { display: block; } -.carousel > .active { +.carousel-inner > .active { left: 0; } -.carousel > .next, -.carousel > .prev { +.carousel-inner > .next, +.carousel-inner > .prev { position: absolute; top: 0; width: 100%; } -.carousel > .next { +.carousel-inner > .next { left: 100%; } -.carousel > .prev { +.carousel-inner > .prev { left: -100%; } -.carousel > .next.left, -.carousel > .prev.right { +.carousel-inner > .next.left, +.carousel-inner > .prev.right { left: 0; } -.carousel > .active.left { +.carousel-inner > .active.left { left: -100%; } -.carousel > .active.right { +.carousel-inner > .active.right { left: 100%; } -- cgit v1.2.3 From ddd154481bc9341668f236ca071c936803e43f7a Mon Sep 17 00:00:00 2001 From: Zulfiqar Ali Date: Thu, 29 Nov 2012 17:40:23 +0800 Subject: added compiled css file --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2da34b4ad..30b440737 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1957,7 +1957,8 @@ legend + .control-group { .form-horizontal input + .help-block, .form-horizontal select + .help-block, -.form-horizontal textarea + .help-block { +.form-horizontal textarea + .help-block, +.form-horizontal span.uneditable-input + .help-block { margin-top: 10px; } -- cgit v1.2.3 From 322a56354fdc576492769c631cb7af51edcb7a68 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Nov 2012 23:27:20 -0800 Subject: run make with nav img fix --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 225f8739d..e6003ee14 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3877,6 +3877,10 @@ input[type="submit"].btn.btn-mini { background-color: #eeeeee; } +.nav > li > a > img { + max-width: none; +} + .nav > .pull-right { float: right; } -- 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 --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 79a7a1520..50453131c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1958,7 +1958,7 @@ legend + .control-group { .form-horizontal input + .help-block, .form-horizontal select + .help-block, .form-horizontal textarea + .help-block, -.form-horizontal span.uneditable-input + .help-block { +.form-horizontal .uneditable-input + .help-block { margin-top: 10px; } -- 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 --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 50453131c..732724f13 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1958,7 +1958,9 @@ legend + .control-group { .form-horizontal input + .help-block, .form-horizontal select + .help-block, .form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block { +.form-horizontal .uneditable-input + .help-block, +.form-horizontal .input-prepend + .help-block, +.form-horizontal .input-append + .help-block { margin-top: 10px; } -- cgit v1.2.3