mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 15:50:01 +02:00
Code Issues Releases Wiki Activity

adding warning (orange) button, fix responsive navbar problem

Browse Source
This commit is contained in:
Mark Otto
2012-01-30 08:15:28 -08:00
parent a29dee44ac
commit 2d40b07afc
8 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

9
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -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 {

31
docs/assets/css/bootstrap.css vendored
View File

@@ -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);

5
docs/base-css.html
View File

@@ -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>

5
docs/templates/pages/base-css.mustache vendored
View File

@@ -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>