From d96047f45f4e0a0618903662f41a5b2f184589cf Mon Sep 17 00:00:00 2001 From: kylase Date: Tue, 14 Aug 2012 11:57:13 +0800 Subject: [PATCH 01/18] Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less --- docs/customize.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/customize.html b/docs/customize.html index daf1606d12..d40ffea2dc 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -294,11 +294,11 @@ - + - + From d684607976578f15aa2981cc235a1964f47ff7a9 Mon Sep 17 00:00:00 2001 From: kylase Date: Tue, 14 Aug 2012 13:51:50 +0800 Subject: [PATCH 02/18] Amend placeholders values --- docs/templates/pages/customize.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index 53b1f98ea7..5b58ffa8f0 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -223,11 +223,11 @@ - + - + From 2df0a0fdeb2ceec2cb193dee98d97cfb9c5e1b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Tue, 14 Aug 2012 13:58:12 +0200 Subject: [PATCH 03/18] now with 13 custom jquery plugins --- docs/assets/css/bootstrap.css | 1 + docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6abfad0811..3fd9070be9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1042,6 +1042,7 @@ input[type="file"] { select { width: 220px; + background-color: #ffffff; border: 1px solid #bbb; } diff --git a/docs/javascript.html b/docs/javascript.html index f9ede2f2b9..05466a5105 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -74,7 +74,7 @@

JavaScript for Bootstrap

-

Bring Bootstrap's components to life—now with 12 custom jQuery plugins. +

Bring Bootstrap's components to life—now with 13 custom jQuery plugins.

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 296ccef81c..d6d49a7ecc 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -3,7 +3,7 @@

{{_i}}JavaScript for Bootstrap{{/i}}

-

{{_i}}Bring Bootstrap's components to life—now with 12 custom jQuery plugins.{{/i}} +

{{_i}}Bring Bootstrap's components to life—now with 13 custom jQuery plugins.{{/i}}

From f6ac2979039ea151384781301f7020a65a9294be Mon Sep 17 00:00:00 2001 From: Melvin Date: Tue, 14 Aug 2012 21:06:35 +0300 Subject: [PATCH 04/18] Fix .thumbnail line-height --- less/thumbnails.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/thumbnails.less b/less/thumbnails.less index f229a2dada..99b09dd86b 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -27,7 +27,7 @@ .thumbnail { display: block; padding: 4px; - line-height: 20px; + line-height: @baseLineHeight; border: 1px solid #ddd; .border-radius(4px); .box-shadow(0 1px 3px rgba(0,0,0,.055)); From 2a6deb92b1786d572ed23347e486043e0df63547 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:29:31 -0700 Subject: [PATCH 05/18] fixes #4395: scope dropdown menu caret in navbar to first level dropdown only --- docs/assets/css/bootstrap.css | 8 ++++---- less/navbar.less | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3fd9070be9..c7fbc3e965 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4285,7 +4285,7 @@ input[type="submit"].btn.btn-mini { margin-top: 3px; } -.navbar .dropdown-menu:before { +.navbar .nav > li > .dropdown-menu:before { position: absolute; top: -7px; left: 9px; @@ -4297,7 +4297,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar .dropdown-menu:after { +.navbar .nav > li > .dropdown-menu:after { position: absolute; top: -6px; left: 10px; @@ -4308,7 +4308,7 @@ input[type="submit"].btn.btn-mini { content: ''; } -.navbar-fixed-bottom .dropdown-menu:before { +.navbar-fixed-bottom .nav > li > .dropdown-menu:before { top: auto; bottom: -7px; border-top: 7px solid #ccc; @@ -4316,7 +4316,7 @@ input[type="submit"].btn.btn-mini { border-top-color: rgba(0, 0, 0, 0.2); } -.navbar-fixed-bottom .dropdown-menu:after { +.navbar-fixed-bottom .nav > li > .dropdown-menu:after { top: auto; bottom: -6px; border-top: 6px solid #ffffff; diff --git a/less/navbar.less b/less/navbar.less index 4306047c70..423ff4c728 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -266,7 +266,7 @@ // -------------- // Menu position and menu carets -.navbar .dropdown-menu { +.navbar .nav > li > .dropdown-menu { &:before { content: ''; display: inline-block; @@ -290,7 +290,7 @@ } } // Menu position and menu caret support for dropups via extra dropup class -.navbar-fixed-bottom .dropdown-menu { +.navbar-fixed-bottom .nav > li > .dropdown-menu { &:before { border-top: 7px solid #ccc; border-top-color: @dropdownBorder; From 0b0d7f104c08307e0a6f275ccaa60db580d6f728 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:32:03 -0700 Subject: [PATCH 06/18] fixes #4396: pull right dropdown menus no longer overlaid by submenus --- docs/assets/css/bootstrap.css | 11 +++++++++++ less/navbar.less | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c7fbc3e965..ec63378c58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4360,6 +4360,17 @@ input[type="submit"].btn.btn-mini { left: auto; } +.navbar .pull-right .dropdown-menu .dropdown-menu, +.navbar .dropdown-menu.pull-right .dropdown-menu { + right: 100%; + left: auto; + margin-right: -1px; + margin-left: 0; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + .navbar-inverse { color: #999999; } diff --git a/less/navbar.less b/less/navbar.less index 423ff4c728..435bf2f286 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -337,6 +337,13 @@ left: auto; right: 13px; } + .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + .border-radius(6px 0 6px 6px); + } } From dbcd87331d8a84fe5f65da0420409e859effebf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:51:33 -0700 Subject: [PATCH 07/18] fixes #4371: scope hovers on table rows to tbody --- docs/assets/css/bootstrap.css | 4 ++-- less/tables.less | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec63378c58..d6cfbe0998 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1863,8 +1863,8 @@ table { background-color: #f9f9f9; } -.table-hover tr:hover td, -.table-hover tr:hover th { +.table-hover tbody tr:hover td, +.table-hover tbody tr:hover th { background-color: #f5f5f5; } diff --git a/less/tables.less b/less/tables.less index 3d571fe540..853b97e390 100644 --- a/less/tables.less +++ b/less/tables.less @@ -159,9 +159,11 @@ table { // ------------ // Placed here since it has to come after the potential zebra striping .table-hover { - tr:hover td, - tr:hover th { - background-color: @tableBackgroundHover; + tbody { + tr:hover td, + tr:hover th { + background-color: @tableBackgroundHover; + } } } From 50df524ba1b504e069e69e6f317184357f397cd0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:53:45 -0700 Subject: [PATCH 08/18] remove borders entirely from fixed navbars --- docs/assets/css/bootstrap.css | 7 +++++-- less/navbar.less | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6cfbe0998..fb69a19ba6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4146,6 +4146,11 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; } +.navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner { + border: 0; +} + .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { padding-right: 0; @@ -4165,7 +4170,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner { - border-width: 0 0 1px; -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); @@ -4176,7 +4180,6 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); diff --git a/less/navbar.less b/less/navbar.less index 435bf2f286..4439dcde31 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -153,6 +153,9 @@ left: 0; z-index: @zindexFixedNavbar; margin-bottom: 0; // remove 18px margin for static navbar + .navbar-inner { + border: 0; + } } .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner { @@ -161,6 +164,7 @@ .border-radius(0); } +// Reset container width .navbar-fixed-top .container, .navbar-fixed-bottom .container { #grid > .core > .span(@gridColumns); @@ -170,7 +174,6 @@ .navbar-fixed-top { top: 0; .navbar-inner { - border-width: 0 0 1px; .box-shadow(0 1px 10px rgba(0,0,0,.1)); } } @@ -179,7 +182,6 @@ .navbar-fixed-bottom { bottom: 0; .navbar-inner { - border-width: 1px 0 0; .box-shadow(0 -1px 10px rgba(0,0,0,.1)); } } From 5144c77b272e12a48913faa0b7d1e54eccd2e638 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 14:57:49 -0700 Subject: [PATCH 09/18] fixes #4358: make select elements 30px tall to match inputs --- docs/assets/css/bootstrap.css | 5 +++-- less/forms.less | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fb69a19ba6..f22d2824d7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,6 +943,7 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; + vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1031,13 +1032,13 @@ input[type="checkbox"] { select, input[type="file"] { - height: 28px; + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; + line-height: 30px; } select { diff --git a/less/forms.less b/less/forms.less index 0b3f10cb06..852f0bb6be 100644 --- a/less/forms.less +++ b/less/forms.less @@ -151,9 +151,9 @@ input[type="checkbox"] { // Set the height of select and file controls to match text inputs select, input[type="file"] { - height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; + line-height: 30px; } // Make select elements obey height by applying a border From a80dafbb18bc689abcfe45cd4aec570e7790b171 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:00:22 -0700 Subject: [PATCH 10/18] fix width of star github btn in docs --- docs/assets/css/bootstrap.css | 1 - docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f22d2824d7..5dee1cf355 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,7 +943,6 @@ input[type="color"], font-size: 14px; line-height: 20px; color: #555555; - vertical-align: middle; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/docs/index.html b/docs/index.html index bd798aae0e..3233287ed6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -86,7 +86,7 @@
  • - +
  • diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index d8d1a2064e..b3af8b6615 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -15,7 +15,7 @@
    • - +
    • From 41093a328edd8b49f68bc1f817506ada11b568ef Mon Sep 17 00:00:00 2001 From: Mickael Perraud Date: Wed, 15 Aug 2012 00:11:57 +0200 Subject: [PATCH 11/18] Center text in navbar with change to @baseLineHeight (18 -> 20px) --- less/navbar.less | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/less/navbar.less b/less/navbar.less index 4306047c70..4599d808d3 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -47,9 +47,7 @@ float: left; display: block; // Vertically center the text given @navbarHeight - @elementHeight: 20px; - @heightDifference: @navbarHeight - @elementHeight; - padding: ((@heightDifference / 2) - 2) 20px ((@heightDifference / 2) + 2); + padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2); margin-left: -20px; // negative indent to left-align the text down the page font-size: 20px; font-weight: 200; @@ -207,8 +205,7 @@ .navbar .nav > li > a { float: none; // Vertically center the text given @navbarHeight - @elementHeight: 20px; - padding: ((@navbarHeight - @elementHeight) / 2) 15px ((@navbarHeight - @elementHeight) / 2); + padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2); color: @navbarLinkColor; text-decoration: none; text-shadow: 0 1px 0 @navbarBackgroundHighlight; From b14d946afbe1844ef026a120ee82bf1f2c3ef348 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:12:22 -0700 Subject: [PATCH 12/18] add animation to docs download btn for firefox --- docs/assets/css/docs.css | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 684e9529ba..e58093e1a8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -133,9 +133,14 @@ hr.soften { /* Download button */ @-webkit-keyframes downloadButton { - from { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } - 50% { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); } - to { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } + from { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } + 50% { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); } + to { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } +} +@-moz-keyframes downloadButton { + from { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } + 50% { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); } + to { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } } .masthead .btn { padding: 14px 24px; @@ -150,8 +155,11 @@ hr.soften { -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); -webkit-animation-name: downloadButton; + -moz-animation-name: downloadButton; -webkit-animation-duration: 1.5s; + -moz-animation-duration: 1.5s; -webkit-animation-iteration-count: infinite; + -moz-animation-iteration-count: infinite; -webkit-transition: none; -moz-transition: none; transition: none; From 780636d955d5c121133de526ba72c1874f7c0337 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:29:47 -0700 Subject: [PATCH 13/18] fixes #3674: checkbox vertical alignment in IE9 --- docs/assets/css/bootstrap.css | 3 +-- less/forms.less | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5dee1cf355..7dd417c68e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1013,9 +1013,8 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { margin: 4px 0; + margin-top: 1px \9; *margin-top: 0; - /* IE7 */ - line-height: normal; cursor: pointer; } diff --git a/less/forms.less b/less/forms.less index 852f0bb6be..490b6bb91f 100644 --- a/less/forms.less +++ b/less/forms.less @@ -134,6 +134,7 @@ input[type="radio"], input[type="checkbox"] { margin: 4px 0; *margin-top: 0; /* IE7 */ + margin-top: 1px \9; /* IE8-9 */ line-height: normal; cursor: pointer; } From f933a41c7bb71e58a4c151389748b92c8a204a27 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:34:10 -0700 Subject: [PATCH 14/18] remove bottom margin on radios and checkboxes --- docs/assets/css/bootstrap.css | 2 +- less/forms.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7dd417c68e..8e7abe9f3e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1012,7 +1012,7 @@ input[type="color"]:focus, input[type="radio"], input[type="checkbox"] { - margin: 4px 0; + margin: 4px 0 0; margin-top: 1px \9; *margin-top: 0; line-height: normal; diff --git a/less/forms.less b/less/forms.less index 490b6bb91f..02ea7a518d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -132,7 +132,7 @@ input[type="color"], // Position radios and checkboxes better input[type="radio"], input[type="checkbox"] { - margin: 4px 0; + margin: 4px 0 0; *margin-top: 0; /* IE7 */ margin-top: 1px \9; /* IE8-9 */ line-height: normal; From f3479a39537b7b10bf66846c11d500f3364af88a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 15:44:25 -0700 Subject: [PATCH 15/18] compensate for ie7 button padding with no borders, fix indentation --- docs/assets/css/bootstrap.css | 4 ++-- docs/base-css.html | 2 +- docs/templates/pages/base-css.mustache | 2 +- less/buttons.less | 5 +++-- less/mixins.less | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8e7abe9f3e..a70f305a39 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3253,8 +3253,8 @@ button.close { button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; } button.btn::-moz-focus-inner, diff --git a/docs/base-css.html b/docs/base-css.html index cd550adc38..56f6bde951 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1257,7 +1257,7 @@ For example, <code>section</code> should be wrapped as inline. Some value here 
      -  <span class="input-xlarge uneditable-input">Some value here</span>
+<span class="input-xlarge uneditable-input">Some value here</span>

      Form actions

      diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index b0fe47c551..9f96cc6345 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1194,7 +1194,7 @@ Some value here 
      -  <span class="input-xlarge uneditable-input">Some value here</span>
+<span class="input-xlarge uneditable-input">Some value here</span>

      {{_i}}Form actions{{/i}}

      diff --git a/less/buttons.less b/less/buttons.less index f3cb1bdef8..a1d8989b64 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -170,8 +170,9 @@ input[type="submit"].btn { } // IE7 has some default padding on button controls - *padding-top: 2px; - *padding-bottom: 2px; + *padding-top: 3px; + *padding-bottom: 3px; + &.btn-large { *padding-top: 7px; *padding-bottom: 7px; diff --git a/less/mixins.less b/less/mixins.less index 1b2f0bcfb7..b1b8ae80ad 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -605,7 +605,7 @@ .offset (@columns) { margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2); - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); + *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); } .offsetFirstChild (@columns) { From 9c72246d491fa942635a27ee0047e473f4df05cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:24:58 -0700 Subject: [PATCH 16/18] navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 --- docs/assets/css/bootstrap-responsive.css | 8 ++++---- docs/assets/css/bootstrap.css | 21 +++++++++++---------- docs/examples/hero.html | 12 ++++++++++++ less/component-animations.less | 1 + less/mixins.less | 3 ++- less/navbar.less | 4 ++-- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d5b7e3c4e0..56951cfbe5 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -34,7 +34,7 @@ .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -203,7 +203,7 @@ display: block; float: left; width: 100%; - min-height: 28px; + min-height: 30px; margin-left: 2.564102564102564%; *margin-left: 2.5109110747408616%; -webkit-box-sizing: border-box; @@ -548,7 +548,7 @@ display: block; float: left; width: 100%; - min-height: 28px; + min-height: 30px; margin-left: 2.7624309392265194%; *margin-left: 2.709239449864817%; -webkit-box-sizing: border-box; @@ -830,7 +830,7 @@ .uneditable-input { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a70f305a39..3c4ce62d19 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -150,7 +150,7 @@ textarea { .input-block-level { display: block; width: 100%; - min-height: 28px; + min-height: 30px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -340,7 +340,7 @@ a:hover { display: block; float: left; width: 100%; - min-height: 28px; + min-height: 30px; margin-left: 2.127659574468085%; *margin-left: 2.074468085106383%; -webkit-box-sizing: border-box; @@ -2865,6 +2865,7 @@ table .span24 { position: relative; height: 0; overflow: hidden; + overflow: visible \9; -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -o-transition: height 0.35s ease; @@ -4344,26 +4345,26 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #555555; } -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { right: 0; left: auto; } -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { +.navbar .pull-right > li > .dropdown-menu:before, +.navbar .nav > li > .dropdown-menu.pull-right:before { right: 12px; left: auto; } -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { +.navbar .pull-right > li > .dropdown-menu:after, +.navbar .nav > li > .dropdown-menu.pull-right:after { right: 13px; left: auto; } -.navbar .pull-right .dropdown-menu .dropdown-menu, -.navbar .dropdown-menu.pull-right .dropdown-menu { +.navbar .pull-right > li > .dropdown-menu .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { right: 100%; left: auto; margin-right: -1px; diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 3efe568eb8..b567647ae7 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -46,6 +46,18 @@
    • Home
    • About
    • Contact
      • +
    • + Dropdown + +
    diff --git a/less/component-animations.less b/less/component-animations.less index d614263a76..2166776d98 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -15,6 +15,7 @@ position: relative; height: 0; overflow: hidden; + overflow: visible \9; .transition(height .35s ease); &.in { height: auto; diff --git a/less/mixins.less b/less/mixins.less index b1b8ae80ad..20dd0d19ac 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -154,11 +154,12 @@ .input-block-level { display: block; width: 100%; - min-height: 28px; // Make inputs at least the height of their button counterpart + min-height: 30px; // Make inputs at least the height of their button counterpart .box-sizing(border-box); // Makes inputs behave like true block-level elements } + // Mixin for form field states .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { // Set the text color diff --git a/less/navbar.less b/less/navbar.less index 4439dcde31..bf94ed6887 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -327,8 +327,8 @@ } // Right aligned menus need alt position -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { left: auto; right: 0; &:before { From 2ee035403d2dd9c19b7bfd3f90a83422a4ab7d7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 16:28:17 -0700 Subject: [PATCH 17/18] running make on prev merge --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3c4ce62d19..7d706b036e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4030,7 +4030,7 @@ input[type="submit"].btn.btn-mini { .navbar .brand { display: block; float: left; - padding: 8px 20px 12px; + padding: 10px 20px 10px; margin-left: -20px; font-size: 20px; font-weight: 200; From e1659b2c4ebcd1124665779fe045600207ea7333 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 Aug 2012 18:57:27 -0700 Subject: [PATCH 18/18] add affix plugin to downloads page --- docs/customize.html | 8 ++++++-- docs/templates/pages/customize.mustache | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/customize.html b/docs/customize.html index d40ffea2dc..fd5b03dcf3 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -190,12 +190,16 @@ Tooltips -
    -
    +
    +
    + -
    -
    +
    +
    +