diff options
| author | Mark Otto <[email protected]> | 2012-01-30 08:15:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-30 08:15:28 -0800 |
| commit | 2d40b07afc62ce9d899a290ab33222fd18287190 (patch) | |
| tree | 350c8853d5ee38cd16c3b6de55f380e58a92e192 /less | |
| parent | a29dee44aca68585b04ef5156dd4f0a50ae70db0 (diff) | |
| download | bootstrap-2d40b07afc62ce9d899a290ab33222fd18287190.tar.xz bootstrap-2d40b07afc62ce9d899a290ab33222fd18287190.zip | |
adding warning (orange) button, fix responsive navbar problem
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 7 | ||||
| -rw-r--r-- | less/mixins.less | 4 | ||||
| -rw-r--r-- | less/responsive.less | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/less/buttons.less b/less/buttons.less index d5a4353b3..2bc457f65 100644 --- 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 804f834e5..545ccb9ba 100644 --- 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 4a9fc6fb8..e9920251e 100644 --- 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 |