diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-27 22:53:10 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-27 22:53:10 +0000 |
| commit | e0e813bd03e3f4d8b025093b7aae59dd692b1fdd (patch) | |
| tree | 78f2c83c1a91afaa402715a2d363054164ed3b27 | |
| parent | eceb873c7e4beb353634504d9f77b777db9f4ffd (diff) | |
| parent | bba98475266fa08dcc88b373c5ad1131fb72caa8 (diff) | |
| download | gitlab-ce-e0e813bd03e3f4d8b025093b7aae59dd692b1fdd.tar.gz | |
Merge branch '_acet-fix-flash-styling' into 'master'
Always prefer flash-text as display block
Closes #53920
See merge request gitlab-org/gitlab-ce!23382
| -rw-r--r-- | app/assets/stylesheets/framework/flash.scss | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/_acet-fix-flash-styling.yml | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 7a4c3914fb0..afa85f0e4ae 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -32,16 +32,16 @@ margin: 0; } + .flash-text, + .flash-action { + display: inline-block; + } + .flash-alert { @extend .alert; background-color: $red-500; margin: 0; - .flash-text, - .flash-action { - display: inline-block; - } - .flash-action { margin-left: 5px; text-decoration: none; diff --git a/changelogs/unreleased/_acet-fix-flash-styling.yml b/changelogs/unreleased/_acet-fix-flash-styling.yml new file mode 100644 index 00000000000..57354c04899 --- /dev/null +++ b/changelogs/unreleased/_acet-fix-flash-styling.yml @@ -0,0 +1,5 @@ +--- +title: Fix flash notice styling for fluid layout +merge_request: 23382 +author: +type: fixed |