diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-10-05 15:03:08 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-05 15:27:43 +0200 |
| commit | 485a2a7af4ddeb861861c0669be8158ff54d90c9 (patch) | |
| tree | b23fd179008c2375cc4d7a6e45abe2fe667716d3 | |
| parent | c9396bc7c5b7b55fd01ec63279f5ab4223c0a184 (diff) | |
| download | gitlab-ce-flash-cherry-pick-error.tar.gz | |
Make flash-alert background transparent to match flash-notice.flash-cherry-pick-error
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/flash.scss | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index d424fbe43b8..da32b2389aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,6 +33,7 @@ v 8.13.0 (unreleased) - Only update issuable labels if they have been changed - Take filters in account in issuable counters. !6496 - Use custom Ruby images to test builds (registry.dev.gitlab.org/gitlab/gitlab-build-images:*) + - Prevent flash alert text from being obscured when container is fluid - Append issue template to existing description !6149 (Joseph Frazier) - Revoke button in Applications Settings underlines on hover. - Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska) diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 3ac1678dd05..a55dcf4a699 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -21,7 +21,8 @@ .flash-notice, .flash-alert { border-radius: $border-radius-default; - .container-fluid.container-limited.flash-text { + .container-fluid, + .container-fluid.container-limited { background: transparent; } } @@ -35,12 +36,6 @@ } } -.content-wrapper { - .flash-notice .container-fluid { - background-color: transparent; - } -} - @media (max-width: $screen-md-min) { ul.notes { .flash-container.timeline-content { |