diff options
| author | Mark Otto <[email protected]> | 2012-01-24 17:14:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 17:14:19 -0800 |
| commit | 805a965f2e7373db42d99376d4dc3c1ca9ea509d (patch) | |
| tree | d299622d70588ab5875fd2e443079b2adb68f03d | |
| parent | 40e92221a616bfe4e9500bcf2b72c86844f7f03f (diff) | |
| download | bootstrap-805a965f2e7373db42d99376d4dc3c1ca9ea509d.tar.xz bootstrap-805a965f2e7373db42d99376d4dc3c1ca9ea509d.zip | |
finish updating form state and alert variables in less docs page
| -rw-r--r-- | bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 2 | ||||
| -rw-r--r-- | docs/less.html | 143 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 155 |
4 files changed, 199 insertions, 103 deletions
diff --git a/bootstrap.css b/bootstrap.css index d7594416b..0cc74c8e2 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Jan 24 16:50:16 PST 2012 + * Date: Tue Jan 24 17:04:46 PST 2012 */ article, aside, diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d78cea2b1..956eff246 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -417,6 +417,8 @@ pre.prettyprint { /* Make tables spaced out a bit more */ h2 + table, +h3 + table, +h4 + table, h2 + .row { margin-top: 5px; } diff --git a/docs/less.html b/docs/less.html index dfa0739a7..c9e447382 100644 --- a/docs/less.html +++ b/docs/less.html @@ -58,6 +58,10 @@ <div class="container"> + <div class="alert alert-block"> + <strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight! + </div> + <!-- Masthead ================================================== --> <header class="jumbotron subhead" id="overview"> @@ -285,51 +289,100 @@ </div> <!-- /row --> <h3>Components</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th colspan="2" class="span3">Buttons</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@primaryButtonColor</code></td> - <td><code>@blue</code></td> - </tr> - </tbody> - - <thead> - <tr> - <th colspan="2" class="span3">Buttons</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@placeholderText</code></td> - <td><code>@grayLight</code></td> - </tr> - </tbody> - - <thead> - <tr> - <th colspan="2" class="span3">Navbars</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@navbarHeight</code></td> - <td>40px</td> - </tr> - <tr> - <td><code>@navbarBackground</code></td> - <td><code>@grayDarker</code></td> - </tr> - <tr> - <td><code>@navbarBackgroundHighlight</code></td> - <td><code>@grayDark</code></td> - </tr> - </tbody> - </table> + <div class="row"> + <div class="span6"> + <h4>Buttons</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@primaryButtonColor</code></td> + <td><code>@blue</code></td> + </tr> + </tbody> + </table> + <h4>Forms</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@placeholderText</code></td> + <td><code>@grayLight</code></td> + </tr> + </tbody> + </table> + <h4>Navbar</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@navbarHeight</code></td> + <td>40px</td> + </tr> + <tr> + <td><code>@navbarBackground</code></td> + <td><code>@grayDarker</code></td> + </tr> + <tr> + <td><code>@navbarBackgroundHighlight</code></td> + <td><code>@grayDark</code></td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h4>Form states and alerts</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@warningText</code></td> + <td>#f3edd2</td> + </tr> + <tr> + <td><code>@warningBackground</code></td> + <td>#c09853</td> + </tr> + <tr> + <td><code>@warningBorder</code></td> + <td>#f3edd2</td> + </tr> + <tr> + <td><code>@errorText</code></td> + <td>#b94a48</td> + </tr> + <tr> + <td><code>@errorBackground</code></td> + <td>#f2dede</td> + </tr> + <tr> + <td><code>@errorBorder</code></td> + <td>#e9c7c7</td> + </tr> + <tr> + <td><code>@successText</code></td> + <td>#468847</td> + </tr> + <tr> + <td><code>@successBackground</code></td> + <td>#dff0d8</td> + </tr> + <tr> + <td><code>@successBorder</code></td> + <td>#cfe8c4</td> + </tr> + <tr> + <td><code>@infoText</code></td> + <td>#3a87ad</td> + </tr> + <tr> + <td><code>@infoBackground</code></td> + <td>#d9edf7</td> + </tr> + <tr> + <td><code>@infoBorder</code></td> + <td>#bfe1f2</td> + </tr> + </tbody> + </table> + </div> + </div><!-- /row --> </section> diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 141000c7c..580fac2f6 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -1,3 +1,7 @@ + <div class="alert alert-block"> + <strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight! + </div> + <!-- Masthead ================================================== --> <header class="jumbotron subhead" id="overview"> @@ -225,63 +229,100 @@ </div> <!-- /row --> <h3>{{_i}}Components{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th colspan="2">{{_i}}Buttons{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@primaryButtonColor</code></td> - <td><code>@blue</code></td> - </tr> - </tbody> - - <thead> - <tr> - <th colspan="2">{{_i}}Buttons{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@placeholderText</code></td> - <td><code>@grayLight</code></td> - </tr> - </tbody> - - <thead> - <tr> - <th colspan="2">{{_i}}Navbars{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@navbarHeight</code></td> - <td>40px</td> - </tr> - <tr> - <td><code>@navbarBackground</code></td> - <td><code>@grayDarker</code></td> - </tr> - <tr> - <td><code>@navbarBackgroundHighlight</code></td> - <td><code>@grayDark</code></td> - </tr> - </tbody> - - <thead> - <tr> - <th colspan="2">{{_i}}Buttons{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@placeholderText</code></td> - <td><code>@grayLight</code></td> - </tr> - </tbody> - </table> + <div class="row"> + <div class="span6"> + <h4>Buttons</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@primaryButtonColor</code></td> + <td><code>@blue</code></td> + </tr> + </tbody> + </table> + <h4>Forms</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@placeholderText</code></td> + <td><code>@grayLight</code></td> + </tr> + </tbody> + </table> + <h4>Navbar</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@navbarHeight</code></td> + <td>40px</td> + </tr> + <tr> + <td><code>@navbarBackground</code></td> + <td><code>@grayDarker</code></td> + </tr> + <tr> + <td><code>@navbarBackgroundHighlight</code></td> + <td><code>@grayDark</code></td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h4>Form states and alerts</h4> + <table class="table table-bordered table-striped"> + <tbody> + <tr> + <td class="span3"><code>@warningText</code></td> + <td>#f3edd2</td> + </tr> + <tr> + <td><code>@warningBackground</code></td> + <td>#c09853</td> + </tr> + <tr> + <td><code>@warningBorder</code></td> + <td>#f3edd2</td> + </tr> + <tr> + <td><code>@errorText</code></td> + <td>#b94a48</td> + </tr> + <tr> + <td><code>@errorBackground</code></td> + <td>#f2dede</td> + </tr> + <tr> + <td><code>@errorBorder</code></td> + <td>#e9c7c7</td> + </tr> + <tr> + <td><code>@successText</code></td> + <td>#468847</td> + </tr> + <tr> + <td><code>@successBackground</code></td> + <td>#dff0d8</td> + </tr> + <tr> + <td><code>@successBorder</code></td> + <td>#cfe8c4</td> + </tr> + <tr> + <td><code>@infoText</code></td> + <td>#3a87ad</td> + </tr> + <tr> + <td><code>@infoBackground</code></td> + <td>#d9edf7</td> + </tr> + <tr> + <td><code>@infoBorder</code></td> + <td>#bfe1f2</td> + </tr> + </tbody> + </table> + </div> + </div><!-- /row --> </section> |
