diff options
| author | Mark Otto <[email protected]> | 2012-01-24 23:35:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 23:35:34 -0800 |
| commit | 6ab56051fdf916f03efb8aa6675e50bdd1cc3155 (patch) | |
| tree | 03f81a867ee570a31c780e062ce6fbec73abb9d1 | |
| parent | f2fe2b1798380ab65e88281ab4db47965cd5aaf8 (diff) | |
| download | bootstrap-6ab56051fdf916f03efb8aa6675e50bdd1cc3155.tar.xz bootstrap-6ab56051fdf916f03efb8aa6675e50bdd1cc3155.zip | |
fix up docs css for responsive and subnav, fix forms error states
| -rw-r--r-- | bootstrap.css | 39 | ||||
| -rw-r--r-- | bootstrap.min.css | 9 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 119 | ||||
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/less.html | 829 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/less.mustache | 845 | ||||
| -rw-r--r-- | lib/forms.less | 6 | ||||
| -rw-r--r-- | lib/type.less | 7 |
9 files changed, 1127 insertions, 731 deletions
diff --git a/bootstrap.css b/bootstrap.css index 4bda5047e..33be3d966 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 21:10:54 PST 2012 + * Date: Tue Jan 24 23:35:08 PST 2012 */ article, aside, @@ -253,6 +253,12 @@ p small { font-size: 11px; color: #999999; } +.lead { + margin-bottom: 18px; + font-size: 20px; + font-weight: 200; + line-height: 27px; +} h1, h2, h3, @@ -419,7 +425,6 @@ code, pre { } code { padding: 3px 4px; - background-color: #fee9cc; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; @@ -706,13 +711,13 @@ textarea[readonly] { } .control-group.warning input, .control-group.warning textarea { color: #c09853; - border-color: #f3edd2; + border-color: #c09853; } .control-group.warning input:focus, .control-group.warning textarea:focus { - border-color: #e8ddaa; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #a47e3c; + -webkit-box-shadow: 0 0 6px #dbc59e; + -moz-box-shadow: 0 0 6px #dbc59e; + box-shadow: 0 0 6px #dbc59e; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #c09853; @@ -724,13 +729,13 @@ textarea[readonly] { } .control-group.error input, .control-group.error textarea { color: #b94a48; - border-color: #e9c7c7; + border-color: #b94a48; } .control-group.error input:focus, .control-group.error textarea:focus { - border-color: #dba2a2; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #953b39; + -webkit-box-shadow: 0 0 6px #d59392; + -moz-box-shadow: 0 0 6px #d59392; + box-shadow: 0 0 6px #d59392; } .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #b94a48; @@ -742,13 +747,13 @@ textarea[readonly] { } .control-group.success input, .control-group.success textarea { color: #468847; - border-color: #cfe8c4; + border-color: #468847; } .control-group.success input:focus, .control-group.success textarea:focus { - border-color: #b1da9f; - -webkit-box-shadow: 0 0 6px #ffffff; - -moz-box-shadow: 0 0 6px #ffffff; - box-shadow: 0 0 6px #ffffff; + border-color: #356635; + -webkit-box-shadow: 0 0 6px #7aba7b; + -moz-box-shadow: 0 0 6px #7aba7b; + box-shadow: 0 0 6px #7aba7b; } .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #468847; diff --git a/bootstrap.min.css b/bootstrap.min.css index a0c49ba49..3c2b70663 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -54,6 +54,7 @@ a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:unde .offset10{margin-left:820px;} .offset11{margin-left:900px;} p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} +.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} @@ -83,7 +84,7 @@ blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left: q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:3px 4px;background-color:#fee9cc;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} +code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} small{font-size:100%;} @@ -143,13 +144,13 @@ select.span11{width:870px;} select.span12{width:950px;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#f3edd2;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#e8ddaa;-webkit-box-shadow:0 0 6px #ffffff;-moz-box-shadow:0 0 6px #ffffff;box-shadow:0 0 6px #ffffff;} +.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#e9c7c7;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#dba2a2;-webkit-box-shadow:0 0 6px #ffffff;-moz-box-shadow:0 0 6px #ffffff;box-shadow:0 0 6px #ffffff;} +.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success input,.control-group.success textarea{color:#468847;border-color:#cfe8c4;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#b1da9f;-webkit-box-shadow:0 0 6px #ffffff;-moz-box-shadow:0 0 6px #ffffff;box-shadow:0 0 6px #ffffff;} +.control-group.success input,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} .form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 5fc04b0f9..d9f8e438b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -179,25 +179,27 @@ section { border-right: 0; } -/* Fixed subnav on scroll */ -.subnav-fixed { - position: fixed; - top: 40px; - left: 0; - right: 0; - z-index: 1030; - border-color: #d5d5d5; - border-width: 0 0 1px; /* drop the border on the fixed edges */ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); -} -.subnav-fixed .nav { - width: 940px; - margin: 0 auto; +/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */ +@media (min-width: 940px) { + .subnav-fixed { + position: fixed; + top: 40px; + left: 0; + right: 0; + z-index: 1030; + border-color: #d5d5d5; + border-width: 0 0 1px; /* drop the border on the fixed edges */ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); + } + .subnav-fixed .nav { + width: 940px; + margin: 0 auto; + } } @@ -439,6 +441,72 @@ section { } +/* CSS Chop Shop +-------------------------------------------------- */ +.builder { +} +.builder .span2 { + width: 160px; +} +.builder ul { + margin: 0; + list-style: none; +} +.builder .tabs { + margin-right: 0; +} +.builder .tabs a { + width: 160px; + padding: 14px; + font-size: 14px; +} +.builder .tab-content { + padding: 19px; + margin-left: 189px; + border: 1px solid #e5e5e5; + -webkit-border-radius: 0 4px 4px 4px; + -moz-border-radius: 0 4px 4px 4px; + border-radius: 0 4px 4px 4px; +} + +/* Space out h3s when following a section */ +.builder input + h3, +.builder .checkbox + h3 { + margin-top: 9px; +} + +/* Fields for variables */ +.builder input + h3 { + margin-top: 9px; +} +.builder #variables label { + margin-bottom: 2px; + color: #555; +} +.builder input[type=text] { + margin-bottom: 9px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + color: #d14; + background-color: #f7f7f9; +} +.builder input[type=text]:focus { + background-color: #fff; +} + + +.builder-actions { + margin-top: 18px; + padding-top: 18px; + border-top: 1px solid #eee; +} +.builder-actions .toggle-all { + float: right; + line-height: 36px; +} + + + /* Misc -------------------------------------------------- */ @@ -560,14 +628,6 @@ form.well { margin-top: 18px; } - /* Subnav */ - .subnav { - background: #fff; /* whole background property since we use a background-image for gradient */ - } - .subnav .nav > li { - float: none; - } - /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { @@ -630,10 +690,14 @@ form.well { z-index: auto; width: auto; height: auto; + background: #fff; /* whole background property since we use a background-image for gradient */ -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } + .subnav .nav > li { + float: none; + } .subnav .nav a { border: 0; } @@ -683,7 +747,6 @@ form.well { .jumbotron h1 { font-size: 54px; } - .jumbotron h1, .jumbotron p { margin-right: 0; diff --git a/docs/base-css.html b/docs/base-css.html index 27251d824..6847c0616 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -368,7 +368,7 @@ <tr> <td><code><pre class="prettyprint"></code></td> <td> - <p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p> + <p>Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p> <pre class="prettyprint"><div> <h1>Heading</h1> <p>Something right here…</p> diff --git a/docs/less.html b/docs/less.html index 86a65a6c7..e5e3baa66 100644 --- a/docs/less.html +++ b/docs/less.html @@ -58,359 +58,520 @@ <div class="container"> - <div class="alert"> - <strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight! - </div> +<div class="alert"> + <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"> - <h1>Using LESS with Bootstrap</h1> - <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p> - <div class="subnav"> - <ul class="nav pills"> - <li><a href="./less.html#builtWith">Built with Less</a></li> - <li><a href="./less.html#variables">Variables</a></li> - <li><a href="./less.html#mixins">Mixins</a></li> - <li><a href="./less.html#compiling">Compiling Bootstrap</a></li> - </ul> - </div> - </header> +<!-- Masthead +================================================== --> +<header class="jumbotron subhead" id="overview"> + <h1>Using LESS with Bootstrap</h1> + <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p> + <div class="subnav"> + <ul class="nav pills"> + <li><a href="./less.html#builtWith">Built with Less</a></li> + <li><a href="./less.html#variables">Variables</a></li> + <li><a href="./less.html#mixins">Mixins</a></li> + <li><a href="./less.html#compiling">Compiling Bootstrap</a></li> + </ul> + </div> +</header> - <!-- BUILT WITH LESS - ================================================== --> - <section id="builtWith"> - <div class="page-header"> - <h1>Built with LESS</h1> - </div> - <div class="row"> - <div class="span4"> - <h3>Why LESS?</h3> - <p>Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.</p> - </div> - <div class="span4"> - <h3>What's included?</h3> - <p>As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.</p> - </div> - <div class="span4"> - <h3>Learn more</h3> - <img style="float: right; height: 36px;" src="assets/img/less-logo-large.png" alt="LESS CSS"> - <p>Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.</p> - </div> - </div> - <div class="row"> - <div class="span4"> - <h3>Variables</h3> - <p>Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.</p> - </div> - <div class="span4"> - <h3>Mixins</h3> - <p>Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.</p> - </div> - <div class="span4"> - <h3>Operations</h3> - <p>Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.</p> +<!-- BUILDER +================================================== --> +<section id="builder"> + <div class="page-header"> + <h1>Chop Shop <small>Customize your build of Bootstrap</small></h1> + </div> + + <form class="form-horizontal builder"> + <div class="tabbable tabs-left"> + <ul class="nav tabs"> + <li class="active"> + <a href="#components" data-toggle="tab">1. Select components</a> + </li> + <li><a href="#variables" data-toggle="tab">2. Customize variables</a></li> + <li><a href="#download" data-toggle="tab">3. Build and download</a></li> + </ul> + <div class="tab-content"> + <div class="tab-pane active" id="components"> + <div class="row"> + <div class="span2 builder-section"> + <h3>Scaffolding</h3> + <label class="checkbox"><input type="checkbox" value=""> CSS reset</label> + <label class="checkbox"><input type="checkbox" value=""> Grid system</label> + <label class="checkbox"><input type="checkbox" value=""> Layouts</label> + <h3>Base CSS</h3> + <label class="checkbox"><input type="checkbox" value=""> Headings and body</label> + <label class="checkbox"><input type="checkbox" value=""> Code and pre</label> + <label class="checkbox"><input type="checkbox" value=""> Labels</label> + <label class="checkbox"><input type="checkbox" value=""> Tables</label> + <label class="checkbox"><input type="checkbox" value=""> Forms</label> + <label class="checkbox"><input type="checkbox" value=""> Buttons</label> + <label class="checkbox"><input type="checkbox" value=""> Icons</label> + </div> + <div class="span2 builder-section"> + <h3>Components</h3> + <label class="checkbox"><input type="checkbox" value=""> Button groups</label> + <label class="checkbox"><input type="checkbox" value=""> Combo buttons</label> + <label class="checkbox"><input type="checkbox" value=""> Navs, tabs, and pills</label> + <label class="checkbox"><input type="checkbox" value=""> Navbar</label> + <label class="checkbox"><input type="checkbox" value=""> Breadcrumbs</label> + <label class="checkbox"><input type="checkbox" value=""> Pagination</label> + <label class="checkbox"><input type="checkbox" value=""> Pager</label> + <label class="checkbox"><input type="checkbox" value=""> Thumbnails</label> + <label class="checkbox"><input type="checkbox" value=""> Alerts</label> + <label class="checkbox"><input type="checkbox" value=""> Progress bars</label> + </div> + <div class="span2 builder-section"> + <h3>JS Components</h3> + <label class="checkbox"><input type="checkbox" value=""> Tooltips</label> + <label class="checkbox"><input type="checkbox" value=""> Popovers</label> + <label class="checkbox"><input type="checkbox" value=""> Modals</label> + <label class="checkbox"><input type="checkbox" value=""> Dropdowns</label> + <label class="checkbox"><input type="checkbox" value=""> Tabs</label> + <label class="checkbox"><input type="checkbox" value=""> Collapse</label> + <label class="checkbox"><input type="checkbox" value=""> Carousel</label> + </div> + <div class="span2 builder-section"> + <h3>Responsive</h3> + <label class="checkbox"><input type="checkbox" value=""> Max-width 480px</label> + <label class="checkbox"><input type="checkbox" value=""> Max-width 768px</label> + <label class="checkbox"><input type="checkbox" value=""> Max-width 1210px</label> + <h3>Miscellaneous</h3> + <label class="checkbox"><input type="checkbox" value=""> Wells</label> + <label class="checkbox"><input type="checkbox" value=""> Close icon</label> + <label class="checkbox"><input type="checkbox" value=""> Utilities</label> + <label class="checkbox"><input type="checkbox" value=""> Component animations</label> + </div> </div> - </div> - </section> + <div class="builder-actions"> + <a class="toggle-all" href="">Reset variables</a> + <a class="btn large primary" href="">Next: Customize variables</a> + </div> + </div><!-- /tab-pane --> + <div class="tab-pane" id="variables"> + <div class="row"> + <div class="span3"> + <h3>Links</h3> + <label>@linkColor</label> + <input type="text" class="span3" value="#08c"> + <label>@linkColorHove</label> + <input type="text" class="span3" value="darken(@linkColor, 15%)"> + <h3>Grid system</h3> + <label>@gridColumns</label> + <input type="text" class="span3" value=""> + <label>@gridColumnWidth</label> + <input type="text" class="span3" value=""> + <label>@gridGutterWidth</label> + <input type="text" class="span3" value=""> + <label>@siteWidth</label> + <input type="text" class="span3" value=""> + <label>@fluidSidebarWidth</label> + <input type="text" class="span3" value=""> + </div><!-- /span --> + <div class="span3"> + <h3>Typography</h3> + <label>@baseFontSize</label> + <input type="text" class="span3" value="13px"> + <label>@baseFontFamily</label> + <input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif"> + <label>@baseLineHeight</label> + <input type="text" class="span3" value="18px"> + <h3>Forms</h3> + <label>@primaryButtonColor</label> + <input type="text" class="span3" value="@blue"> + <label>@placeholderText</label> + <input type="text" class="span3" value="@grayLight"> + <h3>Navbar</h3> + <label>@navbarHeight</label> + <input type="text" class="span3" value="40px"> + <label>@navbarBackground</label> + <input type="text" class="span3" value="@grayDarker"> + <label>@navbarBackgroundHighlight</label> + <input type="text" class="span3" value="@grayDark"> + </div><!-- /span --> + <div class="span3"> + <h3>Form states & alerts</h3> + <label>@warningText</label> + <input type="text" class="span3" value="#c09853"> + <label>@warningBackground</label> + <input type="text" class="span3" value="#fcf8e3"> + <label>@warningBorder</label> + <input type="text" class="span3" value="#f3edd2"> + <label>@errorText</label> + <input type="text" class="span3" value="#b94a48"> + <label>@errorBackground</label> + <input type="text" class="span3" value="#f2dede"> + <label>@errorBorder</label> + <input type="text" class="span3" value="#e9c7c7"> + <label>@successText</label> + <input type="text" class="span3" value="#468847"> + <label>@successBackground</label> + <input type="text" class="span3" value="#dff0d8"> + <label>@successBorder</label> + <input type="text" class="span3" value="#cfe8c4"> + <label>@infoText</label> + <input type="text" class="span3" value="#3a87ad"> + <label>@infoBackground</label> + <input type="text" class="span3" value="#d9edf7"> + <label>@infoBorder</label> + <input type="text" class="span3" value="#bfe1f2"> + </div><!-- /span --> + </div><!-- /row --> + <div class="builder-actions"> + <a class="btn large primary" href="">Next: Build and download</a> + </div> + </div><!-- /tab-pane --> + <div class="tab-pane" id="download"> + <h2>And you're set!</h2> + <p class="lead">We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.</p> + <a class="btn large primary">Download CSS</a> <a class="btn large primary">Download minified CSS</a> + <hr> + <p>Looking to customize your javascript? Head over to the <a href="./javascript.html#overview">Javascript plugins page</a> to build your own Bootstrap JS bundle.</p> + </div><!-- /tab-pane --> + </div><!-- /tab-content --> + </div><!-- /tabbable --> + </form> +</section> - <!-- VARIABLES - ================================================== --> - <section id="variables"> - <div class="page-header"> - <h1>Variables <small>from variables.less</small></h1> - </div> - <h3>Hyperlinks</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">Variable</th> - <th>Value</th> - <th>Usage</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@linkColor</code></td> - <td>#08c</td> - <td>Default link text color</td> - </tr> - <tr> - <td><code>@linkColorHover</code></td> - <td><code>darken(@linkColor, 15%)</code></td> - <td>Default link text hover color</td> - </tr> - </tbody> - </table> - - <div class="row"> - <div class="span6"> - <h3>Grayscale colors</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@black</code></td> - <td>#000</td> - </tr> - <tr> - <td><code>@grayDarker</code></td> - <td>#222</td> - </tr> - <tr> - <td><code>@grayDark</code></td> - <td>#333</td> - </tr> - <tr> - <td><code>@gray</code></td> - <td>#555</td> - </tr> - <tr> - <td><code>@grayLight</code></td> - <td>#999</td> - </tr> - <tr> - <td><code>@grayLighter</code></td> - <td>#eee</td> - </tr> - <tr> - <td><code>@white</code></td> - <td>#fff</td> - </tr> - </tbody> - </table> - </div> - <div class="span6"> - <h3>Accent colors</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@blue</code></td> - <td>#049cdb</td> - </tr> - <tr> - <td><code>@green</code></td> - <td>#46a546</td> - </tr> - <tr> - <td><code>@red</code></td> - <td>#9d261d</td> - </tr> - <tr> - <td><code>@yellow</code></td> - <td>#ffc40d</td> - </tr> - <tr> - <td><code>@orange</code></td> - <td>#f89406</td> - </tr> - <tr> - <td><code>@pink</code></td> - <td>#c3325f</td> - </tr> - <tr> - <td><code>@purple</code></td> - <td>#7a43b6</td> - </tr> - </tbody> - </table> - </div> - </div> <!-- /row --> - <div class="row"> - <div class="span6"> - <h3>Grid system</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@gridColumns</code></td> - <td>12</td> - </tr> - <tr> - <td><code>@gridColumnWidth</code></td> - <td>60px</td> - </tr> - <tr> - <td><code>@gridGutterWidth</code></td> - <td>20px</td> - </tr> - <tr> - <td><code>@siteWidth</code></td> - <td><code>(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))</code></td> - </tr> - </tbody> - </table> - </div> - <div class="span6"> - <h3>Typography</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">Variable</th> - <th>Value</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@baseFontSize</code></td> - <td>13px</td> - </tr> - <tr> - <td><code>@baseFontFamily</code></td> - <td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td> - <td></td> - </tr> - <tr> - <td><code>@baseLineHeight</code></td> - <td>18px</td> - </tr> - </tbody> - </table> - </div> - </div> <!-- /row --> - - <h3>Components</h3> - <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 --> +<!-- BUILT WITH LESS +================================================== --> +<section id="builtWith"> + <div class="page-header"> + <h1>Built with LESS</h1> + </div> + <div class="row"> + <div class="span4"> + <h3>Why LESS?</h3> + <p>Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.</p> + </div> + <div class="span4"> + <h3>What's included?</h3> + <p>As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.</p> + </div> + <div class="span4"> + <h3>Learn more</h3> + <img style="float: right; height: 36px;" src="assets/img/less-logo-large.png" alt="LESS CSS"> + <p>Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.</p> + </div> + </div> + <div class="row"> + <div class="span4"> + <h3>Variables</h3> + <p>Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.</p> + </div> + <div class="span4"> + <h3>Mixins</h3> + <p>Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.</p> + </div> + <div class="span4"> + <h3>Operations</h3> + <p>Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.</p> + </div> + </div> +</section> - </section> +<!-- VARIABLES +================================================== --> +<section id="variables"> + <div class="page-header"> + <h1>Variables <small>from variables.less</small></h1> + </div> - <!-- MIXINS - ================================================== --> - <div class="page-header" id="mixins"> - <h1>Mixins <small>from mixins.less</small></h1> - </div> + <h3>Hyperlinks</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">Variable</th> + <th>Value</th> + <th>Usage</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@linkColor</code></td> + <td>#08c</td> + <td>Default link text color</td> + </tr> + <tr> + <td><code>@linkColorHover</code></td> + <td><code>darken(@linkColor, 15%)</code></td> + <td>Default link text hover color</td> + </tr> + </tbody> + </table> + + <div class="row"> + <div class="span6"> + <h3>Grayscale colors</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@black</code></td> + <td>#000</td> + </tr> + <tr> + <td><code>@grayDarker</code></td> + <td>#222</td> + </tr> + <tr> + <td><code>@grayDark</code></td> + <td>#333</td> + </tr> + <tr> + <td><code>@gray</code></td> + <td>#555</td> + </tr> + <tr> + <td><code>@grayLight</code></td> + <td>#999</td> + </tr> + <tr> + <td><code>@grayLighter</code></td> + <td>#eee</td> + </tr> + <tr> + <td><code>@white</code></td> + <td>#fff</td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h3>Accent colors</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@blue</code></td> + <td>#049cdb</td> + </tr> + <tr> + <td><code>@green</code></td> + <td>#46a546</td> + </tr> + <tr> + <td><code>@red</code></td> + <td>#9d261d</td> + </tr> + <tr> + <td><code>@yellow</code></td> + <td>#ffc40d</td> + </tr> + <tr> + <td><code>@orange</code></td> + <td>#f89406</td> + </tr> + <tr> + <td><code>@pink</code></td> + <td>#c3325f</td> + </tr> + <tr> + <td><code>@purple</code></td> + <td>#7a43b6</td> + </tr> + </tbody> + </table> + </div> + </div> <!-- /row --> + <div class="row"> + <div class="span6"> + <h3>Grid system</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@gridColumns</code></td> + <td>12</td> + </tr> + <tr> + <td><code>@gridColumnWidth</code></td> + <td>60px</td> + </tr> + <tr> + <td><code>@gridGutterWidth</code></td> + <td>20px</td> + </tr> + <tr> + <td><code>@siteWidth</code></td> + <td><code>(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))</code></td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h3>Typography</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@baseFontSize</code></td> + <td>13px</td> + </tr> + <tr> + <td><code>@baseFontFamily</code></td> + <td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td> + <td></td> + </tr> + <tr> + <td><code>@baseLineHeight</code></td> + <td>18px</td> + </tr> + </tbody> + </table> + </div> + </div> <!-- /row --> + + <h3>Components</h3> + <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> - <!-- OPERATIONS - ================================================== --> - <div class="page-header" id="operations"> - <h1>Operations</h1> - </div> +<!-- MIXINS +================================================== --> +<div class="page-header" id="mixins"> + <h1>Mixins <small>from mixins.less</small></h1> +</div> - <!-- COMPILING LESS AND BOOTSTRAP - ================================================== --> - <div class="page-header" id="compiling"> - <h1>Compiling LESS and Bootstrap</h1> - </div> + +<!-- OPERATIONS +================================================== --> +<div class="page-header" id="operations"> + <h1>Operations</h1> +</div> + + + +<!-- COMPILING LESS AND BOOTSTRAP +================================================== --> +<div class="page-header" id="compiling"> + <h1>Compiling LESS and Bootstrap</h1> +</div> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 225e88d2b..ba864ce9e 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -308,7 +308,7 @@ <tr> <td><code><pre class="prettyprint"></code></td> <td> - <p>{{_i}}Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.{{/i}}</p> + <p>{{_i}}Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.{{/i}}</p> <pre class="prettyprint"><div> <h1>{{_i}}Heading{{/i}}</h1> <p>{{_i}}Something right here…{{/i}}</p> diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index ea7058fd9..ecb39055b 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -1,356 +1,517 @@ - <div class="alert"> - <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"> - <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1> - <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p> - <div class="subnav"> - <ul class="nav pills"> - <li><a href="./less.html#builtWith">{{_i}}Built with Less{{/i}}</a></li> - <li><a href="./less.html#variables">{{_i}}Variables{{/i}}</a></li> - <li><a href="./less.html#mixins">{{_i}}Mixins{{/i}}</a></li> - <li><a href="./less.html#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li> - </ul> - </div> - </header> - - - - <!-- BUILT WITH LESS - ================================================== --> - <section id="builtWith"> - <div class="page-header"> - <h1>{{_i}}Built with LESS{{/i}}</h1> - </div> - <div class="row"> - <div class="span4"> - <h3>{{_i}}Why LESS?{{/i}}</h3> - <p>{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}</p> - </div> - <div class="span4"> - <h3>{{_i}}What's included?{{/i}}</h3> - <p>{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}</p> - </div> - <div class="span4"> - <h3>{{_i}}Learn more{{/i}}</h3> - <img style="float: right; height: 36px;" src="assets/img/less-logo-large.png" alt="LESS CSS"> - <p>{{_i}}Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.{{/i}}</p> - </div> - </div> - <div class="row"> - <div class="span4"> - <h3>{{_i}}Variables{{/i}}</h3> - <p>{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}</p> - </div> - <div class="span4"> - <h3>{{_i}}Mixins{{/i}}</h3> - <p>{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}</p> - </div> - <div class="span4"> - <h3>{{_i}}Operations{{/i}}</h3> - <p>{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}</p> - </div> - </div> - </section> - - - - <!-- VARIABLES - ================================================== --> - <section id="variables"> - <div class="page-header"> - <h1>{{_i}}Variables <small>from variables.less</small>{{/i}}</h1> - </div> - - <h3>{{_i}}Hyperlinks{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">{{_i}}Variable{{/i}}</th> - <th>{{_i}}Value{{/i}}</th> - <th>{{_i}}Usage{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@linkColor</code></td> - <td>#08c</td> - <td>{{_i}}Default link text color{{/i}}</td> - </tr> - <tr> - <td><code>@linkColorHover</code></td> - <td><code>darken(@linkColor, 15%)</code></td> - <td>{{_i}}Default link text hover color{{/i}}</td> - </tr> - </tbody> - </table> - - <div class="row"> - <div class="span6"> - <h3>{{_i}}Grayscale colors{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">{{_i}}Variable{{/i}}</th> - <th>{{_i}}Value{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@black</code></td> - <td>#000</td> - </tr> - <tr> - <td><code>@grayDarker</code></td> - <td>#222</td> - </tr> - <tr> - <td><code>@grayDark</code></td> - <td>#333</td> - </tr> - <tr> - <td><code>@gray</code></td> - <td>#555</td> - </tr> - <tr> - <td><code>@grayLight</code></td> - <td>#999</td> - </tr> - <tr> - <td><code>@grayLighter</code></td> - <td>#eee</td> - </tr> - <tr> - <td><code>@white</code></td> - <td>#fff</td> - </tr> - </tbody> - </table> - </div> - <div class="span6"> - <h3>{{_i}}Accent colors{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">{{_i}}Variable{{/i}}</th> - <th>{{_i}}Value{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@blue</code></td> - <td>#049cdb</td> - </tr> - <tr> - <td><code>@green</code></td> - <td>#46a546</td> - </tr> - <tr> - <td><code>@red</code></td> - <td>#9d261d</td> - </tr> - <tr> - <td><code>@yellow</code></td> - <td>#ffc40d</td> - </tr> - <tr> - <td><code>@orange</code></td> - <td>#f89406</td> - </tr> - <tr> - <td><code>@pink</code></td> - <td>#c3325f</td> - </tr> - <tr> - <td><code>@purple</code></td> - <td>#7a43b6</td> - </tr> - </tbody> - </table> - </div> - </div> <!-- /row --> - <div class="row"> - <div class="span6"> - <h3>{{_i}}Grid system{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">{{_i}}Variable{{/i}}</th> - <th>{{_i}}Value{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@gridColumns</code></td> - <td>12</td> - </tr> - <tr> - <td><code>@gridColumnWidth</code></td> - <td>60px</td> - </tr> - <tr> - <td><code>@gridGutterWidth</code></td> - <td>20px</td> - </tr> - <tr> - <td><code>@siteWidth</code></td> - <td><code>(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))</code></td> - </tr> - </tbody> - </table> - </div> - <div class="span6"> - <h3>{{_i}}Typography{{/i}}</h3> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th class="span2">{{_i}}Variable{{/i}}</th> - <th>{{_i}}Value{{/i}}</th> - </tr> - </thead> - <tbody> - <tr> - <td><code>@baseFontSize</code></td> - <td>13px</td> - </tr> - <tr> - <td><code>@baseFontFamily</code></td> - <td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td> - <td></td> - </tr> - <tr> - <td><code>@baseLineHeight</code></td> - <td>18px</td> - </tr> - </tbody> - </table> - </div> - </div> <!-- /row --> - - <h3>{{_i}}Components{{/i}}</h3> - <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 class="alert"> + <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"> + <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1> + <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p> + <div class="subnav"> + <ul class="nav pills"> + <li><a href="./less.html#builtWith">{{_i}}Built with Less{{/i}}</a></li> + <li><a href="./less.html#variables">{{_i}}Variables{{/i}}</a></li> + <li><a href="./less.html#mixins">{{_i}}Mixins{{/i}}</a></li> + <li><a href="./less.html#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li> + </ul> + </div> +</header> + + + +<!-- BUILDER +================================================== --> +<section id="builder"> + <div class="page-header"> + <h1>Chop Shop <small>Customize your build of Bootstrap</small></h1> + </div> + + <form class="form-horizontal builder"> + <div class="tabbable tabs-left"> + <ul class="nav tabs"> + <li class="active"> + <a href="#components" data-toggle="tab">1. Select components</a> + </li> + <li><a href="#variables" data-toggle="tab">2. Customize variables</a></li> + <li><a href="#download" data-toggle="tab">3. Build and download</a></li> + </ul> + <div class="tab-content"> + <div class="tab-pane active" id="components"> + <div class="row"> + <div class="span2 builder-section"> + <h3>Scaffolding</h3> + <label class="checkbox"><input type="checkbox" value=""> CSS reset</label> + <label class="checkbox"><input type="checkbox" value=""> Grid system</label> + <label class="checkbox"><input type="checkbox" value=""> Layouts</label> + <h3>Base CSS</h3> + <label class="checkbox"><input type="checkbox" value=""> Headings and body</label> + <label class="checkbox"><input type="checkbox" value=""> Code and pre</label> + <label class="checkbox"><input type="checkbox" value=""> Labels</label> + <label class="checkbox"><input type="checkbox" value=""> Tables</label> + <label class="checkbox"><input type="checkbox" value=""> Forms</label> + <label class="checkbox"><input type="checkbox" value=""> Buttons</label> + <label class="checkbox"><input type="checkbox" value=""> Icons</label> + </div> + <div class="span2 builder-section"> + <h3>Components</h3> + <label class="checkbox"><input type="checkbox" value=""> Button groups</label> + <label class="checkbox"><input type="checkbox" value=""> Combo buttons</label> + <label class="checkbox"><input type="checkbox" value=""> Navs, tabs, and pills</label> + <label class="checkbox"><input type="checkbox" value=""> Navbar</label> + <label class="checkbox"><input type="checkbox" value=""> Breadcrumbs</label> + <label class="checkbox"><input type="checkbox" value=""> Pagination</label> + <label class="checkbox"><input type="checkbox" value=""> Pager</label> + <label class="checkbox"><input type="checkbox" value=""> Thumbnails</label> + <label class="checkbox"><input type="checkbox" value=""> Alerts</label> + <label class="checkbox"><input type="checkbox" value=""> Progress bars</label> + </div> + <div class="span2 builder-section"> + <h3>JS Components</h3> + <label class="checkbox"><input type="checkbox" value=""> Tooltips</label> + <label class="checkbox"><input type="checkbox" value=""> Popovers</label> + <label class="checkbox"><input type="checkbox" value=""> Modals</label> + <label class="checkbox"><input type="checkbox" value=""> Dropdowns</label> + <label class="checkbox"><input type="checkbox" value=""> Tabs</label> + <label class="checkbox"><input type="checkbox" value=""> Collapse</label> + <label class="checkbox"><input type="checkbox" value=""> Carousel</label> + </div> + <div class="span2 builder-section"> + <h3>Responsive</h3> + <label class="checkbox"><input type="checkbox" value=""> Max-width 480px</label> + <label class="checkbox"><input type="checkbox" value=""> Max-width 768px</label> + <label class="checkbox"><input type="checkbox" value=""> Max-width 1210px</label> + <h3>Miscellaneous</h3> + <label class="checkbox"><input type="checkbox" value=""> Wells</label> + <label class="checkbox"><input type="checkbox" value=""> Close icon</label> + <label class="checkbox"><input type="checkbox" value=""> Utilities</label> + <label class="checkbox"><input type="checkbox" value=""> Component animations</label> + </div> </div> - </div><!-- /row --> + <div class="builder-actions"> + <a class="toggle-all" href="">Reset variables</a> + <a class="btn large primary" href="">Next: Customize variables</a> + </div> + </div><!-- /tab-pane --> + <div class="tab-pane" id="variables"> + <div class="row"> + <div class="span3"> + <h3>Links</h3> + <label>@linkColor</label> + <input type="text" class="span3" value="#08c"> + <label>@linkColorHove</label> + <input type="text" class="span3" value="darken(@linkColor, 15%)"> + <h3>Grid system</h3> + <label>@gridColumns</label> + <input type="text" class="span3" value=""> + <label>@gridColumnWidth</label> + <input type="text" class="span3" value=""> + <label>@gridGutterWidth</label> + <input type="text" class="span3" value=""> + <label>@siteWidth</label> + <input type="text" class="span3" value=""> + <label>@fluidSidebarWidth</label> + <input type="text" class="span3" value=""> + </div><!-- /span --> + <div class="span3"> + <h3>Typography</h3> + <label>@baseFontSize</label> + <input type="text" class="span3" value="13px"> + <label>@baseFontFamily</label> + <input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif"> + <label>@baseLineHeight</label> + <input type="text" class="span3" value="18px"> + <h3>Forms</h3> + <label>@primaryButtonColor</label> + <input type="text" class="span3" value="@blue"> + <label>@placeholderText</label> + <input type="text" class="span3" value="@grayLight"> + <h3>Navbar</h3> + <label>@navbarHeight</label> + <input type="text" class="span3" value="40px"> + <label>@navbarBackground</label> + <input type="text" class="span3" value="@grayDarker"> + <label>@navbarBackgroundHighlight</label> + <input type="text" class="span3" value="@grayDark"> + </div><!-- /span --> + <div class="span3"> + <h3>Form states & alerts</h3> + <label>@warningText</label> + <input type="text" class="span3" value="#c09853"> + <label>@warningBackground</label> + <input type="text" class="span3" value="#fcf8e3"> + <label>@warningBorder</label> + <input type="text" class="span3" value="#f3edd2"> + <label>@errorText</label> + <input type="text" class="span3" value="#b94a48"> + <label>@errorBackground</label> + <input type="text" class="span3" value="#f2dede"> + <label>@errorBorder</label> + <input type="text" class="span3" value="#e9c7c7"> + <label>@successText</label> + <input type="text" class="span3" value="#468847"> + <label>@successBackground</label> + <input type="text" class="span3" value="#dff0d8"> + <label>@successBorder</label> + <input type="text" class="span3" value="#cfe8c4"> + <label>@infoText</label> + <input type="text" class="span3" value="#3a87ad"> + <label>@infoBackground</label> + <input type="text" class="span3" value="#d9edf7"> + <label>@infoBorder</label> + <input type="text" class="span3" value="#bfe1f2"> + </div><!-- /span --> + </div><!-- /row --> + <div class="builder-actions"> + <a class="btn large primary" href="">Next: Build and download</a> + </div> + </div><!-- /tab-pane --> + <div class="tab-pane" id="download"> + <h2>And you're set!</h2> + <p class="lead">We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.</p> + <a class="btn large primary">Download CSS</a> <a class="btn large primary">Download minified CSS</a> + <hr> + <p>Looking to customize your javascript? Head over to the <a href="./javascript.html#overview">Javascript plugins page</a> to build your own Bootstrap JS bundle.</p> + </div><!-- /tab-pane --> + </div><!-- /tab-content --> + </div><!-- /tabbable --> + </form> + +</section> + + + +<!-- BUILT WITH LESS +================================================== --> +<section id="builtWith"> + <div class="page-header"> + <h1>{{_i}}Built with LESS{{/i}}</h1> + </div> + <div class="row"> + <div class="span4"> + <h3>{{_i}}Why LESS?{{/i}}</h3> + <p>{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}</p> + </div> + <div class="span4"> + <h3>{{_i}}What's included?{{/i}}</h3> + <p>{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}</p> + </div> + <div class="span4"> + <h3>{{_i}}Learn more{{/i}}</h3> + <img style="float: right; height: 36px;" src="assets/img/less-logo-large.png" alt="LESS CSS"> + <p>{{_i}}Visit the official website at <a href="http://lesscss.org">http://lesscss.org</a> to learn more.{{/i}}</p> + </div> + </div> + <div class="row"> + <div class="span4"> + <h3>{{_i}}Variables{{/i}}</h3> + <p>{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}</p> + </div> + <div class="span4"> + <h3>{{_i}}Mixins{{/i}}</h3> + <p>{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}</p> + </div> + <div class="span4"> + <h3>{{_i}}Operations{{/i}}</h3> + <p>{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}</p> + </div> + </div> +</section> - </section> +<!-- VARIABLES +================================================== --> +<section id="variables"> + <div class="page-header"> + <h1>{{_i}}Variables <small>from variables.less</small>{{/i}}</h1> + </div> - <!-- MIXINS - ================================================== --> - <div class="page-header" id="mixins"> - <h1>{{_i}}Mixins <small>from mixins.less</small>{{/i}}</h1> - </div> + <h3>{{_i}}Hyperlinks{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">{{_i}}Variable{{/i}}</th> + <th>{{_i}}Value{{/i}}</th> + <th>{{_i}}Usage{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@linkColor</code></td> + <td>#08c</td> + <td>{{_i}}Default link text color{{/i}}</td> + </tr> + <tr> + <td><code>@linkColorHover</code></td> + <td><code>darken(@linkColor, 15%)</code></td> + <td>{{_i}}Default link text hover color{{/i}}</td> + </tr> + </tbody> + </table> + + <div class="row"> + <div class="span6"> + <h3>{{_i}}Grayscale colors{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">{{_i}}Variable{{/i}}</th> + <th>{{_i}}Value{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@black</code></td> + <td>#000</td> + </tr> + <tr> + <td><code>@grayDarker</code></td> + <td>#222</td> + </tr> + <tr> + <td><code>@grayDark</code></td> + <td>#333</td> + </tr> + <tr> + <td><code>@gray</code></td> + <td>#555</td> + </tr> + <tr> + <td><code>@grayLight</code></td> + <td>#999</td> + </tr> + <tr> + <td><code>@grayLighter</code></td> + <td>#eee</td> + </tr> + <tr> + <td><code>@white</code></td> + <td>#fff</td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h3>{{_i}}Accent colors{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">{{_i}}Variable{{/i}}</th> + <th>{{_i}}Value{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@blue</code></td> + <td>#049cdb</td> + </tr> + <tr> + <td><code>@green</code></td> + <td>#46a546</td> + </tr> + <tr> + <td><code>@red</code></td> + <td>#9d261d</td> + </tr> + <tr> + <td><code>@yellow</code></td> + <td>#ffc40d</td> + </tr> + <tr> + <td><code>@orange</code></td> + <td>#f89406</td> + </tr> + <tr> + <td><code>@pink</code></td> + <td>#c3325f</td> + </tr> + <tr> + <td><code>@purple</code></td> + <td>#7a43b6</td> + </tr> + </tbody> + </table> + </div> + </div> <!-- /row --> + <div class="row"> + <div class="span6"> + <h3>{{_i}}Grid system{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">{{_i}}Variable{{/i}}</th> + <th>{{_i}}Value{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@gridColumns</code></td> + <td>12</td> + </tr> + <tr> + <td><code>@gridColumnWidth</code></td> + <td>60px</td> + </tr> + <tr> + <td><code>@gridGutterWidth</code></td> + <td>20px</td> + </tr> + <tr> + <td><code>@siteWidth</code></td> + <td><code>(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))</code></td> + </tr> + </tbody> + </table> + </div> + <div class="span6"> + <h3>{{_i}}Typography{{/i}}</h3> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th class="span2">{{_i}}Variable{{/i}}</th> + <th>{{_i}}Value{{/i}}</th> + </tr> + </thead> + <tbody> + <tr> + <td><code>@baseFontSize</code></td> + <td>13px</td> + </tr> + <tr> + <td><code>@baseFontFamily</code></td> + <td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td> + <td></td> + </tr> + <tr> + <td><code>@baseLineHeight</code></td> + <td>18px</td> + </tr> + </tbody> + </table> + </div> + </div> <!-- /row --> + + <h3>{{_i}}Components{{/i}}</h3> + <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> + + + +<!-- MIXINS +================================================== --> +<div class="page-header" id="mixins"> + <h1>{{_i}}Mixins <small>from mixins.less</small>{{/i}}</h1> +</div> - <!-- OPERATIONS - ================================================== --> - <div class="page-header" id="operations"> - <h1>{{_i}}Operations{{/i}}</h1> - </div> +<!-- OPERATIONS +================================================== --> +<div class="page-header" id="operations"> + <h1>{{_i}}Operations{{/i}}</h1> +</div> - <!-- COMPILING LESS AND BOOTSTRAP - ================================================== --> - <div class="page-header" id="compiling"> - <h1>{{_i}}Compiling LESS and Bootstrap{{/i}}</h1> - </div> +<!-- COMPILING LESS AND BOOTSTRAP +================================================== --> +<div class="page-header" id="compiling"> + <h1>{{_i}}Compiling LESS and Bootstrap{{/i}}</h1> +</div> diff --git a/lib/forms.less b/lib/forms.less index 2b24fb2f0..e35b23da0 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -297,15 +297,15 @@ textarea[readonly] { } // Warning .control-group.warning { - .formFieldState(@warningText, @warningBorder, @warningBackground); + .formFieldState(@warningText, @warningText, @warningBackground); } // Error .control-group.error { - .formFieldState(@errorText, @errorBorder, @errorBackground); + .formFieldState(@errorText, @errorText, @errorBackground); } // Success .control-group.success { - .formFieldState(@successText, @successBorder, @successBackground); + .formFieldState(@successText, @successText, @successBackground); } // HTML5 invalid states diff --git a/lib/type.less b/lib/type.less index 211111761..548c222f1 100644 --- a/lib/type.less +++ b/lib/type.less @@ -16,6 +16,12 @@ p { color: @grayLight; } } +.lead { + margin-bottom: @baseLineHeight; + font-size: 20px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; +} // HEADINGS // -------- @@ -202,7 +208,6 @@ pre { } code { padding: 3px 4px; - background-color: lighten(@orange, 40%); color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; |
