diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 37 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 5 | ||||
| -rw-r--r-- | docs/base-css.html | 37 | ||||
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 37 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 |
6 files changed, 82 insertions, 38 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 925aae141..91aa10506 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 bba138415..1a8e2fdeb 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 8d0261e5c..1070ef2f4 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 <h2 id="forms-default">Default styles</h2> <p>Individual form controls receive styling, but without any required base class on the <code><form></code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.</p> <form class="bs-docs-example"> - <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> <pre class="prettyprint linenums"> <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> </pre> @@ -945,7 +949,6 @@ For example, <code><section></code> should be wrapped as inlin <li>Wrap any associated controls in <code>.controls</code> for proper alignment</li> </ul> <form class="bs-docs-example form-horizontal"> - <legend>Legend</legend> <div class="control-group"> <label class="control-label" for="inputEmail">Email</label> <div class="controls"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 18d4fb041..1be55ddaf 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -404,7 +404,7 @@ </table> <h3>When to use</h3> - <p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.</p> + <p>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.</p> <h3>Responsive utilities test case</h3> <p>Resize your browser or load on different devices to test the above classes.</p> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 1a91ff387..a539e7e2b 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -812,25 +812,29 @@ <h2 id="forms-default">{{_i}}Default styles{{/i}}</h2> <p>{{_i}}Individual form controls receive styling, but without any required base class on the <code><form></code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}</p> <form class="bs-docs-example"> - <legend>Legend</legend> - <label>{{_i}}Label name{{/i}}</label> - <input type="text" placeholder="{{_i}}Type something…{{/i}}"> - <span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span> - <label class="checkbox"> - <input type="checkbox"> {{_i}}Check me out{{/i}} - </label> - <button type="submit" class="btn">{{_i}}Submit{{/i}}</button> + <fieldset> + <legend>Legend</legend> + <label>{{_i}}Label name{{/i}}</label> + <input type="text" placeholder="{{_i}}Type something…{{/i}}"> + <span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span> + <label class="checkbox"> + <input type="checkbox"> {{_i}}Check me out{{/i}} + </label> + <button type="submit" class="btn">{{_i}}Submit{{/i}}</button> + </fieldset> </form>{{! /example }} <pre class="prettyprint linenums"> <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> </pre> @@ -884,7 +888,6 @@ <li>{{_i}}Wrap any associated controls in <code>.controls</code> for proper alignment{{/i}}</li> </ul> <form class="bs-docs-example form-horizontal"> - <legend>Legend</legend> <div class="control-group"> <label class="control-label" for="inputEmail">{{_i}}Email{{/i}}</label> <div class="controls"> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index c4c5322b1..8da12d0a5 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -339,7 +339,7 @@ </table> <h3>{{_i}}When to use{{/i}}</h3> - <p>{{_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}}</p> + <p>{{_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}}</p> <h3>{{_i}}Responsive utilities test case{{/i}}</h3> <p>{{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}</p> |