From 46764a71650f751820c0968bd33458f03dac0387 Mon Sep 17 00:00:00 2001 From: amid2887 Date: Mon, 1 Oct 2012 14:32:51 +0700 Subject: [PATCH 1/6] Add missing icon class definition for navs.less add missing icon class definition for navs: '[class*=" icon-"]' P.S. Sorry for 2 pull requests with the same problem.. --- less/navs.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/less/navs.less b/less/navs.less index 0836cd5120..1944f84415 100644 --- a/less/navs.less +++ b/less/navs.less @@ -67,7 +67,8 @@ text-shadow: 0 -1px 0 rgba(0,0,0,.2); background-color: @linkColor; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } // Dividers (basically an hr) within the dropdown From 32181816f714b1e9ed83a925b6334efca3cbd5ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:27:42 -0700 Subject: [PATCH 2/6] run make on previous merge --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0160bf1f63..cf42c13e52 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3867,7 +3867,8 @@ input[type="submit"].btn.btn-mini { background-color: #0088cc; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } From 085d6d185d7695d0816315aeee5e3a8ed3c60585 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:42:45 -0700 Subject: [PATCH 3/6] fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly --- docs/base-css.html | 37 ++++++++++++++------------ docs/templates/pages/base-css.mustache | 37 ++++++++++++++------------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/docs/base-css.html b/docs/base-css.html index 1f0a039f07..46ce606cbb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -875,25 +875,29 @@ For example, <code><section></code> should be wrapped as inlin

Default styles

Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

- Legend - - - Example block-level help text here. - - +
+ Legend + + + Example block-level help text here. + + + 
 <form>
-  <legend>Legend</legend>
-  <label>Label name</label>
-  <input type="text" placeholder="Type something…">
-  <span class="help-block">Example block-level help text here.</span>
-  <label class="checkbox">
-    <input type="checkbox"> Check me out
-  </label>
-  <button type="submit" class="btn">Submit</button>
+  <fieldset>
+    <legend>Legend</legend>
+    <label>Label name</label>
+    <input type="text" placeholder="Type something…">
+    <span class="help-block">Example block-level help text here.</span>
+    <label class="checkbox">
+      <input type="checkbox"> Check me out
+    </label>
+    <button type="submit" class="btn">Submit</button>
+  </fieldset>
 </form>
@@ -947,7 +951,6 @@ For example, <code><section></code> should be wrapped as inlin
  • Wrap any associated controls in .controls for proper alignment
    • - Legend
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 13192d90e1..9e0a899525 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -812,25 +812,29 @@

    {{_i}}Default styles{{/i}}

    {{_i}}Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}

    - Legend - - - {{_i}}Example block-level help text here.{{/i}} - - +
    + Legend + + + {{_i}}Example block-level help text here.{{/i}} + + +
    {{! /example }} 
     <form>
-  <legend>{{_i}}Legend{{/i}}</legend>
-  <label>{{_i}}Label name{{/i}}</label>
-  <input type="text" placeholder="{{_i}}Type something…{{/i}}">
-  <span class="help-block">Example block-level help text here.</span>
-  <label class="checkbox">
-    <input type="checkbox"> {{_i}}Check me out{{/i}}
-  </label>
-  <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+  <fieldset>
+    <legend>{{_i}}Legend{{/i}}</legend>
+    <label>{{_i}}Label name{{/i}}</label>
+    <input type="text" placeholder="{{_i}}Type something…{{/i}}">
+    <span class="help-block">Example block-level help text here.</span>
+    <label class="checkbox">
+      <input type="checkbox"> {{_i}}Check me out{{/i}}
+    </label>
+    <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+  </fieldset>
 </form>
    @@ -884,7 +888,6 @@
  • {{_i}}Wrap any associated controls in .controls for proper alignment{{/i}}
    • - Legend
    From 239ce24f92688f0dca44a4f74f9f5f70f04af1e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:48:57 -0700 Subject: [PATCH 4/6] fixes #5188: add .google-maps class to reset responsive images on case-by-case basis --- docs/assets/css/bootstrap.css | 3 ++- less/reset.less | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cf42c13e52..eb810c2099 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -75,7 +75,8 @@ img { -ms-interpolation-mode: bicubic; } -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } diff --git a/less/reset.less b/less/reset.less index ed3fecf416..2abdee4624 100644 --- a/less/reset.less +++ b/less/reset.less @@ -88,7 +88,8 @@ img { } // Prevent max-width from affecting Google Maps -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } From a90334eebb0199c15f32059d9d3a285498dec188 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 11:11:33 -0700 Subject: [PATCH 5/6] fix docs sidenav width for ie8-9 --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fd021cf82e..3484f300c6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -754,7 +754,7 @@ form.bs-docs-example { } .bs-docs-sidenav > li > a { display: block; - *width: 190px; + width: 190px \9; margin: 0 0 -1px; padding: 8px 14px; border: 1px solid #e5e5e5; @@ -821,6 +821,9 @@ form.bs-docs-example { .bs-docs-sidenav { width: 258px; } + .bs-docs-sidenav > li > a { + width: 230px \9; /* Override the previous IE8-9 hack */ + } } /* Desktop From c6c1ada60074e420fa93174cb3db167faf618e2b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 11:18:49 -0700 Subject: [PATCH 6/6] clarify tables support of responsive utility classes, of which there is none --- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scaffolding.html b/docs/scaffolding.html index c3a140c67e..fd263bc2d5 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -509,7 +509,7 @@

    When to use

    -

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

    +

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.

    Responsive utilities test case

    Resize your browser or load on different devices to test the above classes.

    diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index f87af3c900..85ae5ea029 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -442,7 +442,7 @@

    {{_i}}When to use{{/i}}

    -

    {{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}

    +

    {{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.{{/i}}

    {{_i}}Responsive utilities test case{{/i}}

    {{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}