diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /scss/_alert.scss | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'scss/_alert.scss')
| -rw-r--r-- | scss/_alert.scss | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scss/_alert.scss b/scss/_alert.scss index aaa2a1da5..e52e957b5 100644 --- a/scss/_alert.scss +++ b/scss/_alert.scss @@ -20,7 +20,6 @@ // Headings for larger alerts .alert-heading { - margin-top: 0; // Specified to prevent conflicts of changing $headings-color color: inherit; } |