diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-09 19:53:50 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-09 19:53:50 +0000 |
| commit | d5027d774b2c26a2ee29b249b9919197ce499bff (patch) | |
| tree | 47b6dc56b8ddfb99815a8886fb00c3094465974f | |
| parent | ac0dfdb16251b7701eb190628662127f855d2fa0 (diff) | |
| parent | a597103ad5e80e9f853a85c7446c70e9107ef684 (diff) | |
| download | gitlab-ce-d5027d774b2c26a2ee29b249b9919197ce499bff.tar.gz | |
Merge branch '53768-diff-comment-action-btns' into 'master'
Fix alignment of diff comment buttons
Closes #53768
See merge request gitlab-org/gitlab-ce!22944
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index a153edd0476..c1dfa036678 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -433,7 +433,7 @@ Please check your network connection and try again.`; <div class="discussion-with-resolve-btn"> <button type="button" - class="js-vue-discussion-reply btn btn-text-field mr-2 qa-discussion-reply" + class="js-vue-discussion-reply btn btn-text-field mr-sm-2 qa-discussion-reply" title="Add a reply" @click="showReplyForm" > @@ -442,7 +442,7 @@ Please check your network connection and try again.`; <div v-if="discussion.resolvable"> <button type="button" - class="btn btn-default mx-sm-2" + class="btn btn-default mr-sm-2" @click="resolveHandler()" > <i @@ -455,7 +455,7 @@ Please check your network connection and try again.`; </div> <div v-if="discussion.resolvable" - class="btn-group discussion-actions" + class="btn-group discussion-actions ml-sm-2" role="group" > <div diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index dcb1275d182..c57c1eee350 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -595,7 +595,6 @@ $note-form-margin-left: 70px; .discussion-actions { float: right; - margin-left: 10px; color: $gray-darkest; @include media-breakpoint-down(xs) { |