Merge branch '2.0-wip'

Conflicts: docs/assets/bootstrap.zip
joelost · Feb 1, 2012 · bdfb05d · bdfb05d
2 parents cabba91 + c8fad25
commit bdfb05d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 54 deletions.
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
@@ -72,13 +72,14 @@
   </ul>
   <h3>{{_i}}Buttons{{/i}}</h3>
   <ul>
+    <li>{{_i}}New classes for colors and sizes, all prefixed with <code>.btn-</code>{{/i}}</li>
     <li>{{_i}}IE9: removed gradients and added rounded corners{{/i}}</li>
     <li>{{_i}}Updated active state to make styling clearer in button groups (new) and look better with custom transition{{/i}}</li>
     <li>{{_i}}New mixin, <code>.buttonBackground</code>, to set button gradients{{/i}}</li>
   </ul>
   <h3>{{_i}}Forms{{/i}}</h3>
   <ul>
-    <li>{{_i}}Default form style is now vertical (stacked_ to use less CSS and add greater flexibility{{/i}}</li>
+    <li>{{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}</li>
     <li>{{_i}}Form classes standardized with <code>.form-</code> required as a prefix{{/i}}</li>
     <li>{{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}</li>
     <li>{{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code>{{/i}}</li>
@@ -87,8 +88,8 @@
   <h3>{{_i}}Icons, by Glyphicons{{/i}}</h3>
   <ul>
     <li>{{_i}}New Glyphicons Halflings icon set added in sprite form, in black and white{{/i}}</li>
-    <li>{{_i}}Simple markup required for an icon in tons of contexts: <code>&lt;i class="icon cog"&gt;&lt;/&gt;</code>{{/i}}</li>
-    <li>{{_i}}Add another class, <code>.white</code>, for white variation of the same icon{{/i}}</li>
+    <li>{{_i}}Simple markup required for an icon in tons of contexts: <code>&lt;i class="icon-cog"&gt;&lt;/&gt;</code>{{/i}}</li>
+    <li>{{_i}}Add another class, <code>.icon-white</code>, for white variation of the same icon{{/i}}</li>
   </ul>
 </section>
 
@@ -110,7 +111,7 @@
   <ul>
     <li>{{_i}}Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code>{{/i}}</li>
     <li>{{_i}}New nav list variation added that uses the same base class, <code>.nav</code>{{/i}}</li>
-    <li>{{_i}}Vertical tabs and pills have been added&mdash;just add <code>.stacked</code> to the <code>&lt;ul&gt;</code>{{/i}}</li>
+    <li>{{_i}}Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code>{{/i}}</li>
     <li>{{_i}}Pills were restyled to be less rounded by default{{/i}}</li>
     <li>{{_i}}Pills now have dropdown menu support (they share the same markup and styles as tabs){{/i}}</li>
   </ul>
@@ -165,34 +166,18 @@
   <div class="page-header">
     <h1>{{_i}}Javascript plugins{{/i}}</h1>
   </div>
+  <div class="alert alert-info">
+    <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.{{/i}}
+  </div>
   <h3>{{_i}}Popovers{{/i}}</h3>
   <ul>
     <li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>
   </ul>
-</section>
-
-
-
-<!-- LESS
-================================================== -->
-<section id="less">
-  <div class="page-header">
-    <h1>{{_i}}Using LESS{{/i}}</h1>
-  </div>
-  <h3>{{_i}}Variables{{/i}}</h3>
-  <h3>{{_i}}Mixins{{/i}}</h3>
-</section>
-
-
-
-<!-- Customize
-================================================== -->
-<section id="less">
-  <div class="page-header">
-    <h1>{{_i}}Customize page{{/i}}</h1>
-  </div>
+  <h3>{{_i}}New plugins{{/i}}</h3>
   <ul>
-    <li>{{_i}}New in 2.0{{/i}}</li>
+    <li>{{_i}}<a href="./javascript.html#collapse">Collapse</a>{{/i}}</li>
+    <li>{{_i}}<a href="./javascript.html#carousel">Carousel</a>{{/i}}</li>
+    <li>{{_i}}<a href="./javascript.html#typeahead">Typeahead</a>{{/i}}</li>
   </ul>
 </section>
 
diff --git a/docs/upgrading.html b/docs/upgrading.html
@@ -148,13 +148,14 @@ <h3>Tables</h3>
   </ul>
   <h3>Buttons</h3>
   <ul>
+    <li>New classes for colors and sizes, all prefixed with <code>.btn-</code></li>
     <li>IE9: removed gradients and added rounded corners</li>
     <li>Updated active state to make styling clearer in button groups (new) and look better with custom transition</li>
     <li>New mixin, <code>.buttonBackground</code>, to set button gradients</li>
   </ul>
   <h3>Forms</h3>
   <ul>
-    <li>Default form style is now vertical (stacked_ to use less CSS and add greater flexibility</li>
+    <li>Default form style is now vertical (stacked) to use less CSS and add greater flexibility</li>
     <li>Form classes standardized with <code>.form-</code> required as a prefix</li>
     <li>New built-in form defaults for search, inline, and horizontal forms</li>
     <li>More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code></li>
@@ -163,8 +164,8 @@ <h3>Forms</h3>
   <h3>Icons, by Glyphicons</h3>
   <ul>
     <li>New Glyphicons Halflings icon set added in sprite form, in black and white</li>
-    <li>Simple markup required for an icon in tons of contexts: <code>&lt;i class="icon cog"&gt;&lt;/&gt;</code></li>
-    <li>Add another class, <code>.white</code>, for white variation of the same icon</li>
+    <li>Simple markup required for an icon in tons of contexts: <code>&lt;i class="icon-cog"&gt;&lt;/&gt;</code></li>
+    <li>Add another class, <code>.icon-white</code>, for white variation of the same icon</li>
   </ul>
 </section>
 
@@ -186,7 +187,7 @@ <h3>Navigation</h3>
   <ul>
     <li>Tabs and pills now require the use of a new base class, <code>.nav</code>, on their <code>&lt;ul&gt;</code></li>
     <li>New nav list variation added that uses the same base class, <code>.nav</code></li>
-    <li>Vertical tabs and pills have been added&mdash;just add <code>.stacked</code> to the <code>&lt;ul&gt;</code></li>
+    <li>Vertical tabs and pills have been added&mdash;just add <code>.nav-stacked</code> to the <code>&lt;ul&gt;</code></li>
     <li>Pills were restyled to be less rounded by default</li>
     <li>Pills now have dropdown menu support (they share the same markup and styles as tabs)</li>
   </ul>
@@ -241,34 +242,18 @@ <h3>Miscellaneous components</h3>
   <div class="page-header">
     <h1>Javascript plugins</h1>
   </div>
+  <div class="alert alert-info">
+    <strong>Heads up!</strong> We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.
+  </div>
   <h3>Popovers</h3>
   <ul>
     <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
   </ul>
-</section>
-
-
-
-<!-- LESS
-================================================== -->
-<section id="less">
-  <div class="page-header">
-    <h1>Using LESS</h1>
-  </div>
-  <h3>Variables</h3>
-  <h3>Mixins</h3>
-</section>
-
-
-
-<!-- Customize
-================================================== -->
-<section id="less">
-  <div class="page-header">
-    <h1>Customize page</h1>
-  </div>
+  <h3>New plugins</h3>
   <ul>
-    <li>New in 2.0</li>
+    <li><a href="./javascript.html#collapse">Collapse</a></li>
+    <li><a href="./javascript.html#carousel">Carousel</a></li>
+    <li><a href="./javascript.html#typeahead">Typeahead</a></li>
   </ul>
 </section>