Skip to content

B
bootstrap
Commit 3c7e3eb7 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 

Conflicts:
	docs/assets/css/bootstrap.css
parents 6fd1e9f4 d7b8a9c9
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 85 deletions
docs/assets/css/bootstrap.css
View file @ 3c7e3eb7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 13:34:19 PST 2012 * Date: Fri Jan 27 13:37:10 PST 2012
*/ */
article, article,
aside, aside,
...@@ -2461,6 +2461,7 @@ table .span12 { ...@@ -2461,6 +2461,7 @@ table .span12 {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: #fafafa; background-color: #fafafa;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
......
docs/download.html
View file @ 3c7e3eb7
...@@ -63,10 +63,6 @@ ...@@ -63,10 +63,6 @@
<div class="container"> <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>
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
...@@ -134,9 +130,9 @@ ...@@ -134,9 +130,9 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label> <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<!-- <!--
<h3>Responsive</h3> <h3>Responsive</h3>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label> <label class="checkbox"><input type="checkbox" value=""> Max-width 480px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label> <label class="checkbox"><input type="checkbox" value=""> Max-width 768px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label> <label class="checkbox"><input type="checkbox" value=""> Max-width 1210px</label>
--> -->
</div><!-- /span --> </div><!-- /span -->
</div><!-- /row --> </div><!-- /row -->
...@@ -308,7 +304,6 @@ ...@@ -308,7 +304,6 @@
<div class="page-header"> <div class="page-header">
<h1> <h1>
4. Download 4. Download
<small></small>
</h1> </h1>
</div> </div>
<div class="download-btn"> <div class="download-btn">
......
docs/templates/pages/download.mustache
View file @ 3c7e3eb7
<div class="alert">
<strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
</div>
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
...@@ -19,59 +15,59 @@ ...@@ -19,59 +15,59 @@
<section class="download" id="components"> <section class="download" id="components">
<div class="page-header"> <div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Toggle all</a> <a class="btn small pull-right toggle-all" href="#">{{_i}}Toggle all{{/i}}</a>
<h1> <h1>
1. Chose components {{_i}}1. Chose components{{/i}}
<small>Get just the CSS you need</small> <small>{{_i}}Get just the CSS you need{{/i}}</small>
</h1> </h1>
</div> </div>
<div class="row download-builder"> <div class="row download-builder">
<div class="span3"> <div class="span3">
<h3>Scaffolding</h3> <h3>{{_i}}Scaffolding{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> CSS reset</label> <label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> {{_i}}CSS reset{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> Grid system</label> <label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> {{_i}}Grid system{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> Layouts</label> <label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> {{_i}}Layouts{{/i}}</label>
<h3>Base CSS</h3> <h3>{{_i}}Base CSS{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label> <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label> <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels</label> <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label> <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label> <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label> <label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> {{_i}}Icons{{/i}}</label>
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Components</h3> <h3>{{_i}}Components{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</label> <label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> {{_i}}Button groups and dropdowns{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label> <label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> {{_i}}Navs, tabs, and pills{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label> <label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> {{_i}}Navbar{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label> <label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> {{_i}}Breadcrumbs{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label> <label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> {{_i}}Pagination{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label> <label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> {{_i}}Pager{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label> <label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> {{_i}}Thumbnails{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label> <label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> {{_i}}Alerts{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label> <label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> {{_i}}Progress bars{{/i}}</label>
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>JS Components</h3> <h3>{{_i}}JS Components{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> {{_i}}Tooltips{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label> <label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> {{_i}}Popovers{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label> <label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> {{_i}}Modals{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label> <label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> {{_i}}Dropdowns{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> Collapse</label> <label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> {{_i}}Collapse{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label> <label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> {{_i}}Carousel{{/i}}</label>
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Miscellaneous</h3> <h3>{{_i}}Miscellaneous{{/i}}</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label> <label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> {{_i}}Wells{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label> <label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> {{_i}}Close icon{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label> <label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> {{_i}}Utilities{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label> <label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> {{_i}}Component animations{{/i}}</label>
<!-- <!--
<h3>Responsive</h3> <h3>{{_i}}Responsive{{/i}}</h3>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label> <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 480px{{/i}}</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label> <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 768px{{/i}}</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label> <label class="checkbox"><input type="checkbox" value=""> {{_i}}Max-width 1210px{{/i}}</label>
--> -->
</div><!-- /span --> </div><!-- /span -->
</div><!-- /row --> </div><!-- /row -->
...@@ -79,67 +75,67 @@ ...@@ -79,67 +75,67 @@
<section class="download" id="plugins"> <section class="download" id="plugins">
<div class="page-header"> <div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Toggle all</a> <a class="btn small pull-right toggle-all" href="#">{{_i}}Toggle all{{/i}}</a>
<h1> <h1>
2. Select jQuery plugins {{_i}}2. Select jQuery plugins{{/i}}
<small>Quickly add only the necessary javascript</small> <small>{{_i}}Quickly add only the necessary javascript{{/i}}</small>
</h1> </h1>
</div> </div>
<div class="row download-builder"> <div class="row download-builder">
<div class="span4"> <div class="span4">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-transition.js"> <input type="checkbox" checked="true" value="bootstrap-transition.js">
Transitions <small>(required for any animation)</small> {{_i}}Transitions <small>(required for any animation)</small>{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-modal.js"> <input type="checkbox" checked="true" value="bootstrap-modal.js">
Modals {{_i}}Modals{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-dropdown.js"> <input type="checkbox" checked="true" value="bootstrap-dropdown.js">
Dropdowns {{_i}}Dropdowns{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-scrollspy.js"> <input type="checkbox" checked="true" value="bootstrap-scrollspy.js">
Scrollspy {{_i}}Scrollspy{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tab.js"> <input type="checkbox" checked="true" value="bootstrap-tab.js">
Togglable tabs {{_i}}Togglable tabs{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tooltip.js"> <input type="checkbox" checked="true" value="bootstrap-tooltip.js">
Tooltips {{_i}}Tooltips{{/i}}
</label> </label>
</div><!-- /span --> </div><!-- /span -->
<div class="span4"> <div class="span4">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-popover.js"> <input type="checkbox" checked="true" value="bootstrap-popover.js">
Popovers <small>(requires Tooltips)</small> {{_i}}Popovers <small>(requires Tooltips)</small>{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-alert.js"> <input type="checkbox" checked="true" value="bootstrap-alert.js">
Alert messages {{_i}}Alert messages{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-button.js"> <input type="checkbox" checked="true" value="bootstrap-button.js">
Buttons {{_i}}Buttons{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-collapse.js"> <input type="checkbox" checked="true" value="bootstrap-collapse.js">
Collapse {{_i}}Collapse{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-carousel.js"> <input type="checkbox" checked="true" value="bootstrap-carousel.js">
Carousel {{_i}}Carousel{{/i}}
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-typeahead.js"> <input type="checkbox" checked="true" value="bootstrap-typeahead.js">
Typeahead {{_i}}Typeahead{{/i}}
</label> </label>
</div><!-- /span --> </div><!-- /span -->
<div class="span4"> <div class="span4">
<h4 class="muted">Heads up!</h4> <h4 class="muted">{{_i}}Heads up!{{/i}}</h4>
<p class="muted">{{_i}}All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.{{/i}}</p> <p class="muted">{{_i}}All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.{{/i}}</p>
</div><!-- /span --> </div><!-- /span -->
</div><!-- /row --> </div><!-- /row -->
...@@ -148,20 +144,20 @@ ...@@ -148,20 +144,20 @@
<section class="download" id="variables"> <section class="download" id="variables">
<div class="page-header"> <div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Reset to defaults</a> <a class="btn small pull-right toggle-all" href="#">{{_i}}Reset to defaults{{/i}}</a>
<h1> <h1>
3. Customize variables {{_i}}3. Customize variables{{/i}}
<small>Optionally modify Bootstrap without a compiler</small> <small>{{_i}}Optionally modify Bootstrap without a compiler{{/i}}</small>
</h1> </h1>
</div> </div>
<div class="row download-builder"> <div class="row download-builder">
<div class="span3"> <div class="span3">
<h3>Links</h3> <h3>{{_i}}Links{{/i}}</h3>
<label>@linkColor</label> <label>@linkColor</label>
<input type="text" class="span3" placeholder="#08c"> <input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label> <label>@linkColorHover</label>
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)"> <input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Colors</h3> <h3>{{_i}}Colors{{/i}}</h3>
<label>@blue</label> <label>@blue</label>
<input type="text" class="span3" placeholder="#049cdb"> <input type="text" class="span3" placeholder="#049cdb">
<label>@green</label> <label>@green</label>
...@@ -178,7 +174,7 @@ ...@@ -178,7 +174,7 @@
<input type="text" class="span3" placeholder="#7a43b6"> <input type="text" class="span3" placeholder="#7a43b6">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Grid system</h3> <h3>{{_i}}Grid system{{/i}}</h3>
<label>@gridColumns</label> <label>@gridColumns</label>
<input type="text" class="span3" placeholder="12"> <input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label> <label>@gridColumnWidth</label>
...@@ -189,7 +185,7 @@ ...@@ -189,7 +185,7 @@
<input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));"> <input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<label>@fluidSidebarWidth</label> <label>@fluidSidebarWidth</label>
<input type="text" class="span3" placeholder="220px"> <input type="text" class="span3" placeholder="220px">
<h3>Typography</h3> <h3>{{_i}}Typography{{/i}}</h3>
<label>@baseFontSize</label> <label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px"> <input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label> <label>@baseFontFamily</label>
...@@ -198,12 +194,12 @@ ...@@ -198,12 +194,12 @@
<input type="text" class="span3" placeholder="18px"> <input type="text" class="span3" placeholder="18px">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Forms</h3> <h3>{{_i}}Forms{{/i}}</h3>
<label>@primaryButtonColor</label> <label>@primaryButtonColor</label>
<input type="text" class="span3" placeholder="@blue"> <input type="text" class="span3" placeholder="@blue">
<label>@placeholderText</label> <label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight"> <input type="text" class="span3" placeholder="@grayLight">
<h3>Navbar</h3> <h3>{{_i}}Navbar{{/i}}</h3>
<label>@navbarHeight</label> <label>@navbarHeight</label>
<input type="text" class="span3" placeholder="40px"> <input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label> <label>@navbarBackground</label>
...@@ -218,7 +214,7 @@ ...@@ -218,7 +214,7 @@
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
<h3>Form states &amp; alerts</h3> <h3>{{_i}}Form states &amp; alerts{{/i}}</h3>
<label>@warningText</label> <label>@warningText</label>
<input type="text" class="span3" placeholder="#c09853"> <input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label> <label>@warningBackground</label>
...@@ -242,13 +238,12 @@ ...@@ -242,13 +238,12 @@
<section class="download" id="download"> <section class="download" id="download">
<div class="page-header"> <div class="page-header">
<h1> <h1>
4. Download {{_i}}4. Download{{/i}}
<small></small>
</h1> </h1>
</div> </div>
<div class="download-btn"> <div class="download-btn">
<a class="btn xlarge primary" href="#">Customize and Download</a> <a class="btn xlarge primary" href="#">{{_i}}Customize and Download{{/i}}</a>
<h4>What's included?</h4> <h4>{{_i}}What's included?{{/i}}</h4>
<p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p> <p>{{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}</p>
</div> </div>
</section><!-- /download --> </section><!-- /download -->
less/buttons.less
View file @ 3c7e3eb7
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @grayDark; color: @grayDark;
text-align: center;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
border: 1px solid #ccc; border: 1px solid #ccc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment