Merge branch 'jivanvl-remove-prepend-top-16' into 'master'

Remove prepend-top-16 CSS class

See merge request gitlab-org/gitlab!35451

app/assets/javascripts/environments/components/environments_table.vue

@@ -188,7 +188,7 @@ export default {
 
       <template v-if="shouldRenderFolderContent(model)">
         <div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
-          <gl-loading-icon size="md" class="prepend-top-16" />
+          <gl-loading-icon size="md" class="gl-mt-5" />
         </div>
 
         <template v-else>

app/assets/javascripts/notes/components/comment_form.vue

@@ -389,7 +389,7 @@ export default {
             </markdown-field>
             <gl-alert
               v-if="isToggleBlockedIssueWarning"
-              class="prepend-top-16"
+              class="gl-mt-5"
               :title="__('Are you sure you want to close this blocked issue?')"
               :primary-button-text="__('Yes, close issue')"
               :secondary-button-text="__('Cancel')"

app/assets/stylesheets/framework/common.scss

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

app/views/projects/issues/_new_branch.html.haml

@@ -41,7 +41,7 @@
               = _('Create branch')
           %li.divider.droplab-item-ignore
 
-          %li.droplab-item-ignore.gl-ml-3.gl-mr-3.prepend-top-16
+          %li.droplab-item-ignore.gl-ml-3.gl-mr-3.gl-mt-5
             - if can_create_confidential_merge_request?
               #js-forked-project{ data: { namespace_path: @project.namespace.full_path, project_path: @project.full_path, new_fork_path: new_project_fork_path(@project), help_page_path: help_page_path('user/project/merge_requests') } }
             .form-group

app/views/users/_overview.html.haml

@@ -9,7 +9,7 @@
   .col-md-12.col-lg-6
     - if can?(current_user, :read_cross_project)
       .activities-block
-        .prepend-top-16
+        .gl-mt-5
           .d-flex.align-items-center.border-bottom
             %h4.flex-grow
               = s_('UserProfile|Activity')
@@ -20,7 +20,7 @@
 
   .col-md-12.col-lg-6
     .projects-block
-      .prepend-top-16
+      .gl-mt-5
         .d-flex.align-items-center.border-bottom
           %h4.flex-grow
             = s_('UserProfile|Personal projects')

ee/app/views/projects/issues/_alert_blocked.html.haml

@@ -2,7 +2,7 @@
 - blocked_by_issues_links = blocked_by_issues.map { |blocking_issue| link_to "\##{blocking_issue.iid}", project_issue_path(blocking_issue.project, blocking_issue), class: 'gl-link' }.join(', ').html_safe
 
 - if @issue.blocked? && @issue.blocked_by_issues(current_user).length > 0
-  .hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.prepend-top-16{ role: 'alert', data: { 'action': "close-reopen" } }
+  .hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.gl-mt-5{ role: 'alert', data: { 'action': "close-reopen" } }
     = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon')
     %h4.gl-alert-title
       = _('Are you sure you want to close this blocked issue?')