From 5702e1be6e9b0b813520c4a0ff2faf427429b720 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Nov 2012 01:13:52 -0800 Subject: [PATCH 1/8] widths on github buttons --- docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 3220461972..94a18c68a4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -100,7 +100,7 @@
  • - +
  • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 4f267675cb..19861b396c 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -29,7 +29,7 @@
  • - +
  • From 88c2497368f601e87ba2c1ec3b2e215c1f038975 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Nov 2012 01:16:27 -0800 Subject: [PATCH 2/8] Fixes #5912: User correct selector for form field states. Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here. --- docs/assets/css/bootstrap.css | 8 ++++---- less/mixins.less | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3490f856d..b051c77ccd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1432,7 +1432,7 @@ input[type="checkbox"][readonly] { background-color: transparent; } -.control-group.warning > label, +.control-group.warning .control-label, .control-group.warning .help-block, .control-group.warning .help-inline { color: #c09853; @@ -1471,7 +1471,7 @@ input[type="checkbox"][readonly] { border-color: #c09853; } -.control-group.error > label, +.control-group.error .control-label, .control-group.error .help-block, .control-group.error .help-inline { color: #b94a48; @@ -1510,7 +1510,7 @@ input[type="checkbox"][readonly] { border-color: #b94a48; } -.control-group.success > label, +.control-group.success .control-label, .control-group.success .help-block, .control-group.success .help-inline { color: #468847; @@ -1549,7 +1549,7 @@ input[type="checkbox"][readonly] { border-color: #468847; } -.control-group.info > label, +.control-group.info .control-label, .control-group.info .help-block, .control-group.info .help-inline { color: #3a87ad; diff --git a/less/mixins.less b/less/mixins.less index 98aa2b8a58..b734bab2dc 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -163,7 +163,7 @@ // Mixin for form field states .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { // Set the text color - > label, + .control-label, .help-block, .help-inline { color: @textColor; From a367fd4938a50c99cb8e45e048a20d0a6459a786 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Nov 2012 01:19:15 -0800 Subject: [PATCH 3/8] Fixes #5925: Adjust top margin of input group in navbar --- docs/assets/css/bootstrap.css | 2 +- less/navbar.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b051c77ccd..2da34b4add 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4384,7 +4384,7 @@ input[type="submit"].btn.btn-mini { .navbar-form .input-append, .navbar-form .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; } diff --git a/less/navbar.less b/less/navbar.less index 3cc0ef2031..2b186f10e1 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -123,7 +123,7 @@ } .input-append, .input-prepend { - margin-top: 6px; + margin-top: 5px; white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left input { margin-top: 0; // remove the margin on top since it's on the parent From a10d68f291d1f0a0f47f3123d213fb686229692d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Nov 2012 12:30:35 -0800 Subject: [PATCH 4/8] Fixes #5937: Border radius vars in button groups --- less/button-groups.less | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/less/button-groups.less b/less/button-groups.less index ca8a770d41..8c3b9ff045 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -58,25 +58,25 @@ // 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 .btn-group > .btn:first-child { margin-left: 0; - .border-top-left-radius(4px); - .border-bottom-left-radius(4px); + .border-top-left-radius(@baseBorderRadius); + .border-bottom-left-radius(@baseBorderRadius); } // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - .border-top-right-radius(4px); - .border-bottom-right-radius(4px); + .border-top-right-radius(@baseBorderRadius); + .border-bottom-right-radius(@baseBorderRadius); } // Reset corners for large buttons .btn-group > .btn.large:first-child { margin-left: 0; - .border-top-left-radius(6px); - .border-bottom-left-radius(6px); + .border-top-left-radius(@borderRadiusLarge); + .border-bottom-left-radius(@borderRadiusLarge); } .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { - .border-top-right-radius(6px); - .border-bottom-right-radius(6px); + .border-top-right-radius(@borderRadiusLarge); + .border-bottom-right-radius(@borderRadiusLarge); } // On hover/focus/active, bring the proper btn to front @@ -213,14 +213,14 @@ margin-top: -1px; } .btn-group-vertical .btn:first-child { - .border-radius(4px 4px 0 0); + .border-radius(@baseBorderRadius @baseBorderRadius 0 0); } .btn-group-vertical .btn:last-child { - .border-radius(0 0 4px 4px); + .border-radius(0 0 @baseBorderRadius @baseBorderRadius); } .btn-group-vertical .btn-large:first-child { - .border-radius(6px 6px 0 0); + .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); } .btn-group-vertical .btn-large:last-child { - .border-radius(0 0 6px 6px); + .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); } From ace6dc0c25270a7ffa974f45c2d41d9895f7eb94 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Mon, 19 Nov 2012 16:49:47 -0500 Subject: [PATCH 5/8] Fix typo in reset.less --- less/reset.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/reset.less b/less/reset.less index aec4687638..6ec3f5fd7e 100644 --- a/less/reset.less +++ b/less/reset.less @@ -1,5 +1,5 @@ // -// Modals +// Reset CSS // Adapted from http://github.com/necolas/normalize.css // -------------------------------------------------- From 8df2811d4981f5b3cc9291ac1c8c7fddb41427c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Nov 2012 23:29:20 -0800 Subject: [PATCH 6/8] Simpler footer for docs * Remove back to top link (ya'll are lazy :P) * Center text * Decrease vertical padding --- docs/assets/css/docs.css | 7 ++----- docs/base-css.html | 1 - docs/components.html | 1 - docs/customize.html | 1 - docs/extend.html | 1 - docs/getting-started.html | 1 - docs/index.html | 1 - docs/javascript.html | 1 - docs/scaffolding.html | 1 - docs/templates/layout.mustache | 1 - 10 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 119a30528e..e6e7a7c997 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -299,7 +299,8 @@ only screen and ( -o-min-device-pixel-ratio: 2/1) { -------------------------------------------------- */ .footer { - padding: 70px 0; + text-align: center; + padding: 30px 0; margin-top: 70px; border-top: 1px solid #e5e5e5; background-color: #f5f5f5; @@ -1024,8 +1025,4 @@ form.bs-docs-example { padding-top: 20px; padding-bottom: 20px; } - /* Unfloat the back to top in footer to prevent odd text wrapping */ - .footer .pull-right { - float: none; - } } diff --git a/docs/base-css.html b/docs/base-css.html index fa41612d82..fee6fc8970 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2145,7 +2145,6 @@ For example, <code><section></code> should be wrapped as inlin ================================================== -->