diff options
| author | tauriedavis <taurie@gitlab.com> | 2017-06-01 17:28:27 -0700 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2017-06-02 08:23:01 -0700 |
| commit | 8f1ab68e50a42bc337cf5f2c100f2a3063d723d4 (patch) | |
| tree | 6c06c5c7f51f6bcdd8196c77842c28eb41c3686f | |
| parent | 5cb8ad6c57bc8588add7ae47a82842a707ab2298 (diff) | |
| download | gitlab-ce-32832-confidential-issue-overflow.tar.gz | |
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon32832-confidential-issue-overflow
| -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, 23 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 875e47cdff3..02d98948d24 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -111,8 +111,9 @@ 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. @@ -121,6 +122,22 @@ 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; + -webkit-order: 4; + margin: 6px auto; + width: 100%; + } } .discussion-form { 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: |