From 220b82a40c2af56712602c4f9c37163b84c92cac Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 28 Jul 2016 20:10:05 -0600 Subject: [PATCH] =?UTF-8?q?Use=20default=20amount=20of=20padding=20before?= =?UTF-8?q?=20and=20after=20=E2=80=9CN/M=20resolved=E2=80=9D=20widget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/pages/notes.scss | 1 - app/views/projects/merge_requests/_show.html.haml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index c2762b3e3a1..b8405c4be72 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -398,7 +398,6 @@ ul.notes { .line-resolve-all { display: inline-block; - margin-top: 10px; padding: 5px 10px; background-color: $background-color; border: 1px solid $border-color; diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 4e090e005c3..1b8cce58009 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -44,7 +44,7 @@ = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" - #resolve-count-app.line-resolve-all-container{ "v-cloak" => true } + #resolve-count-app.line-resolve-all-container.prepend-top-default.append-bottom-default{ "v-cloak" => true } %resolve-count{ "inline-template" => true } .line-resolve-all{ "v-show" => "discussionCount > 0", ":class" => "{ 'has-next-btn': resolved !== discussionCount }" }