This commit is contained in:
Jacob Thornton
2012-02-01 22:23:15 -08:00
parent b53f986849
commit 39725edded
17 changed files with 74 additions and 58 deletions
Binary file not shown.
+2 -2
View File
@@ -2108,12 +2108,12 @@ button.btn.small, input[type="submit"].btn.small {
.nav-list > li + .nav-header {
margin-top: 9px;
}
.nav-list .active > a {
.nav-list .active > a, .nav-list .active > a:hover {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
background-color: #0088cc;
}
.nav-list .icon {
.nav-list [class^="icon-"] {
margin-right: 2px;
}
.nav-tabs, .nav-pills {
+5 -5
View File
@@ -600,7 +600,7 @@ For example, <code>section</code> should be wrapped as inline.
<div class="row">
<div class="span4">
<p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.</p>
<p class="muted"><strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
<p class="muted"><strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-striped"&gt;
@@ -914,7 +914,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="controls">
<label class="checkbox">
<input type="checkbox" id="optionsCheckbox" value="option1">
Option one is this and that&mdash;be sure to include why its great
Option one is this and that&mdash;be sure to include why it's great
</label>
</div>
</div>
@@ -1145,7 +1145,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="optionsCheckboxList1" value="option1">
Option one is this and that&mdash;be sure to include why its great
Option one is this and that&mdash;be sure to include why it's great
</label>
<label class="checkbox">
<input type="checkbox" name="optionsCheckboxList2" value="option2">
@@ -1163,7 +1163,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="controls">
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
Option one is this and that&mdash;be sure to include why its great
Option one is this and that&mdash;be sure to include why it's great
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
@@ -1252,7 +1252,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</div>
<div class="span4">
<h3>For anchors and forms</h3>
<p>Button styles can be applied to anything with the <code>.btn</code> applied. However, typically youll want to apply these to only <code>&lt;a&gt;</code> and <code>&lt;button&gt;</code> elements.</p>
<p>Button styles can be applied to anything with the <code>.btn</code> applied. However, typically you'll want to apply these to only <code>&lt;a&gt;</code> and <code>&lt;button&gt;</code> elements.</p>
</div>
<div class="span4">
<p><strong>Note:</strong> All buttons must include the <code>.btn</code> class. Button styles should be applied to <code>&lt;button&gt;</code> and <code>&lt;a&gt;</code> elements for consistency.</p>
+9 -9
View File
@@ -605,7 +605,7 @@
<div class="span4">
<h3>Custom jQuery plugin</h3>
<p>All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the javascript docs page.</p>
<p><a class="btn" href="./javascript.html/#tabs">Get the javascript &rarr;</a></p>
<p><a class="btn" href="./javascript.html#tabs">Get the javascript &rarr;</a></p>
</div>
</div>
@@ -865,7 +865,7 @@
&lt;/ul&gt;
</pre>
<h3>Adding dropdowns</h3>
<p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.</p>
<p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.</p>
<pre class="prettyprint linenums">
&lt;ul class="nav"&gt;
&lt;li class="dropdown"&gt;
@@ -881,7 +881,7 @@
&lt;/li&gt;
&lt;/ul&gt;
</pre>
<p><a class="btn" href="./javascript.html/#dropdown">Get the javascript &rarr;</a></p>
<p><a class="btn" href="./javascript.html#dropdown">Get the javascript &rarr;</a></p>
</div><!-- /.span -->
</div><!-- /.row -->
@@ -1088,7 +1088,7 @@
</tr>
<tr>
<td>
<span class="label label-success">New</span>
<span class="label label-success">Success</span>
</td>
<td>
<code>&lt;span class="label label-success"&gt;New&lt;/span&gt;</code>
@@ -1295,25 +1295,25 @@
<p>Wrap your message and an optional close icon in a div with simple class.</p>
<div class="alert">
<a class="close">&times;</a>
<strong>Warning!</strong> Best check yo self, youre not looking too good.
<strong>Warning!</strong> Best check yo self, you're not looking too good.
</div>
<pre class="prettyprint linenums">
&lt;div class="alert"&gt;
&lt;a class="close"&gt;&times;&lt;/a&gt;
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, youre not looking too good.
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you're not looking too good.
&lt;/div&gt;
</pre>
<p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
<div class="alert alert-block">
<a class="close">&times;</a>
<h4 class="alert-heading">Warning!</h4>
<p>Best check yo self, youre not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
</div>
<pre class="prettyprint linenums">
&lt;div class="alert alert-block"&gt;
&lt;a class="close"&gt;&times;&lt;/a&gt;
&lt;h4 class="alert-heading"&gt;Warning!&lt;/h4&gt;
Best check yo self, youre not...
Best check yo self, you're not...
&lt;/div&gt;
</pre>
</div>
@@ -1349,7 +1349,7 @@
<h3>Information</h3>
<div class="alert alert-info">
<a class="close">&times;</a>
<strong>Heads up!</strong> This alert needs your attention, but its not super important.
<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
</div>
<pre class="prettyprint linenums">
&lt;div class="alert alert-info"&gt;
+1 -1
View File
@@ -95,7 +95,7 @@
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
</a>
<h3>Fluid layout</h3>
<p>Uses are new responsive, fluid grid system to create seamless liquid layout.</p>
<p>Uses our new responsive, fluid grid system to create seamless liquid layout.</p>
</li>
<li class="span4">
<a class="thumbnail" href="examples/starter-template.html">
+15 -6
View File
@@ -37,9 +37,9 @@
<div class="navbar-inner">
<div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse">
@@ -128,14 +128,23 @@
</footer>
</div><!--/.fluid-container-->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/tests/vendor/jquery.js"></script>
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
+14 -4
View File
@@ -34,9 +34,9 @@
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse">
@@ -89,9 +89,19 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/tests/vendor/jquery.js"></script>
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
+5 -6
View File
@@ -13,12 +13,12 @@
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
@@ -33,9 +33,9 @@
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="i-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse">
@@ -59,8 +59,7 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="../assets/js/tests/vendor/jquery.js"></script>
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
+1 -1
View File
@@ -910,7 +910,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<strong>Holy guacamole!</strong> Best check yo self, youre not looking too good.
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div>
<div class="alert alert-block alert-error fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
-1
View File
@@ -191,7 +191,6 @@
<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>
+3 -3
View File
@@ -338,13 +338,13 @@
</tr>
<tr>
<td>Landscape tablets</td>
<td>768px to 940px</td>
<td>768px to 980px</td>
<td>44px</td>
<td>20px</td>
</tr>
<tr>
<td>Default</td>
<td>940px and up</td>
<td>980px and up</td>
<td>60px</td>
<td>20px</td>
</tr>
@@ -390,7 +390,7 @@
@media (max-width: 768px) { ... }
// Portrait tablet to landscape and desktop
@media (min-width: 768px) and (max-width: 940px) { ... }
@media (min-width: 768px) and (max-width: 980px) { ... }
// Large desktop
@media (min-width: 1200px) { .. }
+5 -5
View File
@@ -524,7 +524,7 @@
<div class="row">
<div class="span4">
<p>{{_i}}Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.{{/i}}</p>
<p class="muted">{{_i}}<strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
<p class="muted">{{_i}}<strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.{{/i}}</p>
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
&lt;table class="table table-striped"&gt;
@@ -838,7 +838,7 @@
<div class="controls">
<label class="checkbox">
<input type="checkbox" id="optionsCheckbox" value="option1">
{{_i}}Option one is this and that&mdash;be sure to include why its great{{/i}}
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
</label>
</div>
</div>
@@ -1069,7 +1069,7 @@
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="optionsCheckboxList1" value="option1">
{{_i}}Option one is this and that&mdash;be sure to include why its great{{/i}}
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
</label>
<label class="checkbox">
<input type="checkbox" name="optionsCheckboxList2" value="option2">
@@ -1087,7 +1087,7 @@
<div class="controls">
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
{{_i}}Option one is this and that&mdash;be sure to include why its great{{/i}}
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
</label>
<label class="radio">
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
@@ -1176,7 +1176,7 @@
</div>
<div class="span4">
<h3>{{_i}}For anchors and forms{{/i}}</h3>
<p>{{_i}}Button styles can be applied to anything with the <code>.btn</code> applied. However, typically youll want to apply these to only <code>&lt;a&gt;</code> and <code>&lt;button&gt;</code> elements.{{/i}}</p>
<p>{{_i}}Button styles can be applied to anything with the <code>.btn</code> applied. However, typically you'll want to apply these to only <code>&lt;a&gt;</code> and <code>&lt;button&gt;</code> elements.{{/i}}</p>
</div>
<div class="span4">
<p>{{_i}}<strong>Note:</strong> All buttons must include the <code>.btn</code> class. Button styles should be applied to <code>&lt;button&gt;</code> and <code>&lt;a&gt;</code> elements for consistency.{{/i}}</p>
+9 -9
View File
@@ -529,7 +529,7 @@
<div class="span4">
<h3>{{_i}}Custom jQuery plugin{{/i}}</h3>
<p>{{_i}}All tabbable tabs are powered by our lightweight jQuery plugin. Read more about how to bring tabbable tabs to life on the javascript docs page.{{/i}}</p>
<p><a class="btn" href="./javascript.html/#tabs">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
<p><a class="btn" href="./javascript.html#tabs">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
</div>
</div>
@@ -789,7 +789,7 @@
&lt;/ul&gt;
</pre>
<h3>{{_i}}Adding dropdowns{{/i}}</h3>
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.{{/i}}</p>
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.{{/i}}</p>
<pre class="prettyprint linenums">
&lt;ul class="nav"&gt;
&lt;li class="dropdown"&gt;
@@ -805,7 +805,7 @@
&lt;/li&gt;
&lt;/ul&gt;
</pre>
<p><a class="btn" href="./javascript.html/#dropdown">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
<p><a class="btn" href="./javascript.html#dropdown">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
</div><!-- /.span -->
</div><!-- /.row -->
@@ -1012,7 +1012,7 @@
</tr>
<tr>
<td>
<span class="label label-success">{{_i}}New{{/i}}</span>
<span class="label label-success">{{_i}}Success{{/i}}</span>
</td>
<td>
<code>&lt;span class="label label-success"&gt;{{/_i}}New{{/i}}&lt;/span&gt;</code>
@@ -1219,25 +1219,25 @@
<p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p>
<div class="alert">
<a class="close">&times;</a>
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, youre not looking too good.{{/i}}
<strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
<pre class="prettyprint linenums">
&lt;div class="alert"&gt;
&lt;a class="close"&gt;&times;&lt;/a&gt;
&lt;strong&gt;{{_i}}Warning!{{/i}}&lt;/strong&gt; {{_i}}Best check yo self, youre not looking too good.{{/i}}
&lt;strong&gt;{{_i}}Warning!{{/i}}&lt;/strong&gt; {{_i}}Best check yo self, you're not looking too good.{{/i}}
&lt;/div&gt;
</pre>
<p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
<div class="alert alert-block">
<a class="close">&times;</a>
<h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
<p>{{_i}}Best check yo self, youre not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<p>{{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
</div>
<pre class="prettyprint linenums">
&lt;div class="alert alert-block"&gt;
&lt;a class="close"&gt;&times;&lt;/a&gt;
&lt;h4 class="alert-heading"&gt;{{_i}}Warning!{{/i}}&lt;/h4&gt;
{{_i}}Best check yo self, youre not...{{/i}}
{{_i}}Best check yo self, you're not...{{/i}}
&lt;/div&gt;
</pre>
</div>
@@ -1273,7 +1273,7 @@
<h3>{{_i}}Information{{/i}}</h3>
<div class="alert alert-info">
<a class="close">&times;</a>
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but its not super important.{{/i}}
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}}
</div>
<pre class="prettyprint linenums">
&lt;div class="alert alert-info"&gt;
+1 -1
View File
@@ -19,7 +19,7 @@
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
</a>
<h3>{{_i}}Fluid layout{{/i}}</h3>
<p>{{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
<p>{{_i}}Uses our new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
</li>
<li class="span4">
<a class="thumbnail" href="examples/starter-template.html">
+1 -1
View File
@@ -834,7 +834,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
<div class="alert fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, youre not looking too good.{{/i}}
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
<div class="alert alert-block alert-error fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
-1
View File
@@ -115,7 +115,6 @@
<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>
+3 -3
View File
@@ -262,13 +262,13 @@
</tr>
<tr>
<td>{{_i}}Landscape tablets{{/i}}</td>
<td>768px to 940px</td>
<td>768px to 980px</td>
<td>44px</td>
<td>20px</td>
</tr>
<tr>
<td>{{_i}}Default{{/i}}</td>
<td>940px and up</td>
<td>980px and up</td>
<td>60px</td>
<td>20px</td>
</tr>
@@ -314,7 +314,7 @@
@media (max-width: 768px) { ... }
// {{_i}}Portrait tablet to landscape and desktop{{/i}}
@media (min-width: 768px) and (max-width: 940px) { ... }
@media (min-width: 768px) and (max-width: 980px) { ... }
// {{_i}}Large desktop{{/i}}
@media (min-width: 1200px) { .. }