diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /less/alerts.less | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/alerts.less')
| -rw-r--r-- | less/alerts.less | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/less/alerts.less b/less/alerts.less index df070b8ab..5618bfcec 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -18,6 +18,7 @@ // Specified for the h4 to prevent conflicts of changing @headings-color color: inherit; } + // Provide class for links that match alerts .alert-link { font-weight: @alert-link-font-weight; @@ -28,6 +29,7 @@ > ul { margin-bottom: 0; } + > p + p { margin-top: 5px; } @@ -57,12 +59,15 @@ .alert-success { .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text); } + .alert-info { .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text); } + .alert-warning { .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text); } + .alert-danger { .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text); } |