kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use default amount of padding before and after “N/M resolved” widget

This commit is contained in:
Douwe Maan 2016-07-28 20:10:05 -06:00
parent 27471d01c2
commit 220b82a40c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/pages/notes.scss
View File

@ -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;

2
app/views/projects/merge_requests/_show.html.haml
View File

@ -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 }" }