vendor/assets/stylesheets/bootstrap/_alerts.scss in bootstrap-sass-2.0.4.2 vs vendor/assets/stylesheets/bootstrap/_alerts.scss in bootstrap-sass-2.1.0.0

- old
+ new

@@ -1,55 +1,64 @@ -// ALERT STYLES -// ------------ +// +// Alerts +// -------------------------------------------------- -// Base alert styles + +// Base styles +// ------------------------- + .alert { padding: 8px 35px 8px 14px; margin-bottom: $baseLineHeight; text-shadow: 0 1px 0 rgba(255,255,255,.5); background-color: $warningBackground; border: 1px solid $warningBorder; @include border-radius(4px); color: $warningText; } -.alert-heading { - color: inherit; +.alert h4 { + margin: 0; } // Adjust close link position .alert .close { position: relative; top: -2px; right: -21px; - line-height: 18px; + line-height: $baseLineHeight; } + // Alternate styles -// ---------------- +// ------------------------- .alert-success { background-color: $successBackground; border-color: $successBorder; color: $successText; } -.alert-danger, .alert-error { +.alert-danger, +.alert-error { background-color: $errorBackground; border-color: $errorBorder; color: $errorText; } .alert-info { background-color: $infoBackground; border-color: $infoBorder; color: $infoText; } + // Block alerts -// ------------------------ +// ------------------------- + .alert-block { padding-top: 14px; padding-bottom: 14px; } -.alert-block > p, .alert-block > ul { +.alert-block > p, +.alert-block > ul { margin-bottom: 0; } .alert-block p + p { margin-top: 5px; } \ No newline at end of file