Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 8 insertions, 8 deletions

diff --git a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
index 0839880713f..220ddf1bad3 100644
--- a/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
@@ -1,12 +1,12 @@
-.file-actions
-  .btn-group{ "v-if" => "file.type === 'text'" }
-    %button.btn{ ":class" => "{ 'active': file.resolveMode == 'interactive' }",
+.file-actions.d-flex.align-items-center.gl-ml-auto.gl-align-self-start
+  .btn-group.gl-mr-3{ "v-if" => "file.type === 'text'" }
+    %button.btn.gl-button{ ":class" => "{ 'active': file.resolveMode == 'interactive' }",
       '@click' => "onClickResolveModeButton(file, 'interactive')",
       type: 'button' }
-      Interactive mode
-    %button.btn{ ':class' => "{ 'active': file.resolveMode == 'edit' }",
+      = _('Interactive mode')
+    %button.btn.gl-button{ ':class' => "{ 'active': file.resolveMode == 'edit' }",
       '@click' => "onClickResolveModeButton(file, 'edit')",
       type: 'button' }
-      Edit inline
-  %a.btn.view-file{ ":href" => "file.blobPath" }
-    View file @{{conflictsData.shortCommitSha}}
+      = _('Edit inline')
+  %a.btn.gl-button.view-file{ ":href" => "file.blobPath" }
+    = _('View file @%{commit_sha}') % { commit_sha: '{{conflictsData.shortCommitSha}}' }