diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-02 21:33:12 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-02 21:33:12 +0000 |
| commit | 3c63ac4c9ecc71d78239a1a6c53b1c49d4092ea4 (patch) | |
| tree | c32fd71a28544921b1ec4efce328730baec3ba35 | |
| parent | 7cc734a2176e199d2e28ad8666e7e4e0030682db (diff) | |
| parent | 1f708e33b7238dbaae4bf72a736bd3c52fa8bfbe (diff) | |
| download | gitlab-ce-3c63ac4c9ecc71d78239a1a6c53b1c49d4092ea4.tar.gz | |
Merge branch '32832-confidential-issue-overflow' into 'master'
32832 Remove overflow from comment form for confidential issues and vertically a…
Closes #32832 and #32926
See merge request !11867
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 19 | ||||
| -rw-r--r-- | changelogs/unreleased/32832-confidential-issue-overflow.yml | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 875e47cdff3..0ddaab0da14 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -111,13 +111,28 @@ margin-top: 0; text-align: center; font-size: 12px; + align-items: center; - @media (max-width: $screen-sm-max) { + @media (max-width: $screen-md-max) { // On smaller devices the warning becomes the fourth item in the list, // rather than centering, and grows to span the full width of the // comment area. order: 4; - -webkit-order: 4; + margin: 6px auto; + width: 100%; + } + + .fa { + margin-right: 8px; + } +} + +.right-sidebar-expanded { + .confidential-issue-warning { + // When the sidebar is open the warning becomes the fourth item in the list, + // rather than centering, and grows to span the full width of the + // comment area. + order: 4; margin: 6px auto; width: 100%; } diff --git a/changelogs/unreleased/32832-confidential-issue-overflow.yml b/changelogs/unreleased/32832-confidential-issue-overflow.yml new file mode 100644 index 00000000000..7d3d3bfed2e --- /dev/null +++ b/changelogs/unreleased/32832-confidential-issue-overflow.yml @@ -0,0 +1,5 @@ +--- +title: Remove overflow from comment form for confidential issues and vertically aligns + confidential issue icon +merge_request: +author: |