2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

adding warning (orange) button, fix responsive navbar problem

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
+7
View File
@@ -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);
+2 -2
View File
@@ -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
+1
View File
@@ -184,6 +184,7 @@
background-image: none;
}
.navbar .container {
width: auto;
padding: 0;
}
// Account for brand name