diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 925aae1415..91aa105067 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -73,7 +73,8 @@ img { -ms-interpolation-mode: bicubic; } -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } @@ -3385,7 +3386,41 @@ input[type="button"].btn-block { margin-top: 9px; } +<<<<<<< HEAD .nav .divider { +======= +.nav-list { + padding-right: 15px; + padding-left: 15px; + margin-bottom: 0; +} + +.nav-list > li > a, +.nav-list .nav-header { + margin-right: -15px; + margin-left: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} + +.nav-list > li > a { + padding: 3px 15px; +} + +.nav-list > .active > a, +.nav-list > .active > a:hover { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #0088cc; +} + +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { + margin-right: 2px; +} + +.nav-list .divider { + *width: 100%; +>>>>>>> 2.1.2-wip height: 1px; margin: 9px 1px; overflow: hidden; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bba1384156..1a8e2fdeb8 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -756,7 +756,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; @@ -823,6 +823,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 diff --git a/docs/base-css.html b/docs/base-css.html index 8d0261e5c6..1070ef2f45 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -873,25 +873,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>
@@ -945,7 +949,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/scaffolding.html b/docs/scaffolding.html index 18d4fb0416..1be55ddafe 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -404,7 +404,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/base-css.mustache b/docs/templates/pages/base-css.mustache index 1a91ff3879..a539e7e2b3 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
    diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c4c5322b1d..8da12d0a51 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -339,7 +339,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}}

    diff --git a/less/reset.less b/less/reset.less index 5223f2f74f..7cbfa48f41 100644 --- a/less/reset.less +++ b/less/reset.less @@ -83,7 +83,8 @@ img { } // Prevent max-width from affecting Google Maps -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; }