diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-06-07 18:00:35 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-06-07 18:00:35 +0000 |
| commit | e07b2b277f79bc25cdce22ca2defba1ba80791aa (patch) | |
| tree | 958291f8ba13baa0d37603b33fc775d239bf093c | |
| parent | d89405fd0521528845a0df3950d47a992c251d09 (diff) | |
| parent | 6f1c96230d7d87aea94f88ca2a857c93310054b1 (diff) | |
| download | gitlab-ce-e07b2b277f79bc25cdce22ca2defba1ba80791aa.tar.gz | |
Merge branch '55033-discussion-system-note-alignment' into 'master'57953-suggesting-changes-on-a-line-that-is-not-part-of-an-mr-diff-brings-in-actual-html-code-of-the-element-instead-of-the-text-involved
Align system note within discussion with other notes
Closes #55033
See merge request gitlab-org/gitlab-ce!29367
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/55033-discussion-system-note-alignment.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index d3aad23aa75..69dd583bc5b 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -265,8 +265,8 @@ $note-form-margin-left: 72px; } .system-note { - padding: 6px 21px; - margin: $gl-padding-24 0; + padding: $gl-padding-4 20px; + margin: $gl-padding 0; background-color: transparent; .note-header-info { @@ -365,7 +365,7 @@ $note-form-margin-left: 72px; height: $system-note-icon-size; border: 1px solid $border-color; border-radius: $system-note-icon-size; - margin: -6px $gl-padding 0 0; + margin: -6px 20px 0 0; svg { width: $system-note-svg-size; diff --git a/changelogs/unreleased/55033-discussion-system-note-alignment.yml b/changelogs/unreleased/55033-discussion-system-note-alignment.yml new file mode 100644 index 00000000000..27072ec7e12 --- /dev/null +++ b/changelogs/unreleased/55033-discussion-system-note-alignment.yml @@ -0,0 +1,5 @@ +--- +title: Align system note within discussion with other notes +merge_request: +author: +type: fixed |