Skip to content

Commit 39725ed

Browse files
fatfat
committed
rebuild
1 parent b53f986 commit 39725ed

17 files changed

+74
-58
lines changed

‎assets/bootstrap.zip

22 Bytes
Binary file not shown.

‎assets/css/bootstrap.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,12 +2108,12 @@ button.btn.small, input[type="submit"].btn.small {
21082108
.nav-list > li + .nav-header {
21092109
margin-top: 9px;
21102110
}
2111-
.nav-list .active > a {
2111+
.nav-list .active > a, .nav-list .active > a:hover {
21122112
color: #ffffff;
21132113
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
21142114
background-color: #0088cc;
21152115
}
2116-
.nav-list .icon {
2116+
.nav-list [class^="icon-"] {
21172117
margin-right: 2px;
21182118
}
21192119
.nav-tabs, .nav-pills {

‎base-css.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ <h3>2. Striped table</h3>
600600
<div class="row">
601601
<div class="span4">
602602
<p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.</p>
603-
<p class="muted"><strong>Note:</strong> Sprited tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
603+
<p class="muted"><strong>Note:</strong> Striped tables use the <code>:nth-child</code> CSS selector and is not available in IE7-IE8.</p>
604604
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
605605
&lt;table class="table table-striped"&gt;
606606
…
@@ -914,7 +914,7 @@ <h2>Horizontal forms</h2>
914914
<div class="controls">
915915
<label class="checkbox">
916916
<input type="checkbox" id="optionsCheckbox" value="option1">
917-
Option one is this and that&mdash;be sure to include why it’s great
917+
Option one is this and that&mdash;be sure to include why it's great
918918
</label>
919919
</div>
920920
</div>
@@ -1145,7 +1145,7 @@ <h3>Form validation</h3>
11451145
<div class="controls">
11461146
<label class="checkbox">
11471147
<input type="checkbox" name="optionsCheckboxList1" value="option1">
1148-
Option one is this and that&mdash;be sure to include why it’s great
1148+
Option one is this and that&mdash;be sure to include why it's great
11491149
</label>
11501150
<label class="checkbox">
11511151
<input type="checkbox" name="optionsCheckboxList2" value="option2">
@@ -1163,7 +1163,7 @@ <h3>Form validation</h3>
11631163
<div class="controls">
11641164
<label class="radio">
11651165
<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
1166-
Option one is this and that&mdash;be sure to include why it’s great
1166+
Option one is this and that&mdash;be sure to include why it's great
11671167
</label>
11681168
<label class="radio">
11691169
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
@@ -1252,7 +1252,7 @@ <h3>Buttons for actions</h3>
12521252
</div>
12531253
<div class="span4">
12541254
<h3>For anchors and forms</h3>
1255-
<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>
1255+
<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>
12561256
</div>
12571257
<div class="span4">
12581258
<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>

‎components.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ <h3>Tabbable example</h3>
605605
<div class="span4">
606606
<h3>Custom jQuery plugin</h3>
607607
<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>
608-
<p><a class="btn" href="./javascript.html/#tabs">Get the javascript &rarr;</a></p>
608+
<p><a class="btn" href="./javascript.html#tabs">Get the javascript &rarr;</a></p>
609609
</div>
610610
</div>
611611

@@ -865,7 +865,7 @@ <h3>Nav links</h3>
865865
&lt;/ul&gt;
866866
</pre>
867867
<h3>Adding dropdowns</h3>
868-
<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>
868+
<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>
869869
<pre class="prettyprint linenums">
870870
&lt;ul class="nav"&gt;
871871
&lt;li class="dropdown"&gt;
@@ -881,7 +881,7 @@ <h3>Adding dropdowns</h3>
881881
&lt;/li&gt;
882882
&lt;/ul&gt;
883883
</pre>
884-
<p><a class="btn" href="./javascript.html/#dropdown">Get the javascript &rarr;</a></p>
884+
<p><a class="btn" href="./javascript.html#dropdown">Get the javascript &rarr;</a></p>
885885
</div><!-- /.span -->
886886
</div><!-- /.row -->
887887

@@ -1088,7 +1088,7 @@ <h1>Inline labels <small>Label and annotate text</small></h1>
10881088
</tr>
10891089
<tr>
10901090
<td>
1091-
<span class="label label-success">New</span>
1091+
<span class="label label-success">Success</span>
10921092
</td>
10931093
<td>
10941094
<code>&lt;span class="label label-success"&gt;New&lt;/span&gt;</code>
@@ -1295,25 +1295,25 @@ <h3>Example alerts</h3>
12951295
<p>Wrap your message and an optional close icon in a div with simple class.</p>
12961296
<div class="alert">
12971297
<a class="close">&times;</a>
1298-
<strong>Warning!</strong> Best check yo self, you’re not looking too good.
1298+
<strong>Warning!</strong> Best check yo self, you're not looking too good.
12991299
</div>
13001300
<pre class="prettyprint linenums">
13011301
&lt;div class="alert"&gt;
13021302
&lt;a class="close"&gt;&times;&lt;/a&gt;
1303-
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you’re not looking too good.
1303+
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you're not looking too good.
13041304
&lt;/div&gt;
13051305
</pre>
13061306
<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>
13071307
<div class="alert alert-block">
13081308
<a class="close">&times;</a>
13091309
<h4 class="alert-heading">Warning!</h4>
1310-
<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>
1310+
<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>
13111311
</div>
13121312
<pre class="prettyprint linenums">
13131313
&lt;div class="alert alert-block"&gt;
13141314
&lt;a class="close"&gt;&times;&lt;/a&gt;
13151315
&lt;h4 class="alert-heading"&gt;Warning!&lt;/h4&gt;
1316-
Best check yo self, you’re not...
1316+
Best check yo self, you're not...
13171317
&lt;/div&gt;
13181318
</pre>
13191319
</div>
@@ -1349,7 +1349,7 @@ <h3>Success</h3>
13491349
<h3>Information</h3>
13501350
<div class="alert alert-info">
13511351
<a class="close">&times;</a>
1352-
<strong>Heads up!</strong> This alert needs your attention, but it’s not super important.
1352+
<strong>Heads up!</strong> This alert needs your attention, but it's not super important.
13531353
</div>
13541354
<pre class="prettyprint linenums">
13551355
&lt;div class="alert alert-info"&gt;

‎examples.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h3>Basic marketing site</h3>
9595
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
9696
</a>
9797
<h3>Fluid layout</h3>
98-
<p>Uses are new responsive, fluid grid system to create seamless liquid layout.</p>
98+
<p>Uses our new responsive, fluid grid system to create seamless liquid layout.</p>
9999
</li>
100100
<li class="span4">
101101
<a class="thumbnail" href="examples/starter-template.html">

‎examples/fluid.html

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<div class="navbar-inner">
3838
<div class="container-fluid">
3939
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
40-
<span class="i-bar"></span>
41-
<span class="i-bar"></span>
42-
<span class="i-bar"></span>
40+
<span class="icon-bar"></span>
41+
<span class="icon-bar"></span>
42+
<span class="icon-bar"></span>
4343
</a>
4444
<a class="brand" href="#">Project name</a>
4545
<div class="nav-collapse">
@@ -128,14 +128,23 @@ <h2>Heading</h2>
128128
</footer>
129129

130130
</div><!--/.fluid-container-->
131-
132-
131+
133132
<!-- Le javascript
134133
================================================== -->
135134
<!-- Placed at the end of the document so the pages load faster -->
136-
<script src="../assets/js/tests/vendor/jquery.js"></script>
135+
<script src="../assets/js/jquery.js"></script>
137136
<script src="../assets/js/bootstrap-transition.js"></script>
137+
<script src="../assets/js/bootstrap-alert.js"></script>
138+
<script src="../assets/js/bootstrap-modal.js"></script>
139+
<script src="../assets/js/bootstrap-dropdown.js"></script>
140+
<script src="../assets/js/bootstrap-scrollspy.js"></script>
141+
<script src="../assets/js/bootstrap-tab.js"></script>
142+
<script src="../assets/js/bootstrap-tooltip.js"></script>
143+
<script src="../assets/js/bootstrap-popover.js"></script>
144+
<script src="../assets/js/bootstrap-button.js"></script>
138145
<script src="../assets/js/bootstrap-collapse.js"></script>
146+
<script src="../assets/js/bootstrap-carousel.js"></script>
147+
<script src="../assets/js/bootstrap-typeahead.js"></script>
139148

140149
</body>
141150
</html>

‎examples/hero.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<div class="navbar-inner">
3535
<div class="container">
3636
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
37-
<span class="i-bar"></span>
38-
<span class="i-bar"></span>
39-
<span class="i-bar"></span>
37+
<span class="icon-bar"></span>
38+
<span class="icon-bar"></span>
39+
<span class="icon-bar"></span>
4040
</a>
4141
<a class="brand" href="#">Project name</a>
4242
<div class="nav-collapse">
@@ -89,9 +89,19 @@ <h2>Heading</h2>
8989
<!-- Le javascript
9090
================================================== -->
9191
<!-- Placed at the end of the document so the pages load faster -->
92-
<script src="../assets/js/tests/vendor/jquery.js"></script>
92+
<script src="../assets/js/jquery.js"></script>
9393
<script src="../assets/js/bootstrap-transition.js"></script>
94+
<script src="../assets/js/bootstrap-alert.js"></script>
95+
<script src="../assets/js/bootstrap-modal.js"></script>
96+
<script src="../assets/js/bootstrap-dropdown.js"></script>
97+
<script src="../assets/js/bootstrap-scrollspy.js"></script>
98+
<script src="../assets/js/bootstrap-tab.js"></script>
99+
<script src="../assets/js/bootstrap-tooltip.js"></script>
100+
<script src="../assets/js/bootstrap-popover.js"></script>
101+
<script src="../assets/js/bootstrap-button.js"></script>
94102
<script src="../assets/js/bootstrap-collapse.js"></script>
103+
<script src="../assets/js/bootstrap-carousel.js"></script>
104+
<script src="../assets/js/bootstrap-typeahead.js"></script>
95105

96106
</body>
97107
</html>

‎examples/starter-template.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
<!-- Le styles -->
1515
<link href="../assets/css/bootstrap.css" rel="stylesheet">
16-
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
1716
<style>
1817
body {
1918
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
2019
}
2120
</style>
21+
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
2222

2323
<!-- Le fav and touch icons -->
2424
<link rel="shortcut icon" href="images/favicon.ico">
@@ -33,9 +33,9 @@
3333
<div class="navbar-inner">
3434
<div class="container">
3535
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
36-
<span class="i-bar"></span>
37-
<span class="i-bar"></span>
38-
<span class="i-bar"></span>
36+
<span class="icon-bar"></span>
37+
<span class="icon-bar"></span>
38+
<span class="icon-bar"></span>
3939
</a>
4040
<a class="brand" href="#">Project name</a>
4141
<div class="nav-collapse">
@@ -59,8 +59,7 @@ <h1>Bootstrap starter template</h1>
5959
<!-- Le javascript
6060
================================================== -->
6161
<!-- Placed at the end of the document so the pages load faster -->
62-
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
63-
<script src="../assets/js/tests/vendor/jquery.js"></script>
62+
<script src="../assets/js/jquery.js"></script>
6463
<script src="../assets/js/bootstrap-transition.js"></script>
6564
<script src="../assets/js/bootstrap-alert.js"></script>
6665
<script src="../assets/js/bootstrap-modal.js"></script>

‎javascript.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ <h2>Example alerts</h2>
910910
<p>The alerts plugin works on regular alert messages, and block messages.</p>
911911
<div class="alert fade in">
912912
<a class="close" data-dismiss="alert" href="#">&times;</a>
913-
<strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.
913+
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
914914
</div>
915915
<div class="alert alert-block alert-error fade in">
916916
<a class="close" data-dismiss="alert" href="#">&times;</a>

‎less.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ <h3>Typography</h3>
191191
<tr>
192192
<td><code>@baseFontFamily</code></td>
193193
<td><code>"Helvetica Neue", Helvetica, Arial, sans-serif</code></td>
194-
<td></td>
195194
</tr>
196195
<tr>
197196
<td><code>@baseLineHeight</code></td>

‎scaffolding.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,13 @@ <h2>Supported devices</h2>
338338
</tr>
339339
<tr>
340340
<td>Landscape tablets</td>
341-
<td>768px to 940px</td>
341+
<td>768px to 980px</td>
342342
<td>44px</td>
343343
<td>20px</td>
344344
</tr>
345345
<tr>
346346
<td>Default</td>
347-
<td>940px and up</td>
347+
<td>980px and up</td>
348348
<td>60px</td>
349349
<td>20px</td>
350350
</tr>
@@ -390,7 +390,7 @@ <h2>Using the media queries</h2>
390390
@media (max-width: 768px) { ... }
391391

392392
// Portrait tablet to landscape and desktop
393-
@media (min-width: 768px) and (max-width: 940px) { ... }
393+
@media (min-width: 768px) and (max-width: 980px) { ... }
394394

395395
// Large desktop
396396
@media (min-width: 1200px) { .. }

‎templates/pages/base-css.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@
524524
<div class="row">
525525
<div class="span4">
526526
<p>{{_i}}Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.table-striped</code> class.{{/i}}</p>
527-
<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>
527+
<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>
528528
<pre class="prettyprint linenums" style="margin-bottom: 18px;">
529529
&lt;table class="table table-striped"&gt;
530530
…
@@ -838,7 +838,7 @@
838838
<div class="controls">
839839
<label class="checkbox">
840840
<input type="checkbox" id="optionsCheckbox" value="option1">
841-
{{_i}}Option one is this and that&mdash;be sure to include why it’s great{{/i}}
841+
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
842842
</label>
843843
</div>
844844
</div>
@@ -1069,7 +1069,7 @@
10691069
<div class="controls">
10701070
<label class="checkbox">
10711071
<input type="checkbox" name="optionsCheckboxList1" value="option1">
1072-
{{_i}}Option one is this and that&mdash;be sure to include why it’s great{{/i}}
1072+
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
10731073
</label>
10741074
<label class="checkbox">
10751075
<input type="checkbox" name="optionsCheckboxList2" value="option2">
@@ -1087,7 +1087,7 @@
10871087
<div class="controls">
10881088
<label class="radio">
10891089
<input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
1090-
{{_i}}Option one is this and that&mdash;be sure to include why it’s great{{/i}}
1090+
{{_i}}Option one is this and that&mdash;be sure to include why it's great{{/i}}
10911091
</label>
10921092
<label class="radio">
10931093
<input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
@@ -1176,7 +1176,7 @@
11761176
</div>
11771177
<div class="span4">
11781178
<h3>{{_i}}For anchors and forms{{/i}}</h3>
1179-
<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>
1179+
<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>
11801180
</div>
11811181
<div class="span4">
11821182
<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>

0 commit comments

Comments
 (0)