diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 11:57:53 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 11:57:53 -0500 |
| commit | 3ae87eef064b019ee7944595cb33741de8805d24 (patch) | |
| tree | f8701749b86c71cbee07b98ba3380b873a762480 | |
| parent | 917b7e0dd95fcf4f37abbab9f5e4ce40446d6e76 (diff) | |
| download | gitlab-ce-3ae87eef064b019ee7944595cb33741de8805d24.tar.gz | |
Replace .btn-group-justified with .btn-group.d-flex
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 2 | ||||
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index aa166a056e4..cf817ad9ca9 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -261,7 +261,7 @@ Please check your network connection and try again.`; <div class="discussion-reply-holder"> <template v-if="!isReplying && canReply"> <div - class="btn-group-justified discussion-with-resolve-btn" + class="btn-group d-flex discussion-with-resolve-btn" role="group"> <div class="btn-group" diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 88126bce155..7b4c55da30f 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -22,7 +22,7 @@ - if discussion.potentially_resolvable? - line_type = local_assigns.fetch(:line_type, nil) - .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group.d-flex.discussion-with-resolve-btn{ role: "group" } .btn-group{ role: "group" } = link_to_reply_discussion(discussion, line_type) diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index f4e54b8a6c8..6fe9b484aaa 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -27,7 +27,7 @@ %span= time_ago_in_words @build.artifacts_expire_at - if @build.artifacts? - .btn-group.btn-group-justified{ role: :group } + .btn-group.btn-group.d-flex{ role: :group } - if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build) = link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-secondary', method: :post do Keep @@ -51,7 +51,7 @@ - if @build.trigger_variables.any? %p - %button.btn.group.btn-group-justified.js-reveal-variables Reveal Variables + %button.btn.group.btn-group.d-flex.js-reveal-variables Reveal Variables %dl.js-build-variables.trigger-build-variables.hide - @build.trigger_variables.each do |trigger_variable| |