From 8fd177bfa78d3e742486a66450465f3716cd11b2 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 7 Jan 2014 22:24:45 +0100
Subject: Fix #12073: Consistent order of variations

This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
---
 docs/css.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'docs/css.html')

diff --git a/docs/css.html b/docs/css.html
index e1adcaaa4..d96bf367e 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1312,21 +1312,21 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
           </tr>
           <tr>
             <td>
-              <code>.warning</code>
+              <code>.info</code>
             </td>
-            <td>Indicates a warning that might need attention</td>
+            <td>Indicates a neutral informative change or action</td>
           </tr>
           <tr>
             <td>
-              <code>.danger</code>
+              <code>.warning</code>
             </td>
-            <td>Indicates a dangerous or potentially negative action</td>
+            <td>Indicates a warning that might need attention</td>
           </tr>
           <tr>
             <td>
-              <code>.info</code>
+              <code>.danger</code>
             </td>
-            <td>Indicates a neutral informative change or action</td>
+            <td>Indicates a dangerous or potentially negative action</td>
           </tr>
         </tbody>
       </table>
@@ -1366,7 +1366,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
             <td>Column content</td>
             <td>Column content</td>
           </tr>
-          <tr class="warning">
+          <tr class="info">
             <td>5</td>
             <td>Column content</td>
             <td>Column content</td>
@@ -1378,7 +1378,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
             <td>Column content</td>
             <td>Column content</td>
           </tr>
-          <tr class="danger">
+          <tr class="warning">
             <td>7</td>
             <td>Column content</td>
             <td>Column content</td>
@@ -1390,7 +1390,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
             <td>Column content</td>
             <td>Column content</td>
           </tr>
-          <tr class="info">
+          <tr class="danger">
             <td>9</td>
             <td>Column content</td>
             <td>Column content</td>
@@ -2848,17 +2848,17 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <div class="color-swatches">
         <div class="color-swatch brand-primary"></div>
         <div class="color-swatch brand-success"></div>
+        <div class="color-swatch brand-info"></div>
         <div class="color-swatch brand-warning"></div>
         <div class="color-swatch brand-danger"></div>
-        <div class="color-swatch brand-info"></div>
       </div>
     </div>
 {% highlight css %}
 @brand-primary: #428bca;
 @brand-success: #5cb85c;
+@brand-info:    #5bc0de;
 @brand-warning: #f0ad4e;
 @brand-danger:  #d9534f;
-@brand-info:    #5bc0de;
 {% endhighlight %}
 
     <p>Use any of these color variables as they are or reassign them to more meaningful variables for your project.</p>
-- 
cgit v1.2.3


From 7e16425acb0af58f72af4e2cd06cb30b1d6876e8 Mon Sep 17 00:00:00 2001
From: wangsai <wangsai@bootcss.com>
Date: Wed, 8 Jan 2014 16:22:50 +0800
Subject: no preboot

---
 docs/css.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/css.html')

diff --git a/docs/css.html b/docs/css.html
index d96bf367e..3630acd12 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -2983,7 +2983,7 @@ a {
 {% endhighlight %}
 
     <h3 id="less-mixins-rounded-corners">Rounded corners</h3>
-    <p>Today all modern browsers support the non-prefixed <code>border-radius</code> property. As such, there is no <code>.border-radius()</code> mixin, but Preboot does include shortcuts for quickly rounding two corners on a particular side of an object.</p>
+    <p>Today all modern browsers support the non-prefixed <code>border-radius</code> property. As such, there is no <code>.border-radius()</code> mixin, but Bootstrap does include shortcuts for quickly rounding two corners on a particular side of an object.</p>
 {% highlight css %}
 .border-top-radius(@radius) {
   border-top-right-radius: @radius;
@@ -3278,7 +3278,7 @@ a {
 {% endhighlight %}
 
     <h3 id="less-mixins-retina-images">Retina images</h3>
-    <p>Specify two image paths and the @1x image dimensions, and Preboot will provide an @2x media query. <strong>If you have many images to serve, consider writing your retina image CSS manually in a single media query.</strong></p>
+    <p>Specify two image paths and the @1x image dimensions, and Bootstrap will provide an @2x media query. <strong>If you have many images to serve, consider writing your retina image CSS manually in a single media query.</strong></p>
 {% highlight css %}
 .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
   background-image: url("@{file-1x}");
-- 
cgit v1.2.3