2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

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

This commit is contained in:
Mark Otto
2011-08-25 22:41:45 -07:00
parent 04b8e667d0
commit ce615d016a
6 changed files with 108 additions and 125 deletions
+2 -3
View File
@@ -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;