2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff

This commit is contained in:
Mark Otto
2012-01-27 13:20:02 -08:00
parent 97546adc90
commit e8647c1b11
22 changed files with 351 additions and 269 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="./index.html">Bootstrap</a>
+5 -5
View File
@@ -6,7 +6,7 @@
<div class="subnav">
<ul class="nav pills">
<li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
<li><a href="#comboButtons">{{_i}}Combo buttons{{/i}}</a></li>
<li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
<li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
<li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li>
<li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
@@ -92,9 +92,9 @@
<!-- Split button dropdowns
================================================== -->
<section id="comboButtons">
<section id="buttonDropdowns">
<div class="page-header">
<h1>{{_i}}Combo buttons{{/i}} <small>{{_i}}Built on button groups to provide contextual dropdown menus{{/i}}</small></h1>
<h1>{{_i}}Buttons dropdowns{{/i}} <small>{{_i}}Built on button groups to provide contextual dropdown menus{{/i}}</small></h1>
</div>
<div class="row">
<div class="span4">
@@ -634,9 +634,9 @@
&lt;/div&gt;
&lt;/div&gt;
</pre>
<p>{{_i}}To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.{{/i}}</p>
<p>{{_i}}To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed-top</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.{{/i}}</p>
<pre class="prettyprint linenums">
&lt;div class="navbar navbar-fixed"&gt;
&lt;div class="navbar navbar-fixed-top"&gt;
...
&lt;/div&gt;
</pre>
+104 -88
View File
@@ -9,10 +9,10 @@
<p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
<div class="subnav">
<ul class="nav pills">
<li><a href="#components">{{_i}}1. Select components{{/i}}</a></li>
<li><a href="#variables">{{_i}}2. Modify variables{{/i}}</a></li>
<li><a href="#plugins">{{_i}}3. Select jQuery plugins{{/i}}</a></li>
<li><a href="#download">{{_i}}4. Customize and download{{/i}}</a></li>
<li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
<li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
<li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
<li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
</ul>
</div>
</header>
@@ -21,7 +21,7 @@
<div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
1. Select components
1. Chose components
<small>Get just the CSS you need</small>
</h1>
</div>
@@ -42,8 +42,7 @@
</div><!-- /span -->
<div class="span3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Combo buttons</label>
<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="navs.less"> Navs, tabs, and pills</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
@@ -59,8 +58,7 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Tabs</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
<div class="span3">
@@ -69,88 +67,12 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<!--
<h3>Responsive</h3>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX 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=""> MARK PLS FIX Max-width 1210px</label>
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="variables">
<div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
2. Modify variables
<small>Customize Bootstrap without using a LESS compiler</small>
</h1>
</div>
<div class="row download-builder">
<div class="span4">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" placeholder="40px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
<label>@siteWidth</label>
<input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<label>@fluidSidebarWidth</label>
<input type="text" class="span3" placeholder="220px">
</div><!-- /span -->
<div class="span4">
<h3>Typography</h3>
<label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px">
<h3>Forms</h3>
<label>@primaryButtonColor</label>
<input type="text" class="span3" placeholder="@blue">
<label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" placeholder="@grayDark">
</div><!-- /span -->
<div class="span4">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@warningBorder</label>
<input type="text" class="span3" placeholder="#f3edd2">
<label>@errorText</label>
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" placeholder="#f2dede">
<label>@errorBorder</label>
<input type="text" class="span3" placeholder="#e9c7c7">
<label>@successText</label>
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" placeholder="#dff0d8">
<label>@successBorder</label>
<input type="text" class="span3" placeholder="#cfe8c4">
<label>@infoText</label>
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" placeholder="#d9edf7">
<label>@infoBorder</label>
<input type="text" class="span3" placeholder="#bfe1f2">
-->
</div><!-- /span -->
</div><!-- /row -->
</section>
@@ -159,7 +81,7 @@
<div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
3. Select jQuery plugins
2. Select jQuery plugins
<small>Quickly add only the necessary javascript</small>
</h1>
</div>
@@ -223,6 +145,100 @@
</div><!-- /row -->
</section>
<section class="download" id="variables">
<div class="page-header">
<a class="btn small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
3. Customize variables
<small>Optionally modify Bootstrap without a compiler</small>
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Colors</h3>
<label>@blue</label>
<input type="text" class="span3" placeholder="#049cdb">
<label>@green</label>
<input type="text" class="span3" placeholder="#46a546">
<label>@red</label>
<input type="text" class="span3" placeholder="#9d261d">
<label>@yellow</label>
<input type="text" class="span3" placeholder="#ffc40d">
<label>@orange</label>
<input type="text" class="span3" placeholder="#f89406">
<label>@pink</label>
<input type="text" class="span3" placeholder="#c3325f">
<label>@purple</label>
<input type="text" class="span3" placeholder="#7a43b6">
</div><!-- /span -->
<div class="span3">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" placeholder="40px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
<label>@siteWidth</label>
<input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<label>@fluidSidebarWidth</label>
<input type="text" class="span3" placeholder="220px">
<h3>Typography</h3>
<label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px">
</div><!-- /span -->
<div class="span3">
<h3>Forms</h3>
<label>@primaryButtonColor</label>
<input type="text" class="span3" placeholder="@blue">
<label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" placeholder="@grayDark">
<label>@navbarText</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColor</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColorHover</label>
<input type="text" class="span3" placeholder="@white">
</div><!-- /span -->
<div class="span3">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@errorText</label>
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" placeholder="#f2dede">
<label>@successText</label>
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" placeholder="#dff0d8">
<label>@infoText</label>
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" placeholder="#d9edf7">
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="download">
<div class="page-header">
<h1>
+13 -12
View File
@@ -8,7 +8,7 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
<a href="./download.html" class="btn btn-large">{{_i}}Customize and download{{/i}}</a>
<a href="./download.html" class="btn btn-large">{{_i}}Customize and Download{{/i}}</a>
</p>
<div class="benefits">
<h4>{{_i}}Feature highlights{{/i}}</h4>
@@ -25,7 +25,7 @@
</div>
<ul class="quick-links">
<li><a href="https://github.com/twitter/bootstrap/">GitHub repo</a></li>
<li><a href="./upgrading.html">Upgrading from 1.4</a></li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
@@ -155,27 +155,28 @@
<p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p>
<div class="getting-started">
<div class="row">
<div class="span4">
<h3>{{_i}}Prostyle with Node{{/i}}</h3>
<p>{{_i}}If you use Node, download the repo, customize Bootstrap, and run make.{{/i}}</p>
<pre class="prettyprint">
$ git clone git@github.com:twitter/bootstrap.git
$ make</pre>
</div>
<div class="span4">
<h3>{{_i}}Hotlink the CSS{{/i}}</h3>
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
<p>{{_i}}For the quickest and easiest start, just copy this snippet into your code to get the CSS.{{/i}}</p>
<form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
</form>
</div>
<div class="span4">
<h3>{{_i}}Use it with LESS{{/i}}</h3>
<p>{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}</p>
<h3>{{_i}}Use LESS.js{{/i}}</h3>
<p>{{_i}}A fan of using LESS? No problem, just link to the appropriate .less and .js files:{{/i}}</p>
<form>
<textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
&lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
</form>
</div>
<div class="span4">
<h3>{{_i}}Fork on GitHub{{/i}}</h3>
<p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
<p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
</div>
</div>
</div><!-- /row -->
</div><!-- /getting-started -->
+12
View File
@@ -266,6 +266,18 @@
<td><code>@navbarBackgroundHighlight</code></td>
<td><code>@grayDark</code></td>
</tr>
<tr>
<td><code>@navbarText</code></td>
<td><code>@grayLight</code></td>
</tr>
<tr>
<td><code>@navbarLinkColor</code></td>
<td><code>@grayLight</code></td>
</tr>
<tr>
<td><code>@navbarLinkColorHover</code></td>
<td><code>@white</code></td>
</tr>
</tbody>
</table>
</div>