mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-28 20:52:21 +01:00
restore alerts, and make them suck much less
This commit is contained in:
parent
0b81dd217f
commit
baa8c3ec9e
60
docs/assets/css/bootstrap.css
vendored
60
docs/assets/css/bootstrap.css
vendored
@ -2550,8 +2550,8 @@ fieldset[disabled] .btn-link:hover {
|
||||
color: #000;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
opacity: 0.4;
|
||||
filter: alpha(opacity=40);
|
||||
opacity: 0.5;
|
||||
filter: alpha(opacity=50);
|
||||
}
|
||||
|
||||
button.close {
|
||||
@ -4058,6 +4058,62 @@ button.close {
|
||||
border-right-width: 0;
|
||||
}
|
||||
|
||||
.alert {
|
||||
padding: 8px 35px 8px 14px;
|
||||
margin-bottom: 20px;
|
||||
color: #c09853;
|
||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||
background-color: #fcf8e3;
|
||||
border: 1px solid #fbeed5;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.alert h4 {
|
||||
margin-top: 0;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.alert .close {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
right: -21px;
|
||||
line-height: 20px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.alert-success {
|
||||
color: #468847;
|
||||
background-color: #dff0d8;
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.alert-danger,
|
||||
.alert-error {
|
||||
color: #b94a48;
|
||||
background-color: #f2dede;
|
||||
border-color: #eed3d7;
|
||||
}
|
||||
|
||||
.alert-info {
|
||||
color: #3a87ad;
|
||||
background-color: #d9edf7;
|
||||
border-color: #bce8f1;
|
||||
}
|
||||
|
||||
.alert-block {
|
||||
padding-top: 14px;
|
||||
padding-bottom: 14px;
|
||||
}
|
||||
|
||||
.alert-block > p,
|
||||
.alert-block > ul {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.alert-block p + p {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.thumbnail {
|
||||
display: block;
|
||||
padding: 4px;
|
||||
|
@ -264,7 +264,8 @@ section > ul li {
|
||||
.bs-docs-example > select:last-child,
|
||||
.bs-docs-example > textarea:last-child,
|
||||
.bs-docs-example > .table:last-child,
|
||||
.bs-docs-example > .jumbotron:last-child {
|
||||
.bs-docs-example > .jumbotron:last-child,
|
||||
.bs-docs-example > .alert:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
|
@ -10,17 +10,15 @@
|
||||
padding: 8px 35px 8px 14px;
|
||||
margin-bottom: @line-height-base;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
||||
color: @state-warning-text;
|
||||
background-color: @state-warning-background;
|
||||
border: 1px solid @state-warning-border;
|
||||
border-radius: @border-radius-base;
|
||||
}
|
||||
.alert,
|
||||
.alert h4 {
|
||||
margin-top: 0;
|
||||
// Specified for the h4 to prevent conflicts of changing @headingsColor
|
||||
color: @state-warning-text;
|
||||
}
|
||||
.alert h4 {
|
||||
margin: 0;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
// Adjust close link position
|
||||
@ -29,9 +27,9 @@
|
||||
top: -2px;
|
||||
right: -21px;
|
||||
line-height: @line-height-base;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
|
||||
// Alternate styles
|
||||
// -------------------------
|
||||
|
||||
@ -40,28 +38,17 @@
|
||||
border-color: @state-success-border;
|
||||
color: @state-success-text;
|
||||
}
|
||||
.alert-success h4 {
|
||||
color: @state-success-text;
|
||||
}
|
||||
.alert-danger,
|
||||
.alert-error {
|
||||
background-color: @state-error-background;
|
||||
border-color: @state-error-border;
|
||||
color: @state-error-text;
|
||||
}
|
||||
.alert-danger h4,
|
||||
.alert-error h4 {
|
||||
color: @state-error-text;
|
||||
}
|
||||
.alert-info {
|
||||
background-color: @state-info-background;
|
||||
border-color: @state-info-border;
|
||||
color: @state-info-text;
|
||||
}
|
||||
.alert-info h4 {
|
||||
color: @state-info-text;
|
||||
}
|
||||
|
||||
|
||||
// Block alerts
|
||||
// -------------------------
|
||||
|
1
less/bootstrap.less
vendored
1
less/bootstrap.less
vendored
@ -46,6 +46,7 @@
|
||||
@import "popovers.less";
|
||||
|
||||
// Components: Misc
|
||||
@import "alerts.less";
|
||||
@import "thumbnails.less";
|
||||
@import "media.less";
|
||||
@import "badges.less";
|
||||
|
@ -15,7 +15,7 @@
|
||||
color: #000;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
.opacity(40);
|
||||
.opacity(50);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user