summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-06-01 17:28:27 -0700
committertauriedavis <taurie@gitlab.com>2017-06-02 11:38:12 -0700
commit1f708e33b7238dbaae4bf72a736bd3c52fa8bfbe (patch)
tree86474c15cd2b8e3931e48a980b6f13e41cddb53b
parent5cb8ad6c57bc8588add7ae47a82842a707ab2298 (diff)
downloadgitlab-ce-1f708e33b7238dbaae4bf72a736bd3c52fa8bfbe.tar.gz
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
-rw-r--r--app/assets/stylesheets/pages/note_form.scss19
-rw-r--r--changelogs/unreleased/32832-confidential-issue-overflow.yml5
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: