Commit d15cc268 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖

Add latest changes from gitlab-org/[email protected]

parent df7a85f3
......@@ -441,7 +441,7 @@ export default {
:prev-page="prevPage"
:next-page="nextPage"
align="center"
class="gl-pagination prepend-top-default"
class="gl-pagination gl-mt-3"
@input="handlePageChange"
/>
</div>
......
......@@ -164,7 +164,7 @@ export default {
<template>
<form
:class="{ 'was-validated': wasValidated }"
class="prepend-top-default gl-mb-3 needs-validation"
class="gl-mt-3 gl-mb-3 needs-validation"
novalidate
@submit.prevent.stop="onSubmit"
>
......
......@@ -96,7 +96,7 @@ export default {
<preview-item :draft="draft" :is-last="isLast(index)" />
</li>
</ul>
<gl-loading-icon v-else size="lg" class="prepend-top-default gl-mb-3" />
<gl-loading-icon v-else size="lg" class="gl-mt-3 gl-mb-3" />
</div>
<div class="dropdown-footer">
<publish-button
......
......@@ -62,7 +62,7 @@ export default {
</script>
<template>
<div class="js-notebook-viewer-mounted container-fluid md prepend-top-default gl-mb-3">
<div class="js-notebook-viewer-mounted container-fluid md gl-mt-3 gl-mb-3">
<div v-if="loading && !error" class="text-center loading">
<gl-loading-icon class="mt-5" size="lg" />
</div>
......
......@@ -34,7 +34,7 @@ export default {
</script>
<template>
<div class="js-pdf-viewer container-fluid md prepend-top-default gl-mb-3">
<div class="js-pdf-viewer container-fluid md gl-mt-3 gl-mb-3">
<div v-if="loading && !error" class="text-center loading">
<gl-loading-icon class="mt-5" size="lg" />
</div>
......
......@@ -56,7 +56,7 @@ export default class SketchLoader {
error() {
const errorMsg = document.createElement('p');
errorMsg.className = 'prepend-top-default gl-mb-3 text-center';
errorMsg.className = 'gl-mt-3 gl-mb-3 text-center';
errorMsg.textContent = __(`
Cannot show preview. For previews on sketch files, they must have the file format
introduced by Sketch version 43 and above.
......
......@@ -67,12 +67,7 @@ export default {
<template>
<div class="environments-container">
<gl-loading-icon
v-if="isLoading"
size="md"
class="prepend-top-default"
label="Loading environments"
/>
<gl-loading-icon v-if="isLoading" size="md" class="gl-mt-3" label="Loading environments" />
<slot name="emptyState"></slot>
......
......@@ -49,7 +49,7 @@ export default {
<pagination-links
:change="change"
:page-info="pageInfo"
class="d-flex justify-content-center prepend-top-default"
class="d-flex justify-content-center gl-mt-3"
/>
</template>
</div>
......
......@@ -26,7 +26,7 @@ export default {
<template>
<div>
<gl-loading-icon v-if="loading && !stages.length" size="lg" class="prepend-top-default" />
<gl-loading-icon v-if="loading && !stages.length" size="lg" class="gl-mt-3" />
<template v-else>
<stage
v-for="stage in stages"
......
......@@ -56,7 +56,7 @@ export default {
</script>
<template>
<div class="ide-stage card prepend-top-default">
<div class="ide-stage card gl-mt-3">
<div
ref="cardHeader"
:class="{
......
......@@ -154,10 +154,7 @@ export default {
data-qa-selector="file_name_field"
:placeholder="placeholder"
/>
<ul
v-if="isCreatingNewFile"
class="file-templates prepend-top-default list-inline qa-template-list"
>
<ul v-if="isCreatingNewFile" class="file-templates gl-mt-3 list-inline qa-template-list">
<li v-for="(template, index) in templateTypes" :key="index" class="list-inline-item">
<button
type="button"
......
......@@ -59,7 +59,7 @@ export default {
<template>
<div class="ide-pipeline">
<gl-loading-icon v-if="showLoadingIcon" size="lg" class="prepend-top-default" />
<gl-loading-icon v-if="showLoadingIcon" size="lg" class="gl-mt-3" />
<template v-else-if="hasLoadedPipeline">
<header v-if="latestPipeline" class="ide-tree-header ide-pipeline-header">
<ci-icon :status="latestPipeline.details.status" :size="24" class="d-flex" />
......
......@@ -43,7 +43,7 @@ export default {
<div class="text-center p-3">
<div v-if="illustrationPath" class="svg-content svg-130"><img :src="illustrationPath" /></div>
<h4>{{ __('Web Terminal') }}</h4>
<gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default" />
<gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3" />
<template v-else>
<p>{{ __('Run tests against your code live using the Web Terminal') }}</p>
<p>
......
......@@ -63,7 +63,7 @@ export default {
</script>
<template>
<div class="prepend-top-default gl-mb-3 clearfix">
<div class="gl-mt-3 gl-mb-3 clearfix">
<button
:class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
:disabled="formState.updateLoading || !isSubmitEnabled"
......
......@@ -274,7 +274,7 @@ export default {
};
</script>
<template>
<div class="prepend-top-default gl-mb-3 js-environment-container">
<div class="gl-mt-3 gl-mb-3 js-environment-container">
<div class="environment-information">
<ci-icon :status="iconStatus" />
<p class="inline gl-mb-0" v-html="environment"></p>
......
......@@ -27,7 +27,7 @@ export default {
};
</script>
<template>
<div class="prepend-top-default js-build-erased">
<div class="gl-mt-3 js-build-erased">
<div class="erased alert alert-warning">
<template v-if="isErasedByUser">
{{ s__('Job|Job has been erased by') }}
......
......@@ -270,7 +270,7 @@ export default {
<div
v-if="job.archived"
ref="sticky"
class="js-archived-job prepend-top-default archived-job"
class="js-archived-job gl-mt-3 archived-job"
:class="{ 'sticky-top border-bottom-0': hasTrace }"
>
<icon name="lock" class="align-text-bottom" />
......@@ -280,7 +280,7 @@ export default {
<div
v-if="hasTrace"
class="build-trace-container position-relative"
:class="{ 'prepend-top-default': !job.archived }"
:class="{ 'gl-mt-3': !job.archived }"
>
<log-top-bar
:class="{
......
......@@ -172,7 +172,7 @@ export default {
</div>
</div>
</div>
<div class="d-flex prepend-top-default justify-content-center">
<div class="d-flex gl-mt-3 justify-content-center">
<p class="text-muted" v-html="helpText"></p>
</div>
<div class="d-flex justify-content-center">
......
......@@ -108,7 +108,7 @@ export default {
/>
</ci-header>
<gl-loading-icon v-if="isLoading" size="lg" class="prepend-top-default gl-mb-3" />
<gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3" />
<gl-modal
:modal-id="$options.DELETE_MODAL_ID"
......
......@@ -45,7 +45,7 @@ export default {
<template>
<div v-if="isLoading">
<gl-loading-icon size="lg" class="prepend-top-default js-loading-spinner" />
<gl-loading-icon size="lg" class="gl-mt-3 js-loading-spinner" />
</div>
<div
......@@ -73,7 +73,7 @@ export default {
</div>
<div v-else>
<div class="row prepend-top-default">
<div class="row gl-mt-3">
<div class="col-12">
<p class="js-no-tests-to-show">{{ s__('TestReports|There are no tests to show.') }}</p>
</div>
......
......@@ -36,7 +36,7 @@ export default {
<template>
<div>
<div class="row prepend-top-default">
<div class="row gl-mt-3">
<div class="col-12">
<h4>{{ heading }}</h4>
</div>
......
......@@ -40,7 +40,7 @@ export default {
<template>
<div>
<div class="row prepend-top-default">
<div class="row gl-mt-3">
<div class="col-12">
<h4>{{ heading }}</h4>
</div>
......
......@@ -28,7 +28,7 @@ export default {
};
</script>
<template>
<div class="prepend-top-default">
<div class="gl-mt-3">
<p>
<slot></slot>
</p>
......
......@@ -21,7 +21,7 @@ export default {
};
</script>
<template>
<div class="prepend-top-default">
<div class="gl-mt-3">
<gl-skeleton-loading v-if="isFetchingRelease" />
<release-block v-else-if="!fetchError" :release="release" />
......
......@@ -59,7 +59,7 @@ export default {
<template>
<div>
<div class="card-text prepend-top-default">
<div class="card-text gl-mt-3">
<b>{{ __('Evidence collection') }}</b>
</div>
<div v-for="(evidence, index) in evidences" :key="evidenceTitle(index)" class="mb-2">
......
......@@ -108,7 +108,7 @@ export default {
<release-block-assets v-if="shouldRenderAssets" :assets="assets" />
<evidence-block v-if="hasEvidence && shouldShowEvidence" :release="release" />
<div ref="gfm-content" class="card-text prepend-top-default">
<div ref="gfm-content" class="card-text gl-mt-3">
<div class="md" v-html="release.descriptionHtml"></div>
</div>
</div>
......
......@@ -96,7 +96,7 @@ export default {
</script>
<template>
<div class="card-text prepend-top-default">
<div class="card-text gl-mt-3">
<template v-if="glFeatures.releaseAssetLinkType">
<gl-button
data-testid="accordion-button"
......
......@@ -75,7 +75,7 @@ export default {
<template>
<section id="serverless-functions" class="flex-grow">
<gl-loading-icon v-if="checkingInstalled" size="lg" class="prepend-top-default gl-mb-3" />
<gl-loading-icon v-if="checkingInstalled" size="lg" class="gl-mt-3 gl-mb-3" />
<div v-else-if="isInstalled">
<div v-if="hasFunctionData">
......@@ -91,11 +91,7 @@ export default {
</ul>
</div>
</template>
<gl-loading-icon
v-if="isLoading"
size="lg"
class="prepend-top-default gl-mb-3 js-functions-loader"
/>
<gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3 js-functions-loader" />
</div>
<div v-else class="empty-state js-empty-state">
<div class="text-content">
......
......@@ -9,7 +9,7 @@ export default {
</script>
<template>
<div class="prepend-top-default">
<div class="gl-mt-3">
<div class="mr-widget-heading p-3">
<gl-skeleton-loader :width="577" :height="12">
<rect width="86" height="12" rx="2" />
......
......@@ -365,7 +365,7 @@ export default {
};
</script>
<template>
<div v-if="mr" class="mr-state-widget prepend-top-default">
<div v-if="mr" class="mr-state-widget gl-mt-3">
<mr-widget-header :mr="mr" />
<mr-widget-suggest-pipeline
v-if="shouldSuggestPipelines"
......
......@@ -231,7 +231,7 @@ export default {
<template>
<div
ref="gl-form"
:class="{ 'prepend-top-default gl-mb-3': addSpacingClasses }"
:class="{ 'gl-mt-3 gl-mb-3': addSpacingClasses }"
class="js-vue-markdown-field md-area position-relative"
>
<markdown-header
......
......@@ -64,7 +64,7 @@ export default {
<template>
<gl-pagination
v-if="showPagination"
class="justify-content-center prepend-top-default"
class="justify-content-center gl-mt-3"
v-bind="$attrs"
:value="pageInfo.page"
:per-page="pageInfo.perPage"
......
......@@ -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-default { margin-top: $gl-padding !important; }
.prepend-top-16 { margin-top: 16px; }
.prepend-top-20 { margin-top: 20px; }
.prepend-left-5 { margin-left: 5px; }
......
......@@ -568,7 +568,7 @@ module ProjectsHelper
end
def project_child_container_class(view_path)
view_path == "projects/issues/issues" ? "prepend-top-default" : "project-show-#{view_path}"
view_path == "projects/issues/issues" ? "gl-mt-3" : "project-show-#{view_path}"
end
def project_issues(project)
......
- parsed_with_gfm = "Content parsed with #{link_to('GitLab Flavored Markdown', help_page_path('user/markdown'), target: '_blank')}.".html_safe
= form_for @appearance, url: admin_appearances_path, html: { class: 'prepend-top-default' } do |f|
= form_for @appearance, url: admin_appearances_path, html: { class: 'gl-mt-3' } do |f|
= form_errors(@appearance)
......@@ -100,7 +100,7 @@
.hint
= parsed_with_gfm
.prepend-top-default.gl-mb-3
.gl-mt-3.gl-mb-3
= f.submit 'Update appearance settings', class: 'btn btn-success'
- if @appearance.persisted? || @appearance.updated_at
.mt-4
......
......@@ -10,7 +10,7 @@
dismissible: true.to_s } }
= notice[:message].html_safe
.admin-dashboard.prepend-top-default
.admin-dashboard.gl-mt-3
.row
.col-sm-4
.info-well.dark-well
......
- page_title _("Groups")
.top-area
.prepend-top-default.gl-mb-3
.gl-mt-3.gl-mb-3
= form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f|
= hidden_field_tag :sort, @sort
.search-holder
......
.row.prepend-top-default.gl-mb-3
.row.gl-mt-3.gl-mb-3
.col-lg-3
%h4.gl-mt-0
Recent Deliveries
......
......@@ -16,7 +16,7 @@
System hook will be triggered on set of events like creating project
or adding ssh key. But you can also enable extra triggers like Push events.
.prepend-top-default
.gl-mt-3
= form.check_box :repository_update_events, class: 'float-left'
.prepend-left-20
= form.label :repository_update_events, class: 'list-label' do
......
- add_to_breadcrumbs @hook.pluralized_name, admin_hooks_path
- page_title _('Edit System Hook')
.row.prepend-top-default
.row.gl-mt-3
.col-lg-3
= render 'shared/web_hooks/title_and_docs', hook: @hook
......
- page_title @hook.pluralized_name
.row.prepend-top-default
.row.gl-mt-3
.col-lg-4
= render 'shared/web_hooks/title_and_docs', hook: @hook
......
......@@ -6,7 +6,7 @@
= render 'admin/users/head'
.row.prepend-top-default
.row.gl-mt-3
.col-lg-12
- if @new_impersonation_token
= render 'shared/access_tokens/created_container',
......
......@@ -9,7 +9,7 @@
to profile the request
- if @profiles.present?
.prepend-top-default
.gl-mt-3
- @profiles.each do |path, profiles|
.card.card-small
.card-header
......
......@@ -15,7 +15,7 @@
-# Show a message if none of the mechanisms above are enabled
- if !allow_admin_mode_password_authentication_for_web? && !ldap_sign_in_enabled? && !omniauth_enabled?
.prepend-top-default.center
.gl-mt-3.center
= _('No authentication methods configured.')
- if omniauth_enabled? && button_based_providers_enabled?
......
- page_title _('System Info')
.prepend-top-default
.gl-mt-3
.row
.col-sm
.bg-light.light-well
......@@ -11,7 +11,7 @@
- else
= icon('warning', class: 'text-warning')
= _('Unable to collect CPU info')
.bg-light.light-well.prepend-top-default
.bg-light.light-well.gl-mt-3
%h4= _('Memory Usage')
.data
- if @memory
......@@ -19,7 +19,7 @@
- else
= icon('warning', class: 'text-warning')
= _('Unable to collect memory info')
.bg-light.light-well.prepend-top-default
.bg-light.light-well.gl-mt-3
%h4= _('Uptime')
.data
%h2= distance_of_time_in_words_to_now(Rails.application.config.booted_at)
......
- link = link_to(s_('ClusterIntegration|sign up'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer')
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.gl-mb-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.gl-mt-3.gl-mb-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: user_callouts_path } }
%button.close.js-close{ type: "button" } &times;
.gcp-signup-offer--content
.gcp-signup-offer--icon.gl-mr-3
......
......@@ -6,7 +6,7 @@
= render_gcp_signup_offer
.row.prepend-top-default
.row.gl-mt-3
.col-md-3
= render 'sidebar'
.col-md-9.js-toggle-container
......
......@@ -25,5 +25,5 @@
= f.label :scopes, class: 'label-bold'
= render 'shared/tokens/scopes_form', prefix: 'doorkeeper_application', token: application, scopes: @scopes
.prepend-top-default
.gl-mt-3
= f.submit _('Save application'), class: "btn btn-success"
- page_title _("Applications")
- @content_class = "limit-container-width" unless fluid_layout
.row.prepend-top-default
.row.gl-mt-3
.col-lg-4.profile-settings-sidebar
%h4.gl-mt-0
= page_title
......
......@@ -27,7 +27,7 @@
- new_project_label = _("New project")
- new_subgroup_label = _("New subgroup")
- if can_create_projects and can_create_subgroups
.btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.prepend-top-default.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown{ data: { project_path: new_project_path(namespace_id: @group.id), subgroup_path: new_group_path(parent_id: @group.id) } }
.btn-group.new-project-subgroup.droplab-dropdown.home-panel-action-button.gl-mt-3.js-new-project-subgroup.qa-new-project-or-subgroup-dropdown{ data: { project_path: new_project_path(namespace_id: @group.id), subgroup_path: new_group_path(parent_id: @group.id) } }
%input.btn.btn-success.dropdown-primary.js-new-group-child.qa-new-in-group-button{ type: "button", value: new_project_label, data: { action: "new-project" } }
%button.btn.btn-success.dropdown-toggle.js-dropdown-toggle.qa-new-project-or-subgroup-dropdown-toggle{ type: "button", data: { "dropdown-trigger" => "#new-project-or-subgroup-dropdown", 'display' => 'static' } }
= sprite_icon("chevron-down", css_class: "icon dropdown-btn-icon")
......@@ -48,9 +48,9 @@
%strong= new_subgroup_label
%span= s_("GroupsTree|Create a subgroup in this group.")
- elsif can_create_projects
= link_to new_project_label, new_project_path(namespace_id: @group.id), class: "btn btn-success prepend-top-default"
= link_to new_project_label, new_project_path(namespace_id: @group.id), class: "btn btn-success gl-mt-3"
- elsif can_create_subgroups
= link_to new_subgroup_label, new_group_path(parent_id: @group.id), class: "btn btn-success prepend-top-default"
= link_to new_subgroup_label, new_group_path(parent_id: @group.id), class: "btn btn-success gl-mt-3"
- if @group.description.present?
.group-home-desc.mt-1
......
......@@ -4,7 +4,7 @@
- pending_active = params[:search_invited].present?
- total_count = @members.count + @group.shared_with_group_links.count
.project-members-page.prepend-top-default
.project-members-page.gl-mt-3
%h4
= _("Group members")
%hr
......
......@@ -4,7 +4,7 @@
- header_title _("Groups"), dashboard_groups_path
- active_tab = local_assigns.fetch(:active_tab, 'create')
.group-edit-container.prepend-top-default
.group-edit-container.gl-mt-3
.row
.col-lg-3.group-settings-sidebar
%h4.prepend-top-0
......
- breadcrumb_title _("Projects")
- page_title _("Projects")
.card.prepend-top-default
.card.gl-mt-3
.card-header
%strong= @group.name
projects:
......
......@@ -19,7 +19,7 @@
= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
.form-group.prepend-top-default.append-bottom-20
.form-group.gl-mt-3.append-bottom-20
.avatar-container.rect-avatar.s90
= group_icon(@group, alt: '', class: 'avatar group-avatar s90')
= f.label :avatar, _('Group avatar'), class: 'label-bold d-block'
......
......@@ -40,4 +40,4 @@
= render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group