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:
+2
-3
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user