root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Match order of vars to order of components; darken some alert borders

This commit is contained in:
Mark Otto 2013-09-08 16:58:56 -07:00
parent 16279056ae
commit afb6cf1d01
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/css/bootstrap.css vendored
View File

@ -1575,7 +1575,7 @@ table th[class*="col-"] {
.table > tbody > tr.warning > th, .table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th { .table > tfoot > tr.warning > th {
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #fbeed5; border-color: #faebcc;
} }
.table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > td.warning:hover,
@ -1583,7 +1583,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr.warning:hover > th { .table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc; background-color: #faf2cc;
border-color: #f8e5be; border-color: #f7e1b5;
} }
@media (max-width: 768px) { @media (max-width: 768px) {
@ -5131,11 +5131,11 @@ a.thumbnail:focus {
.alert-warning { .alert-warning {
color: #c09853; color: #c09853;
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #fbeed5; border-color: #faebcc;
} }
.alert-warning hr { .alert-warning hr {
border-top-color: #f8e5be; border-top-color: #f7e1b5;
} }
.alert-warning .alert-link { .alert-warning .alert-link {
@ -5590,21 +5590,21 @@ a.list-group-item:focus {
} }
.panel-warning { .panel-warning {
border-color: #fbeed5; border-color: #faebcc;
} }
.panel-warning > .panel-heading { .panel-warning > .panel-heading {
color: #c09853; color: #c09853;
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #fbeed5; border-color: #faebcc;
} }
.panel-warning > .panel-heading + .panel-collapse .panel-body { .panel-warning > .panel-heading + .panel-collapse .panel-body {
border-top-color: #fbeed5; border-top-color: #faebcc;
} }
.panel-warning > .panel-footer + .panel-collapse .panel-body { .panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5; border-bottom-color: #faebcc;
} }
.panel-danger { .panel-danger {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
less/variables.less
View File

@ -373,14 +373,6 @@
// Form states and alerts // Form states and alerts
// ------------------------- // -------------------------
@state-warning-text: #c09853;
@state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
@state-danger-text: #b94a48;
@state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
@state-success-text: #468847; @state-success-text: #468847;
@state-success-bg: #dff0d8; @state-success-bg: #dff0d8;
@state-success-border: darken(spin(@state-success-bg, -10), 5%); @state-success-border: darken(spin(@state-success-bg, -10), 5%);
@ -389,6 +381,14 @@
@state-info-bg: #d9edf7; @state-info-bg: #d9edf7;
@state-info-border: darken(spin(@state-info-bg, -10), 7%); @state-info-border: darken(spin(@state-info-bg, -10), 7%);
@state-warning-text: #c09853;
@state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
@state-danger-text: #b94a48;
@state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
// Tooltips // Tooltips
// ------------------------- // -------------------------