adding warning (orange) button, fix responsive navbar problem

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 682dbbc7f1c8b8edd55d37ded9bd9f54dd7cafe3..78d7f57a421f46be5d2c8f08e85289ac2ebe2d13 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 8d2743709062eceab958e6cddbadbd3db34aa3e9..8fe389563a31287b52e80fbb09eb4dbc244b943d 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -195,11 +195,11 @@
   .row-fluid:after {
     clear: both;
   }
-  .row-fluid [class*="span"] {
+  .row-fluid > [class*="span"] {
     float: left;
     margin-left: 2.762430939%;
   }
-  .row-fluid [class*="span"]:first-child {
+  .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
   .row-fluid .span1 {
@@ -288,6 +288,7 @@
     background-image: none;
   }
   .navbar .container {
+    width: auto;
     padding: 0;
   }
   .navbar .brand {
@@ -476,11 +477,11 @@
   .row-fluid:after {
     clear: both;
   }
-  .row-fluid [class*="span"] {
+  .row-fluid > [class*="span"] {
     float: left;
     margin-left: 2.564102564%;
   }
-  .row-fluid [class*="span"]:first-child {
+  .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
   .row-fluid .span1 {

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 61e5e3e588f1358965a699e538aaf65349c2f8c4..7d987a56ccb3853ca4b1c1c11e12605988a72b43 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -205,11 +205,11 @@ a:hover {
 .row-fluid:after {
   clear: both;
 }
-.row-fluid [class*="span"] {
+.row-fluid > [class*="span"] {
   float: left;
   margin-left: 2.127659574%;
 }
-.row-fluid [class*="span"]:first-child {
+.row-fluid > [class*="span"]:first-child {
   margin-left: 0;
 }
 .row-fluid .span1 {
@@ -1655,6 +1655,8 @@ table .span12 {
 }
 .btn.primary,
 .btn.primary:hover,
+.btn.warning,
+.btn.warning:hover,
 .btn.danger,
 .btn.danger:hover,
 .btn.success,
@@ -1665,6 +1667,7 @@ table .span12 {
   color: #ffffff;
 }
 .btn.primary.active,
+.btn.warning.active,
 .btn.danger.active,
 .btn.success.active,
 .btn.info.active {
@@ -1694,6 +1697,30 @@ table .span12 {
 .btn.primary:active, .btn.primary.active {
   background-color: #003399 \9;
 }
+.btn.warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn.warning:hover,
+.btn.warning:active,
+.btn.warning.active,
+.btn.warning.disabled,
+.btn.warning[disabled] {
+  background-color: #f89406;
+}
+.btn.warning:active, .btn.warning.active {
+  background-color: #c67605 \9;
+}
 .btn.danger {
   background-color: #da4f49;
   background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);

diff --git a/docs/base-css.html b/docs/base-css.html
index b76ace1e24f7577dea818c5a55c65f630e85847f..5df63b917df046e960a081628e0b94451cf74c4e 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1229,6 +1229,11 @@ For example, <code>section</code> should be wrapped as inline.
         <td><code>.success</code></td>
         <td>Indicates a successful or positive action</td>
       </tr>
+      <tr>
+        <td><a class="btn warning" href="#">Warning</a></td>
+        <td><code>.warning</code></td>
+        <td>Indicates caution should be taken with this action</td>
+      </tr>
       <tr>
         <td><a class="btn danger" href="#">Danger</a></td>
         <td><code>.danger</code></td>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 95de45e093c6f47e017635a7aedaebcb382b82c4..433a18c885dd863474fd1bdf0b53e8f529907afe 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1153,6 +1153,11 @@
         <td><code>.success</code></td>
         <td>{{_i}}Indicates a successful or positive action{{/i}}</td>
       </tr>
+      <tr>
+        <td><a class="btn warning" href="#">{{_i}}Warning{{/i}}</a></td>
+        <td><code>.warning</code></td>
+        <td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
+      </tr>
       <tr>
         <td><a class="btn danger" href="#">{{_i}}Danger{{/i}}</a></td>
         <td><code>.danger</code></td>

diff --git a/less/buttons.less b/less/buttons.less
index d5a4353b328b12f713ec9e546b93bffa8e6c028f..2bc457f65266afaed8b99581f11844fc07aef321 100644 (file)
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -9,6 +9,8 @@
   // Set text color
   &.primary,
   &.primary:hover,
+  &.warning,
+  &.warning:hover,
   &.danger,
   &.danger:hover,
   &.success,
@@ -19,6 +21,7 @@
     color: @white
   }
   &.primary.active,
+  &.warning.active,
   &.danger.active,
   &.success.active,
   &.info.active {
@@ -27,6 +30,10 @@
   &.primary {
     .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
   }
+  // Warning appears are orange
+  &.warning {
+    .buttonBackground(lighten(@orange, 15%), @orange);
+  }
   // Danger and error appear as red
   &.danger {
     .buttonBackground(#ee5f5b, #bd362f);

diff --git a/less/mixins.less b/less/mixins.less
index 804f834e5691d18ac2e8bf12beb07306219ea3ce..545ccb9bad3d5b316f73745dc0b7450dfada61dc 100644 (file)
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -212,10 +212,10 @@
       .clearfix();
 
       // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
-      [class*="span"] {
+      > [class*="span"] {
         #fluidGridSystem > .gridColumn(@fluidGridGutterWidth);
       }
-      [class*="span"]:first-child {
+      > [class*="span"]:first-child {
         margin-left: 0;
       }
       // Default columns

diff --git a/less/responsive.less b/less/responsive.less
index 4a9fc6fb81e4d83ceda90280a3faae459103d3a5..e9920251eaf65d4eca545b79fc92535db331d568 100644 (file)
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -184,6 +184,7 @@
     background-image: none;
   }
   .navbar .container {
+    width: auto;
     padding: 0;
   }
   // Account for brand name