diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-24 22:00:26 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-24 22:00:26 +0300 |
commit | af50d334e70851164eb1b9bb5468581dd5c7dd4f (patch) | |
tree | be42ab33febc8101c87db771220ddd055f8e20c8 /app/assets | |
parent | a1330526691fc4b0b2ab7cc28dfe04f7bd42e99b (diff) | |
parent | 0bf339f0ed2f91a805e99fc7483572ad7d22093a (diff) |
Merge branch 'dm-outdated-system-note' into 'master'
Add system note with link to diff comparison when MR discussion becomes outdated
Closes #30058
See merge request !11584
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/timeline.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 19 |
3 files changed, 16 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index aa0c512a277..515e6f0b2b1 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -5,7 +5,7 @@ .note-text { p:last-child { - margin-bottom: 0; + margin-bottom: 0 !important; } } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 9db26f99a75..49e453c7dbc 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -164,10 +164,6 @@ .discussion-body, .diff-file { - .notes .note { - padding: 10px 15px; - } - .discussion-reply-holder { background-color: $white-light; padding: 10px 16px; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4b15fc2bd82..5550c0d5b47 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -80,10 +80,6 @@ ul.notes { &.timeline-entry { padding: 14px 10px; } - - .system-note { - padding: 0; - } } &.is-editing { @@ -380,6 +376,10 @@ ul.notes { padding-bottom: 5px; } +.system-note .note-header-info { + padding-bottom: 0; +} + .note-headline-light { display: inline; @@ -582,6 +582,17 @@ ul.notes { } } +.discussion-body, +.diff-file { + .notes .note { + padding: 10px 15px; + + &.system-note { + padding: 0; + } + } +} + .diff-file { .is-over { .add-diff-note { |