diff options
| author | Mark Otto <[email protected]> | 2011-08-25 22:41:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-25 22:41:45 -0700 |
| commit | ce615d016a8ac380dae871358cfc7e745b5e20c2 (patch) | |
| tree | ddde1c9abb56c15aba88ace812e490486bf14d95 /lib | |
| parent | 04b8e667d0a8caaf241570721bbf7afb7a5e1b2d (diff) | |
| download | bootstrap-ce615d016a8ac380dae871358cfc7e745b5e20c2.tar.xz bootstrap-ce615d016a8ac380dae871358cfc7e745b5e20c2.zip | |
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 5 | ||||
| -rw-r--r-- | lib/preboot.less | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index b96a97198..be5394df5 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -374,7 +374,7 @@ input[type=submit].btn { // ------------ // Base alert styles -.alert { +.alert-message { .gradientBar(#fceec1, #eedc94); // warning by default margin-bottom: @baseline; padding: 7px 14px; @@ -416,8 +416,7 @@ input[type=submit].btn { } } - &.alert-block, - &.alert-block:hover { + &.block-message { background-image: none; background-color: lighten(#fceec1, 5%); padding: 14px; diff --git a/lib/preboot.less b/lib/preboot.less index 344876873..5191c5cc5 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -192,8 +192,7 @@ // Shared colors for buttons and alerts .btn, -.alert { - +.alert-message { &.danger, &.danger:hover, &.error, @@ -217,7 +216,6 @@ &.info { .gradientBar(#6bd0ee, #36b3d9); } - } // Gradients |