diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 21:34:37 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 21:34:37 +0000 |
| commit | 7e493b11546f15f7871a249474edf6afd418af89 (patch) | |
| tree | 440c62febc6e00443a5c9022e9158d58f0247d79 /config | |
| parent | 2d9c8f44659ffd09dd073358a7862f033ca468d8 (diff) | |
| parent | 485a2a7af4ddeb861861c0669be8158ff54d90c9 (diff) | |
| download | gitlab-ce-7e493b11546f15f7871a249474edf6afd418af89.tar.gz | |
Merge branch 'flash-cherry-pick-error' into 'master'
Prevent flash alert text from being obscured when container is fluid
## What does this MR do?
Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/a2af7790) that causes the text within server-initiated flash *alerts* (not flash *notices*) to be obscured when `.container-fluid` is applied. It was reported in relation to a cherry-picking flash alert, but the problem occurs with all server-initiated flash alerts contained by a fluid container.
## Are there points in the code the reviewer needs to double check?
Note that as part of this fix, I combined some duplicate code and removed `.flash-text` & `.content-wrapper` selectors as they didn't seem to be necessary.
I manually tested JS-initiated Flash alerts to make sure this doesn't affect their appearance. I also grepped around for anything else that might depend on these styles. Everything checked out. But... can *you* see something this is going to break?
## Why was this MR needed?
Affected users can't read flash alerts.
## Screenshots (if relevant)
Before:
After:
JS-initiated flash alert (unaffected):
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/22915
cc: @jschatz1
See merge request !6694
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions