Merge branch 'jivanvl-replace-prepend-left-10' into 'master'

Replace prepend-left-10 class

See merge request gitlab-org/gitlab!36610

app/assets/javascripts/boards/components/modal/header.vue

@@ -72,7 +72,7 @@ export default {
       <button
         ref="selectAllBtn"
         type="button"
-        class="btn btn-success btn-inverted prepend-left-10"
+        class="btn btn-success btn-inverted gl-ml-3"
         @click="toggleAll"
       >
         {{ selectAllText }}

app/assets/javascripts/boards/index.js

@@ -352,7 +352,7 @@ export default () => {
       template: `
         <div class="board-extra-actions">
           <button
-            class="btn btn-success prepend-left-10"
+            class="btn btn-success gl-ml-3"
             type="button"
             data-placement="bottom"
             ref="addIssuesButton"

app/assets/javascripts/boards/toggle_focus.js

@@ -25,7 +25,7 @@ export default (ModalStore, boardsStore) => {
       <div class="board-extra-actions">
         <a
           href="#"
-          class="btn btn-default has-tooltip prepend-left-10 js-focus-mode-btn"
+          class="btn btn-default has-tooltip gl-ml-3 js-focus-mode-btn"
           data-qa-selector="focus_mode_button"
           role="button"
           aria-label="Toggle focus mode"

app/assets/javascripts/ide/components/commit_sidebar/message_field.vue

@@ -83,7 +83,7 @@ export default {
         <ul class="nav-links">
           <li>
             {{ __('Commit Message') }}
-            <span v-popover="$options.popoverOptions" class="form-text text-muted prepend-left-10">
+            <span v-popover="$options.popoverOptions" class="form-text text-muted gl-ml-3">
               <icon name="question" />
             </span>
           </li>

app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue

@@ -44,7 +44,7 @@ export default {
         data-qa-selector="start_new_mr_checkbox"
         @change="toggleShouldCreateMR"
       />
-      <span class="prepend-left-10 ide-option-label">
+      <span class="gl-ml-3 ide-option-label">
         {{ __('Start a new merge request') }}
       </span>
     </label>

app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue

@@ -66,7 +66,7 @@ export default {
         name="commit-action"
         @change="updateCommitAction($event.target.value)"
       />
-      <span class="prepend-left-10">
+      <span class="gl-ml-3">
         <span v-if="label" class="ide-option-label"> {{ label }} </span> <slot v-else></slot>
       </span>
     </label>

app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue

@@ -8,11 +8,7 @@ import { truncateNamespace } from '~/lib/utils/text_utility';
 
 export default {
   name: 'ProjectListItem',
-  components: {
-    Icon,
-    ProjectAvatar,
-    GlDeprecatedButton,
-  },
+  components: { Icon, ProjectAvatar, GlDeprecatedButton },
   props: {
     project: {
       type: Object,
@@ -22,15 +18,8 @@ export default {
         isString(p.name) &&
         (isString(p.name_with_namespace) || isString(p.nameWithNamespace)),
     },
-    selected: {
-      type: Boolean,
-      required: true,
-    },
-    matcher: {
-      type: String,
-      required: false,
-      default: '',
-    },
+    selected: { type: Boolean, required: true },
+    matcher: { type: String, required: false, default: '' },
   },
   computed: {
     projectNameWithNamespace() {
@@ -56,7 +45,7 @@ export default {
     @click="onClick"
   >
     <icon
-      class="prepend-left-10 gl-mr-3 flex-shrink-0 position-top-0 js-selected-icon"
+      class="gl-ml-3 gl-mr-3 flex-shrink-0 position-top-0 js-selected-icon"
       :class="{ 'js-selected visible': selected, 'js-unselected invisible': !selected }"
       name="mobile-issue-close"
     />

app/assets/stylesheets/framework/common.scss

@@ -399,8 +399,6 @@ img.emoji {
 .prepend-top-10 { margin-top: 10px; }
 .prepend-top-15 { margin-top: 15px; }
 .prepend-top-20 { margin-top: 20px; }
-.prepend-left-5 { margin-left: 5px; }
-.prepend-left-10 { margin-left: 10px; }
 .prepend-left-15 { margin-left: 15px; }
 .prepend-left-20 { margin-left: 20px; }
 .prepend-left-64 { margin-left: 64px; }

app/views/admin/applications/show.html.haml

@@ -46,4 +46,4 @@
 
 .form-actions
   = link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
+  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'

app/views/admin/hook_logs/show.html.haml

@@ -4,6 +4,6 @@
 
 %hr
 
-= link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), method: :post, class: "btn btn-default float-right prepend-left-10"
+= link_to 'Resend Request', retry_admin_hook_hook_log_path(@hook, @hook_log), method: :post, class: "btn btn-default float-right gl-ml-3"
 
 = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log }

app/views/admin/runners/_sort_dropdown.html.haml

 - sorted_by = sort_options_hash[@sort]
 
-.dropdown.inline.prepend-left-10
+.dropdown.inline.gl-ml-3
   %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' } }
     = sorted_by
     = icon('chevron-down')

app/views/admin/users/projects.html.haml

@@ -16,7 +16,7 @@
           .float-right
             %span.light.vertical-align-middle= group_member.human_access
             - unless group_member.owner?
-              = link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member) }, method: :delete, remote: true, class: "btn-sm btn btn-remove prepend-left-10", title: 'Remove user from group' do
+              = link_to group_group_member_path(group, group_member), data: { confirm: remove_member_message(group_member) }, method: :delete, remote: true, class: "btn-sm btn btn-remove gl-ml-3", title: 'Remove user from group' do
                 %i.fa.fa-times.fa-inverse
 
 .row
@@ -46,5 +46,5 @@
                   %span.light.vertical-align-middle= member.human_access
 
                   - if member.respond_to? :project
-                    = link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn-sm btn btn-remove prepend-left-10", title: 'Remove user from project' do
+                    = link_to project_project_member_path(project, member), data: { confirm: remove_member_message(member) }, remote: true, method: :delete, class: "btn-sm btn btn-remove gl-ml-3", title: 'Remove user from project' do
                       %i.fa.fa-times

app/views/ci/variables/_index.html.haml

@@ -36,7 +36,7 @@
           %span.hide.js-ci-variables-save-loading-icon
             .spinner.spinner-light.mr-1
           = _('Save variables')
-        %button.btn.btn-info.btn-inverted.prepend-left-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } }
+        %button.btn.btn-info.btn-inverted.gl-ml-3.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } }
           - if @variables.size == 0
             = n_('Hide value', 'Hide values', @variables.size)
           - else

app/views/doorkeeper/applications/show.html.haml

@@ -44,4 +44,4 @@
 
 .form-actions
   = link_to _('Edit'), edit_oauth_application_path(@application), class: 'btn btn-primary wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
+  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'

app/views/doorkeeper/authorizations/new.html.haml

@@ -46,4 +46,4 @@
             = hidden_field_tag :response_type, @pre_auth.response_type
             = hidden_field_tag :scope, @pre_auth.scope
             = hidden_field_tag :nonce, @pre_auth.nonce
-            = submit_tag _("Authorize"), class: "btn btn-success prepend-left-10", data: { qa_selector: 'authorization_button' }
+            = submit_tag _("Authorize"), class: "btn btn-success gl-ml-3", data: { qa_selector: 'authorization_button' }

app/views/groups/labels/index.html.haml

@@ -27,5 +27,5 @@
   = render 'shared/empty_states/labels'
 
 %template#js-badge-item-template
-  %li.label-link-item.js-priority-badge.inline.prepend-left-10
+  %li.label-link-item.js-priority-badge.inline.gl-ml-3
     .label-badge.label-badge-blue= _('Prioritized label')

app/views/invites/show.html.haml

@@ -35,4 +35,4 @@
 - unless member?
   .actions
     = link_to _("Accept invitation"), accept_invite_url(@token), method: :post, class: "btn btn-success"
-    = link_to _("Decline"), decline_invite_url(@token), method: :post, class: "btn btn-danger prepend-left-10"
+    = link_to _("Decline"), decline_invite_url(@token), method: :post, class: "btn btn-danger gl-ml-3"

app/views/profiles/active_sessions/_active_session.html.haml

@@ -27,6 +27,6 @@
 
   - unless is_current_session
     .float-right
-      = link_to profile_active_session_path(active_session.public_id), data: { confirm: _('Are you sure? The device will be signed out of GitLab.') }, method: :delete, class: "btn btn-danger prepend-left-10" do
+      = link_to profile_active_session_path(active_session.public_id), data: { confirm: _('Are you sure? The device will be signed out of GitLab.') }, method: :delete, class: "btn btn-danger gl-ml-3" do
         %span.sr-only= _('Revoke')
         = _('Revoke')

app/views/profiles/chat_names/new.html.haml

@@ -12,4 +12,4 @@
       = submit_tag "Authorize", class: "btn btn-success wide float-left"
     = form_tag deny_profile_chat_names_path, method: :delete do
       = hidden_field_tag :token, @chat_name_token.token
-      = submit_tag "Deny", class: "btn btn-danger prepend-left-10"
+      = submit_tag "Deny", class: "btn btn-danger gl-ml-3"

app/views/profiles/emails/index.html.haml

@@ -56,8 +56,8 @@
               %span.badge.badge-info= s_('Profiles|Notification email')
             - unless email.confirmed?
               - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
-              = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning prepend-left-10'
+              = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning gl-ml-3'
 
-            = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do
+            = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'btn btn-sm btn-danger gl-ml-3' do
               %span.sr-only= _('Remove')
               = icon('trash')

app/views/profiles/gpg_keys/_key.html.haml

@@ -19,9 +19,9 @@
   .float-right
     %span.key-created-at
       = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
-    = link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "btn btn-danger prepend-left-10" do
+    = link_to profile_gpg_key_path(key), data: { confirm: _('Are you sure? Removing this GPG key does not affect already signed commits.') }, method: :delete, class: "btn btn-danger gl-ml-3" do
       %span.sr-only= _('Remove')
       = icon('trash')
-    = link_to revoke_profile_gpg_key_path(key), data: { confirm: _('Are you sure? All commits that were signed with this GPG key will be unverified.') }, method: :put, class: "btn btn-danger prepend-left-10" do
+    = link_to revoke_profile_gpg_key_path(key), data: { confirm: _('Are you sure? All commits that were signed with this GPG key will be unverified.') }, method: :put, class: "btn btn-danger gl-ml-3" do
       %span.sr-only= _('Revoke')
       = _('Revoke')

app/views/profiles/keys/_key.html.haml

@@ -26,6 +26,6 @@
       %span.key-created-at
         = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
         - if key.can_delete?
-          = link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent prepend-left-10 align-baseline" do
+          = link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent gl-ml-3 align-baseline" do
             %span.sr-only= _('Remove')
             = sprite_icon('remove', size: 16)

app/views/projects/branches/_branch.html.haml

@@ -41,7 +41,7 @@
 
     - if branch.name != @repository.root_ref
       = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name),
-        class: "btn btn-default js-onboarding-compare-branches #{'prepend-left-10' unless merge_project}",
+        class: "btn btn-default js-onboarding-compare-branches #{'gl-ml-3' unless merge_project}",
         method: :post,
         title: s_('Branches|Compare') do
         = s_('Branches|Compare')

app/views/projects/compare/_form.html.haml

@@ -26,6 +26,6 @@
    
   = button_tag s_("CompareBranches|Compare"), class: "btn btn-success commits-compare-btn"
   - if @merge_request.present?
-    = link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'prepend-left-10 btn'
+    = link_to _("View open merge request"), project_merge_request_path(@project, @merge_request), class: 'gl-ml-3 btn'
   - elsif create_mr_button?
-    = link_to _("Create merge request"), create_mr_path, class: 'prepend-left-10 btn'
+    = link_to _("Create merge request"), create_mr_path, class: 'gl-ml-3 btn'

app/views/projects/hook_logs/show.html.haml

@@ -7,6 +7,6 @@
     %h4.gl-mt-0
       Request details
   .col-lg-9
-    = link_to 'Resend Request', @hook_log.present.retry_path, method: :post, class: "btn btn-default float-right prepend-left-10"
+    = link_to 'Resend Request', @hook_log.present.retry_path, method: :post, class: "btn btn-default float-right gl-ml-3"
 
     = render partial: 'shared/hook_logs/content', locals: { hook_log: @hook_log }

app/views/projects/issues/export_csv/_modal.html.haml

@@ -12,7 +12,7 @@
         .modal-body
           .modal-subheader
             = icon('check', { class: 'checkmark' })
-            %strong.prepend-left-10
+            %strong.gl-ml-3
               - issues_count = issuables_count_for_state(:issues, params[:state])
               = n_('%d issue selected', '%d issues selected', issues_count) % issues_count
           .modal-text

app/views/projects/labels/index.html.haml

@@ -52,5 +52,5 @@
   = render 'shared/empty_states/labels'
 
 %template#js-badge-item-template
-  %li.label-link-item.js-priority-badge.inline.prepend-left-10
+  %li.label-link-item.js-priority-badge.inline.gl-ml-3
     .label-badge.label-badge-blue= _('Prioritized label')

app/views/projects/no_repo.html.haml

@@ -15,7 +15,7 @@
   = link_to project_repository_path(@project), method: :post, class: 'btn btn-primary' do
     #{ _('Create empty repository') }
 
-  %strong.prepend-left-10.gl-mr-3 or
+  %strong.gl-ml-3.gl-mr-3 or
 
   = link_to new_project_import_path(@project), class: 'btn' do
     #{ _('Import repository') }

app/views/projects/tags/_tag.html.haml

@@ -38,5 +38,5 @@
     - if can?(current_user, :admin_tag, @project)
       = link_to edit_project_tag_release_path(@project, tag.name), class: 'btn btn-edit has-tooltip', title: s_('TagsPage|Edit release notes'), data: { container: "body" } do
         = icon("pencil")
-      = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip prepend-left-10 #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do
+      = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip gl-ml-3 #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do
         = icon("trash-o")

app/views/projects/tree/_tree_content.html.haml

@@ -10,7 +10,7 @@
       - if @path.present?
         %tr.tree-item
           %td.tree-item-file-name
-            = link_to "..", project_tree_path(@project, up_dir_path), class: 'prepend-left-10'
+            = link_to "..", project_tree_path(@project, up_dir_path), class: 'gl-ml-3'
           %td
           %td.d-none.d-sm-table-cell
 

app/views/shared/_label_row.html.haml

@@ -20,6 +20,6 @@
           = link_to_label(label, type: :merge_request) { _('Merge requests') }
       - if force_priority
         ·
-        %li.label-link-item.priority-badge.js-priority-badge.inline.prepend-left-10
+        %li.label-link-item.priority-badge.js-priority-badge.inline.gl-ml-3
           .label-badge.label-badge-blue= _('Prioritized label')
       = render_if_exists 'shared/label_row_epics_link', label: label

app/views/shared/_milestones_sort_dropdown.html.haml

-.dropdown.inline.prepend-left-10
+.dropdown.inline.gl-ml-3
   %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
     %span.light
     - if @sort.present?

app/views/shared/issuable/_board_create_list_dropdown.html.haml

-.dropdown.prepend-left-10#js-add-list
+.dropdown.gl-ml-3#js-add-list
   %button.btn.btn-success.btn-inverted.js-new-board-list{ type: "button", data: board_list_data }
     Add list
   .dropdown-menu.dropdown-extended-height.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.js-tab-container-labels

app/views/shared/issuable/_close_reopen_report_toggle.html.haml

@@ -8,7 +8,7 @@
 - if defined? warn_before_close
   - add_blocked_class = !issuable.closed? && warn_before_close
 
-.float-left.btn-group.prepend-left-10.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown
+.float-left.btn-group.gl-ml-3.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown
   %button{ class: "#{button_class} btn-#{button_action} #{(add_blocked_class ? 'btn-issue-blocked' : '')}", data: { qa_selector: 'close_issue_button', endpoint: close_reopen_issuable_path(issuable) } }
     #{display_button_action} #{display_issuable_type}
 

app/views/shared/issuable/_search_bar.html.haml

@@ -135,7 +135,7 @@
                   %li.filter-dropdown-item
                     %button.btn.btn-link{ type: 'button' }
                       %gl-emoji
-                      %span.js-data-value.prepend-left-10
+                      %span.js-data-value.gl-ml-3
                         {{name}}
               #js-dropdown-wip.filtered-search-input-dropdown-menu.dropdown-menu
                 %ul.filter-dropdown{ data: { dropdown: true } }
@@ -172,7 +172,7 @@
         - if user_can_admin_list
           = render 'shared/issuable/board_create_list_dropdown', board: board
           - if @project
-            #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } }
+            #js-add-issues-btn.gl-ml-3{ data: { can_admin_list: can?(current_user, :admin_list, @project) } }
         - if Feature.enabled?(:boards_with_swimlanes, @group)
           #js-board-epics-swimlanes-toggle
         #js-toggle-focus-btn

app/views/shared/issuable/_sort_dropdown.html.haml

@@ -2,7 +2,7 @@
 - sort_title = issuable_sort_option_title(sort_value)
 - viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues'
 
-.dropdown.inline.prepend-left-10.issue-sort-dropdown
+.dropdown.inline.gl-ml-3.issue-sort-dropdown
   .btn-group{ role: 'group' }
     .btn-group{ role: 'group' }
       %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }

app/views/shared/milestones/_deprecation_message.html.haml

 .banner-callout.compact.milestone-deprecation-message.js-milestone-deprecation-message.prepend-top-20
   .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg'
-  .banner-body.prepend-left-10.gl-mr-3
+  .banner-body.gl-ml-3.gl-mr-3
     %h5.banner-title.gl-mt-0= _('This page will be removed in a future release.')
     %p.milestone-banner-text= _('Use group milestones to manage issues from multiple projects in the same milestone.')
     = button_tag _('Promote these project milestones into a group milestone.'), class: 'btn btn-link js-popover-link text-align-left milestone-banner-link'

app/views/shared/projects/_edit_information.html.haml

 - unless can?(current_user, :push_code, @project)
-  .inline.prepend-left-10
+  .inline.gl-ml-3
     - if @project.branch_allows_collaboration?(current_user, selected_branch)
       = commit_in_single_accessible_branch
     - else

ee/app/assets/javascripts/boards/components/toggle_epics_swimlanes.vue

@@ -33,7 +33,7 @@ export default {
 
 <template>
   <div
-    class="board-swimlanes-toggle-wrapper gl-display-flex gl-align-items-center prepend-left-10"
+    class="board-swimlanes-toggle-wrapper gl-display-flex gl-align-items-center gl-ml-3"
     data-testid="toggle-swimlanes"
   >
     <span

ee/app/assets/javascripts/boards/config_toggle.js

@@ -30,7 +30,7 @@ export default boardsStore => {
         showPage: page => boardsStore.showPage(page),
       },
       template: `
-        <div class="prepend-left-10">
+        <div class="gl-ml-3">
           <button
             v-tooltip
             :title="tooltipTitle"

ee/app/assets/javascripts/boards/toggle_labels.js

@@ -34,7 +34,7 @@ export default () =>
       },
     },
     template: `
-      <div class="board-labels-toggle-wrapper d-flex align-items-center prepend-left-10">
+      <div class="board-labels-toggle-wrapper d-flex align-items-center gl-ml-3">
         <local-storage-sync storage-key="gl-show-board-labels" :value="JSON.stringify(isShowingLabels)" @input="onStorageUpdate" />
         <gl-toggle
           :value="isShowingLabels"

ee/app/assets/javascripts/geo_nodes/components/geo_node_header.vue

@@ -40,7 +40,7 @@ export default {
           <strong>{{ node.name }}</strong>
           <gl-loading-icon
             v-if="nodeDetailsLoading || node.nodeActionActive"
-            class="node-details-loading prepend-left-10 inline"
+            class="node-details-loading gl-ml-3 inline"
           />
           <icon
             v-if="showNodeWarningIcon"

ee/app/views/groups/group_members/_sync_button.html.haml

@@ -11,5 +11,5 @@
     = icon("refresh")
     Sync now
 - if @group.ldap_sync_ready? && @group.ldap_sync_last_successful_update_at
-  %p.inline.prepend-left-10
+  %p.inline.gl-ml-3
     Successfully synced #{time_ago_with_tooltip(@group.ldap_sync_last_successful_update_at)}.

ee/app/views/shared/_mirror_update_button.html.haml

@@ -17,5 +17,5 @@
         = icon("refresh")
         Update Now
     - if @project.mirror_last_update_succeeded?
-      %p.inline.prepend-left-10
+      %p.inline.gl-ml-3
         Successfully updated #{time_ago_with_tooltip(@project.import_state.last_successful_update_at)}.

ee/app/views/shared/epic/_sort_dropdown.html.haml

 - hide_extra_sort_options = local_assigns.fetch(:hide_extra_sort_options, false)
 - sorted_by = epics_sort_options_hash[@sort]
 
-.dropdown.prepend-left-10
+.dropdown.gl-ml-3
   .btn-group.d-flex.d-md-inline-flex
     %button.btn.dropdown-toggle.epics-sort-btn{ type: 'button', data: { toggle: 'dropdown' } }
       = sorted_by

ee/app/views/shared/issuable/_board_create_list_dropdown.html.haml

@@ -2,7 +2,7 @@
 - milestone_lists_available = board.resource_parent.feature_available?(:board_milestone_lists)
 
 - if assignee_lists_available || milestone_lists_available
-  .dropdown.boards-add-list.prepend-left-10#js-add-list
+  .dropdown.boards-add-list.gl-ml-3#js-add-list
     %button.btn.btn-success.btn-inverted.d-flex.js-new-board-list{ type: "button", data: board_list_data }
       %span Add list
       = sprite_icon('chevron-down', size: 16, css_class: 'gl-ml-2 btn-success-board-list-chevron')