Commit c8261fdf authored by Enrique Alcántara's avatar Enrique Alcántara

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

Replace prepend-top-10 css class

See merge request gitlab-org/gitlab!37505
parents 63c99d35 7d0768ed
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
autocomplete="off" autocomplete="off"
/> />
<project-select v-if="groupId" :group-id="groupId" :list="list" /> <project-select v-if="groupId" :group-id="groupId" :list="list" />
<div class="clearfix prepend-top-10"> <div class="clearfix gl-mt-3">
<gl-button <gl-button
ref="submit-button" ref="submit-button"
:disabled="disabled" :disabled="disabled"
......
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div class="top-area prepend-top-10 gl-mb-3"> <div class="top-area gl-mt-3 gl-mb-3">
<ul class="nav-links issues-state-filters"> <ul class="nav-links issues-state-filters">
<li :class="{ active: activeTab == 'all' }"> <li :class="{ active: activeTab == 'all' }">
<a href="#" role="button" @click.prevent="changeTab('all')"> <a href="#" role="button" @click.prevent="changeTab('all')">
......
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
<template> <template>
<div> <div>
<label class="label-bold prepend-top-10">{{ __('Project') }}</label> <label class="label-bold gl-mt-3">{{ __('Project') }}</label>
<div ref="projectsDropdown" class="dropdown dropdown-projects"> <div ref="projectsDropdown" class="dropdown dropdown-projects">
<button <button
class="dropdown-menu-toggle wide" class="dropdown-menu-toggle wide"
......
...@@ -335,7 +335,7 @@ export default { ...@@ -335,7 +335,7 @@ export default {
<div> <div>
<slot name="description"></slot> <slot name="description"></slot>
</div> </div>
<div v-if="hasError" class="cluster-application-error text-danger prepend-top-10"> <div v-if="hasError" class="cluster-application-error text-danger gl-mt-3">
<p class="js-cluster-application-general-error-message gl-mb-0"> <p class="js-cluster-application-general-error-message gl-mb-0">
{{ generalErrorDescription }} {{ generalErrorDescription }}
</p> </p>
......
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
<gl-link :href="helpPath">{{ __('More information') }}</gl-link> <gl-link :href="helpPath">{{ __('More information') }}</gl-link>
</p> </p>
<div class="cluster-application-list prepend-top-10"> <div class="cluster-application-list gl-mt-3">
<application-row <application-row
v-if="!managedAppsLocalTillerEnabled" v-if="!managedAppsLocalTillerEnabled"
id="helm" id="helm"
......
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
<div v-if="canRenderPipelineButton" class="nav justify-content-end"> <div v-if="canRenderPipelineButton" class="nav justify-content-end">
<gl-button <gl-button
variant="success" variant="success"
class="js-run-mr-pipeline prepend-top-10 btn-wide-on-xs" class="js-run-mr-pipeline gl-mt-3 btn-wide-on-xs"
:disabled="state.isRunningMergeRequestPipeline" :disabled="state.isRunningMergeRequestPipeline"
@click="tryRunPipeline" @click="tryRunPipeline"
> >
......
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
:diff-file="diffFile" :diff-file="diffFile"
:show-suggest-popover="showSuggestPopover" :show-suggest-popover="showSuggestPopover"
save-button-title="Comment" save-button-title="Comment"
class="diff-comment-form prepend-top-10" class="diff-comment-form gl-mt-3"
@handleFormUpdateAddToReview="addToReview" @handleFormUpdateAddToReview="addToReview"
@cancelForm="handleCancelCommentForm" @cancelForm="handleCancelCommentForm"
@handleFormUpdate="handleSaveNote" @handleFormUpdate="handleSaveNote"
......
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
/> />
<div :key="`sub-div-${i}`"> <div :key="`sub-div-${i}`">
<div class="text-center prepend-top-10"> <div class="text-center gl-mt-3">
<a :href="folderUrl(model)" class="btn btn-default"> <a :href="folderUrl(model)" class="btn btn-default">
{{ s__('Environments|Show all') }} {{ s__('Environments|Show all') }}
</a> </a>
......
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
:title="modifiedTooltip" :title="modifiedTooltip"
data-container="body" data-container="body"
data-placement="left" data-placement="left"
class="prepend-top-10 gl-mb-3" class="gl-mt-3 gl-mb-3"
> >
<icon :name="modifiedIconName" :size="18" :class="modifiedFilesClass" /> <icon :name="modifiedIconName" :size="18" :class="modifiedFilesClass" />
</div> </div>
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
) )
}}</span> }}</span>
</p> </p>
<div class="btn-group d-flex prepend-top-10" role="group"> <div class="btn-group d-flex gl-mt-3" role="group">
<gl-link <gl-link
v-if="artifact.keep_path" v-if="artifact.keep_path"
:href="artifact.keep_path" :href="artifact.keep_path"
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
:markdown-preview-path="markdownPreviewPath" :markdown-preview-path="markdownPreviewPath"
:markdown-docs-path="markdownDocsPath" :markdown-docs-path="markdownDocsPath"
:add-spacing-classes="false" :add-spacing-classes="false"
class="prepend-top-10 gl-mb-3" class="gl-mt-3 gl-mb-3"
> >
<template #textarea> <template #textarea>
<textarea <textarea
......
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
v-for="(field, key, index) in modalData" v-for="(field, key, index) in modalData"
v-if="field.value" v-if="field.value"
:key="index" :key="index"
class="row prepend-top-10 gl-mb-3" class="row gl-mt-3 gl-mb-3"
> >
<strong class="col-sm-3 text-right"> {{ field.text }}: </strong> <strong class="col-sm-3 text-right"> {{ field.text }}: </strong>
......
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
<template> <template>
<div class="file-container"> <div class="file-container">
<div class="file-content"> <div class="file-content">
<p class="prepend-top-10 file-info"> <p class="gl-mt-3 file-info">
{{ fileName }} {{ fileName }}
<template v-if="fileSize > 0"> <template v-if="fileSize > 0">
({{ fileSizeReadable }}) ({{ fileSizeReadable }})
......
...@@ -396,7 +396,6 @@ img.emoji { ...@@ -396,7 +396,6 @@ img.emoji {
🚨 Do not use these classes — they are deprecated and being removed. 🚨 🚨 Do not use these classes — they are deprecated and being removed. 🚨
See https://gitlab.com/gitlab-org/gitlab/-/issues/217418 for more details. See https://gitlab.com/gitlab-org/gitlab/-/issues/217418 for more details.
**/ **/
.prepend-top-10 { margin-top: 10px; }
.prepend-top-15 { margin-top: 15px; } .prepend-top-15 { margin-top: 15px; }
.prepend-top-20 { margin-top: 20px; } .prepend-top-20 { margin-top: 20px; }
.prepend-left-15 { margin-left: 15px; } .prepend-left-15 { margin-left: 15px; }
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
= f.check_box :user_default_external, class: 'form-check-input' = f.check_box :user_default_external, class: 'form-check-input'
= f.label :user_default_external, class: 'form-check-label' do = f.label :user_default_external, class: 'form-check-label' do
= _('Newly registered users will by default be external') = _('Newly registered users will by default be external')
.prepend-top-10 .gl-mt-3
= _('Internal users') = _('Internal users')
= f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-mt-2' = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-mt-2'
.help-block .help-block
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
= form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do
%div %div
= users_select_tag(:user_ids, multiple: true, email_user: true, skip_ldap: @group.ldap_synced?, scope: :all) = users_select_tag(:user_ids, multiple: true, email_user: true, skip_ldap: @group.ldap_synced?, scope: :all)
.prepend-top-10 .gl-mt-3
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2" = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr %hr
= button_tag _('Add users to group'), class: "btn btn-success" = button_tag _('Add users to group'), class: "btn btn-success"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%p %p
#{ s_('HealthCheck|Access token is') } #{ s_('HealthCheck|Access token is') }
%code#health-check-token= Gitlab::CurrentSettings.health_check_access_token %code#health-check-token= Gitlab::CurrentSettings.health_check_access_token
.prepend-top-10 .gl-mt-3
= button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path, = button_to _("Reset health check access token"), reset_health_check_token_admin_application_settings_path,
method: :put, class: 'btn btn-default', method: :put, class: 'btn btn-default',
data: { confirm: _('Are you sure you want to reset the health check token?') } data: { confirm: _('Are you sure you want to reset the health check token?') }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= _("Use the following registration token during setup:") = _("Use the following registration token during setup:")
%code#registration_token= registration_token %code#registration_token= registration_token
= clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard") = clipboard_button(target: '#registration_token', title: _("Copy token"), class: "btn-transparent btn-clipboard")
.prepend-top-10.gl-mb-3 .gl-mt-3.gl-mb-3
= button_to _("Reset runners registration token"), reset_token_url, = button_to _("Reset runners registration token"), reset_token_url,
method: :put, class: 'btn btn-default', method: :put, class: 'btn btn-default',
data: { confirm: _("Are you sure you want to reset registration token?") } data: { confirm: _("Are you sure you want to reset registration token?") }
......
= form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f| = form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
= render_if_exists 'shared/pages/max_pages_size_input', form: f = render_if_exists 'shared/pages/max_pages_size_input', form: f
.prepend-top-10 .gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn btn-success' = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- return unless branches.any? - return unless branches.any?
.card.prepend-top-10 .card.gl-mt-3
.card-header .card-header
= panel_title = panel_title
%ul.content-list.all-branches.qa-all-branches %ul.content-list.all-branches.qa-all-branches
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#ci-editor.ci-editor= @content #ci-editor.ci-editor= @content
= text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true) = text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true)
.col-sm-12 .col-sm-12
.float-left.prepend-top-10 .float-left.gl-mt-3
= submit_tag(_('Validate'), class: 'btn btn-success submit-yml') = submit_tag(_('Validate'), class: 'btn btn-success submit-yml')
.float-right.prepend-top-10 .float-right.gl-mt-3
= button_tag(_('Clear'), type: 'button', class: 'btn btn-default clear-yml') = button_tag(_('Clear'), type: 'button', class: 'btn btn-default clear-yml')
.row.prepend-top-20 .row.prepend-top-20
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.svg-content .svg-content
= render svg_path = render svg_path
%div{ class: is_empty_state ? "text-content" : "prepend-top-10 gl-ml-3" } %div{ class: is_empty_state ? "text-content" : "gl-mt-3 gl-ml-3" }
- if is_empty_state - if is_empty_state
%h4= title_text %h4= title_text
- else - else
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= link_to _('Read more'), help_page_path('user/project/service_desk') = link_to _('Read more'), help_page_path('user/project/service_desk')
- if can_edit_project_settings && !service_desk_enabled - if can_edit_project_settings && !service_desk_enabled
%div{ class: is_empty_state ? "text-center" : "prepend-top-10" } %div{ class: is_empty_state ? "text-center" : "gl-mt-3" }
= link_to _("Turn on Service Desk"), edit_project_path(@project), class: 'btn btn-success' = link_to _("Turn on Service Desk"), edit_project_path(@project), class: 'btn btn-success'
- else - else
.empty-state .empty-state
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#promote-label-modal #promote-label-modal
= render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
.labels-container.prepend-top-10 .labels-container.gl-mt-3
- if can_admin_label && search.blank? - if can_admin_label && search.blank?
%p.text-muted %p.text-muted
= _('Labels can be applied to issues and merge requests.') = _('Labels can be applied to issues and merge requests.')
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
-# Only show it in the first page -# Only show it in the first page
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
.prioritized-labels{ class: [('hide' if hide), ('is-not-draggable' unless can_admin_label)] } .prioritized-labels{ class: [('hide' if hide), ('is-not-draggable' unless can_admin_label)] }
%h5.prepend-top-10= _('Prioritized Labels') %h5.gl-mt-3= _('Prioritized Labels')
.content-list.manage-labels-list.js-prioritized-labels{ data: { url: set_priorities_project_labels_path(@project), sortable: can_admin_label } } .content-list.manage-labels-list.js-prioritized-labels{ data: { url: set_priorities_project_labels_path(@project), sortable: can_admin_label } }
#js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty? && search.blank?}" } #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty? && search.blank?}" }
= render 'shared/empty_states/priority_labels' = render 'shared/empty_states/priority_labels'
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%button.btn.btn-inverted.btn-secondary.inline.js-detect-host-keys.gl-mr-3{ type: 'button', data: { qa_selector: 'detect_host_keys' } } %button.btn.btn-inverted.btn-secondary.inline.js-detect-host-keys.gl-mr-3{ type: 'button', data: { qa_selector: 'detect_host_keys' } }
.js-spinner.d-none.spinner.mr-1 .js-spinner.d-none.spinner.mr-1
= _('Detect host keys') = _('Detect host keys')
.fingerprint-ssh-info.js-fingerprint-ssh-info.prepend-top-10.gl-mb-3{ class: ('collapse' unless mirror.ssh_mirror_url?) } .fingerprint-ssh-info.js-fingerprint-ssh-info.gl-mt-3.gl-mb-3{ class: ('collapse' unless mirror.ssh_mirror_url?) }
%label.label-bold %label.label-bold
= _('Fingerprints') = _('Fingerprints')
.fingerprints-list.js-fingerprints-list{ data: { qa_selector: 'fingerprints_list' } } .fingerprints-list.js-fingerprints-list{ data: { qa_selector: 'fingerprints_list' } }
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
%strong %strong
= s_('GitLabPages|Force HTTPS (requires valid certificates)') = s_('GitLabPages|Force HTTPS (requires valid certificates)')
.prepend-top-10 .gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn btn-success' = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
= render 'ci/variables/variable_row', form_field: 'schedule', variable: variable, only_key_value: true = render 'ci/variables/variable_row', form_field: 'schedule', variable: variable, only_key_value: true
= render 'ci/variables/variable_row', form_field: 'schedule', only_key_value: true = render 'ci/variables/variable_row', form_field: 'schedule', only_key_value: true
- if @schedule.variables.size > 0 - if @schedule.variables.size > 0
%button.btn.btn-info.btn-inverted.prepend-top-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@schedule.variables.size == 0}" } } %button.btn.btn-info.btn-inverted.gl-mt-3.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@schedule.variables.size == 0}" } }
- if @schedule.variables.size == 0 - if @schedule.variables.size == 0
= n_('Hide value', 'Hide values', @schedule.variables.size) = n_('Hide value', 'Hide values', @schedule.variables.size)
- else - else
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.form-text.text-muted .form-text.text-muted
= s_("Pipeline|Existing branch name or tag") = s_("Pipeline|Existing branch name or tag")
.col-sm-12.prepend-top-10.js-ci-variable-list-section .col-sm-12.gl-mt-3.js-ci-variable-list-section
%label %label
= s_('Pipeline|Variables') = s_('Pipeline|Variables')
%ul.ci-variable-list %ul.ci-variable-list
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
- elsif !has_base_domain - elsif !has_base_domain
%p.settings-message.text-center %p.settings-message.text-center
= s_('CICD|You must add a %{base_domain_link_start}base domain%{link_end} to your %{kubernetes_cluster_link_start}Kubernetes cluster%{link_end} in order for your deployment strategy to work.').html_safe % { base_domain_link_start: base_domain_link_start, kubernetes_cluster_link_start: kubernetes_cluster_link_start, link_end: link_end } = s_('CICD|You must add a %{base_domain_link_start}base domain%{link_end} to your %{kubernetes_cluster_link_start}Kubernetes cluster%{link_end} in order for your deployment strategy to work.').html_safe % { base_domain_link_start: base_domain_link_start, kubernetes_cluster_link_start: kubernetes_cluster_link_start, link_end: link_end }
%label.prepend-top-10 %label.gl-mt-3
%strong= s_('CICD|Deployment strategy') %strong= s_('CICD|Deployment strategy')
.form-check .form-check
= form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input' = form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input'
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= link_to filter_starrer_path(sort: value), class: ("is-active" if @sort == value) do = link_to filter_starrer_path(sort: value), class: ("is-active" if @sort == value) do
= title = title
- if @starrers.size > 0 - if @starrers.size > 0
.row.prepend-top-10 .row.gl-mt-3
= render partial: 'starrer', collection: @starrers, as: :starrer = render partial: 'starrer', collection: @starrers, as: :starrer
= paginate @starrers, theme: 'gitlab' = paginate @starrers, theme: 'gitlab'
- else - else
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group } = _("in group %{link_to_group}").html_safe % { link_to_group: link_to_group }
= render_if_exists 'shared/promotions/promote_advanced_search' = render_if_exists 'shared/promotions/promote_advanced_search'
.results.prepend-top-10 .results.gl-mt-3
- if @scope == 'commits' - if @scope == 'commits'
%ul.content-list.commit-list %ul.content-list.commit-list
= render partial: "search/results/commit", collection: @search_objects = render partial: "search/results/commit", collection: @search_objects
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
%p.validation-pending.gl-field-error-ignore.field-validation.hide= _('Checking group path availability...') %p.validation-pending.gl-field-error-ignore.field-validation.hide= _('Checking group path availability...')
- if @group.persisted? - if @group.persisted?
.alert.alert-warning.prepend-top-10 .alert.alert-warning.gl-mt-3
= _('Changing group path can have unintended side effects.') = _('Changing group path can have unintended side effects.')
= succeed '.' do = succeed '.' do
= link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank'
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
= form.submit 'Save changes', class: 'btn btn-success' = form.submit 'Save changes', class: 'btn btn-success'
- if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path) - if !issuable.persisted? && !issuable.project.empty_repo? && (guide_url = issuable.project.present.contribution_guide_path)
.inline.prepend-top-10 .inline.gl-mt-3
Please review the Please review the
%strong= link_to('contribution guidelines', guide_url) %strong= link_to('contribution guidelines', guide_url)
for this project. for this project.
......
...@@ -111,10 +111,7 @@ export default { ...@@ -111,10 +111,7 @@ export default {
<div v-if="isSignedIn && hasProjects" class="inline"> <div v-if="isSignedIn && hasProjects" class="inline">
<strong>{{ __('Select GitLab project to link with your Slack team') }}</strong> <strong>{{ __('Select GitLab project to link with your Slack team') }}</strong>
<select <select v-model="selectedProjectId" class="js-project-select form-control gl-mt-3 gl-mb-3">
v-model="selectedProjectId"
class="js-project-select form-control prepend-top-10 gl-mb-3"
>
<option v-for="project in projects" :key="project.id" :value="project.id"> <option v-for="project in projects" :key="project.id" :value="project.id">
{{ project.name }} {{ project.name }}
</option> </option>
......
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
v-else-if="isLoading && !hasError" v-else-if="isLoading && !hasError"
:label="s__('SubscriptionTable|Loading subscriptions')" :label="s__('SubscriptionTable|Loading subscriptions')"
size="lg" size="lg"
class="prepend-top-10 gl-mb-3" class="gl-mt-3 gl-mb-3"
/> />
</div> </div>
</template> </template>
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
:loading="epicCreateInProgress" :loading="epicCreateInProgress"
category="primary" category="primary"
variant="success" variant="success"
class="prepend-top-10 qa-create-epic-button" class="gl-mt-3 qa-create-epic-button"
@click.stop="createEpic" @click.stop="createEpic"
>{{ buttonLabel }}</gl-button >{{ buttonLabel }}</gl-button
> >
......
...@@ -267,7 +267,7 @@ export default { ...@@ -267,7 +267,7 @@ export default {
v-tooltip v-tooltip
:title="dateFromMilestonesTooltip" :title="dateFromMilestonesTooltip"
:class="{ 'is-option-selected': !selectedDateIsFixed }" :class="{ 'is-option-selected': !selectedDateIsFixed }"
class="value-type-dynamic text-secondary d-flex prepend-top-10" class="value-type-dynamic text-secondary d-flex gl-mt-3"
data-placement="bottom" data-placement="bottom"
data-html="true" data-html="true"
> >
......
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
</script> </script>
<template> <template>
<div> <div>
<div class="d-flex justify-content-between bold prepend-top-10 gl-mb-3"> <div class="d-flex justify-content-between bold gl-mt-3 gl-mb-3">
<div class="js-selected-plan"> <div class="js-selected-plan">
{{ sprintf($options.i18n.selectedPlanText, { selectedPlanText }) }} {{ sprintf($options.i18n.selectedPlanText, { selectedPlanText }) }}
<span v-if="usersPresent" class="js-number-of-users">{{ <span v-if="usersPresent" class="js-number-of-users">{{
......
...@@ -47,13 +47,13 @@ export default { ...@@ -47,13 +47,13 @@ export default {
@cancel="resetLicenseInModal" @cancel="resetLicenseInModal"
> >
<slot v-if="currentLicenseInModal"> <slot v-if="currentLicenseInModal">
<div class="row prepend-top-10 gl-mb-3 js-license-name"> <div class="row gl-mt-3 gl-mb-3 js-license-name">
<label class="col-sm-3 text-right font-weight-bold"> <label class="col-sm-3 text-right font-weight-bold">
{{ s__('LicenseCompliance|License') }}: {{ s__('LicenseCompliance|License') }}:
</label> </label>
<div class="col-sm-9 text-secondary">{{ currentLicenseInModal.name }}</div> <div class="col-sm-9 text-secondary">{{ currentLicenseInModal.name }}</div>
</div> </div>
<div v-if="currentLicenseInModal.url" class="row prepend-top-10 gl-mb-3 js-license-url"> <div v-if="currentLicenseInModal.url" class="row gl-mt-3 gl-mb-3 js-license-url">
<label class="col-sm-3 text-right font-weight-bold"> <label class="col-sm-3 text-right font-weight-bold">
{{ s__('LicenseCompliance|URL') }}: {{ s__('LicenseCompliance|URL') }}:
</label> </label>
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
}}</gl-link> }}</gl-link>
</div> </div>
</div> </div>
<div class="row prepend-top-10 gl-mb-3 js-license-packages"> <div class="row gl-mt-3 gl-mb-3 js-license-packages">
<label class="col-sm-3 text-right font-weight-bold"> <label class="col-sm-3 text-right font-weight-bold">
{{ s__('LicenseCompliance|Packages') }}: {{ s__('LicenseCompliance|Packages') }}:
</label> </label>
......
...@@ -9,40 +9,25 @@ import { REPORT_TYPES } from 'ee/security_dashboard/store/constants'; ...@@ -9,40 +9,25 @@ import { REPORT_TYPES } from 'ee/security_dashboard/store/constants';
export default { export default {
name: 'VulnerabilityDetails', name: 'VulnerabilityDetails',
components: { components: { CodeBlock, GlFriendlyWrap, SeverityBadge, VulnerabilityDetail, GlLink },
CodeBlock, props: { vulnerability: { type: Object, required: true } },
GlFriendlyWrap,
SeverityBadge,
VulnerabilityDetail,
GlLink,
},
props: {
vulnerability: {
type: Object,
required: true,
},
},
computed: { computed: {
url() { url() {
return this.vulnerability.request?.url || getFileLocation(this.vulnerability.location); return this.vulnerability.request?.url || getFileLocation(this.vulnerability.location);
}, },
file() { file() {
const file = this.vulnerability?.location?.file; const file = this.vulnerability?.location?.file;
if (!file) { if (!file) {
return null; return null;
} }
let lineSuffix = ''; let lineSuffix = '';
const { start_line: startLine, end_line: endLine } = this.vulnerability.location; const { start_line: startLine, end_line: endLine } = this.vulnerability.location;
if (startLine) { if (startLine) {
lineSuffix += `:${startLine}`; lineSuffix += `:${startLine}`;
if (endLine && startLine !== endLine) { if (endLine && startLine !== endLine) {
lineSuffix += `-${endLine}`; lineSuffix += `-${endLine}`;
} }
} }
return `${file}${lineSuffix}`; return `${file}${lineSuffix}`;
}, },
identifiers() { identifiers() {
...@@ -91,7 +76,6 @@ export default { ...@@ -91,7 +76,6 @@ export default {
if (!this.scannerVersion) { if (!this.scannerVersion) {
return this.scannerName; return this.scannerName;
} }
return sprintf(s__('Vulnerability|%{scannerName} (version %{scannerVersion})'), { return sprintf(s__('Vulnerability|%{scannerName} (version %{scannerVersion})'), {
scannerName: this.scannerName, scannerName: this.scannerName,
scannerVersion: this.scannerVersion, scannerVersion: this.scannerVersion,
...@@ -114,7 +98,6 @@ export default { ...@@ -114,7 +98,6 @@ export default {
}, },
}; };
</script> </script>
<template> <template>
<div class="border-white mb-0 px-3"> <div class="border-white mb-0 px-3">
<vulnerability-detail <vulnerability-detail
...@@ -123,35 +106,28 @@ export default { ...@@ -123,35 +106,28 @@ export default {
> >
<gl-friendly-wrap :text="vulnerability.description" /> <gl-friendly-wrap :text="vulnerability.description" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="vulnerability.project" :label="s__('Vulnerability|Project')"> <vulnerability-detail v-if="vulnerability.project" :label="s__('Vulnerability|Project')">
<gl-link ref="projectLink" :href="vulnerability.project.full_path" target="_blank"> <gl-link ref="projectLink" :href="vulnerability.project.full_path" target="_blank">
<gl-friendly-wrap :text="vulnerability.project.full_name" /> <gl-friendly-wrap :text="vulnerability.project.full_name" />
</gl-link> </gl-link>
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="methodName" :label="s__('Vulnerability|Method')"> <vulnerability-detail v-if="methodName" :label="s__('Vulnerability|Method')">
<gl-friendly-wrap :text="methodName" /> <gl-friendly-wrap :text="methodName" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="url" :label="__('URL')"> <vulnerability-detail v-if="url" :label="__('URL')">
<gl-link ref="urlLink" :href="url" target="_blank"> <gl-link ref="urlLink" :href="url" target="_blank">
<gl-friendly-wrap :text="url" /> <gl-friendly-wrap :text="url" />
</gl-link> </gl-link>
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="requestHeaders" :label="__('Request Headers')"> <vulnerability-detail v-if="requestHeaders" :label="__('Request Headers')">
<code-block ref="requestHeaders" :code="requestHeaders" max-height="225px" /> <code-block ref="requestHeaders" :code="requestHeaders" max-height="225px" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="responseStatusCode" :label="__('Response Status')"> <vulnerability-detail v-if="responseStatusCode" :label="__('Response Status')">
<gl-friendly-wrap ref="responseStatusCode" :text="responseStatusCode" /> <gl-friendly-wrap ref="responseStatusCode" :text="responseStatusCode" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="responseHeaders" :label="__('Response Headers')"> <vulnerability-detail v-if="responseHeaders" :label="__('Response Headers')">
<code-block ref="responseHeaders" :code="responseHeaders" max-height="225px" /> <code-block ref="responseHeaders" :code="responseHeaders" max-height="225px" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="file" :label="s__('Vulnerability|File')"> <vulnerability-detail v-if="file" :label="s__('Vulnerability|File')">
<gl-link <gl-link
v-if="vulnerability.blob_path" v-if="vulnerability.blob_path"
...@@ -163,19 +139,15 @@ export default { ...@@ -163,19 +139,15 @@ export default {
</gl-link> </gl-link>
<gl-friendly-wrap v-else :text="file" /> <gl-friendly-wrap v-else :text="file" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="vulnerability.evidence" :label="s__('Vulnerability|Evidence')"> <vulnerability-detail v-if="vulnerability.evidence" :label="s__('Vulnerability|Evidence')">
<gl-friendly-wrap :text="vulnerability.evidence" /> <gl-friendly-wrap :text="vulnerability.evidence" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="crashAddress" :label="s__('Vulnerability|Crash Address')"> <vulnerability-detail v-if="crashAddress" :label="s__('Vulnerability|Crash Address')">
<gl-friendly-wrap ref="crashAddress" :text="crashAddress" /> <gl-friendly-wrap ref="crashAddress" :text="crashAddress" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="stacktraceSnippet" :label="s__('Stacktrace snippet')"> <vulnerability-detail v-if="stacktraceSnippet" :label="s__('Stacktrace snippet')">
<code-block ref="stacktraceSnippet" :code="stacktraceSnippet" max-height="225px" /> <code-block ref="stacktraceSnippet" :code="stacktraceSnippet" max-height="225px" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="identifiers" :label="s__('Vulnerability|Identifiers')"> <vulnerability-detail v-if="identifiers" :label="s__('Vulnerability|Identifiers')">
<span v-for="(identifier, i) in identifiers" :key="i"> <span v-for="(identifier, i) in identifiers" :key="i">
<gl-link <gl-link
...@@ -191,34 +163,27 @@ export default { ...@@ -191,34 +163,27 @@ export default {
<span v-if="hasMoreValues(i, identifiers)">,&nbsp;</span> <span v-if="hasMoreValues(i, identifiers)">,&nbsp;</span>
</span> </span>
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="vulnerability.severity" :label="s__('Vulnerability|Severity')"> <vulnerability-detail v-if="vulnerability.severity" :label="s__('Vulnerability|Severity')">
<severity-badge :severity="vulnerability.severity" class="d-inline" /> <severity-badge :severity="vulnerability.severity" class="d-inline" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="vulnerability.report_type" :label="s__('Vulnerability|Scanner')"> <vulnerability-detail v-if="vulnerability.report_type" :label="s__('Vulnerability|Scanner')">
<gl-friendly-wrap :text="scannerType" /> <gl-friendly-wrap :text="scannerType" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="scannerProvider" :label="s__('Vulnerability|Scanner Provider')"> <vulnerability-detail v-if="scannerProvider" :label="s__('Vulnerability|Scanner Provider')">
<gl-link v-if="scannerUrl" ref="scannerLink" :href="scannerUrl" target="_blank"> <gl-link v-if="scannerUrl" ref="scannerLink" :href="scannerUrl" target="_blank">
<gl-friendly-wrap :text="scannerProvider" /> <gl-friendly-wrap :text="scannerProvider" />
</gl-link> </gl-link>
<gl-friendly-wrap v-else :text="scannerProvider" /> <gl-friendly-wrap v-else :text="scannerProvider" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="className" :label="s__('Vulnerability|Class')"> <vulnerability-detail v-if="className" :label="s__('Vulnerability|Class')">
<gl-friendly-wrap :text="className" /> <gl-friendly-wrap :text="className" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="image" :label="s__('Vulnerability|Image')"> <vulnerability-detail v-if="image" :label="s__('Vulnerability|Image')">
<gl-friendly-wrap :text="image" /> <gl-friendly-wrap :text="image" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="namespace" :label="s__('Vulnerability|Namespace')"> <vulnerability-detail v-if="namespace" :label="s__('Vulnerability|Namespace')">
<gl-friendly-wrap :text="namespace" /> <gl-friendly-wrap :text="namespace" />
</vulnerability-detail> </vulnerability-detail>
<vulnerability-detail v-if="links" :label="s__('Vulnerability|Links')"> <vulnerability-detail v-if="links" :label="s__('Vulnerability|Links')">
<span v-for="(link, i) in links" :key="i"> <span v-for="(link, i) in links" :key="i">
<gl-link ref="linksLink" :href="link.url" target="_blank"> <gl-link ref="linksLink" :href="link.url" target="_blank">
......
.user-callout.promotion-callout { .user-callout.promotion-callout {
margin: 20px 0 0; margin: 20px 0 0;
&.prepend-top-10 {
margin-top: 10px;
}
&.append-bottom-20 { &.append-bottom-20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= s_('License|You do not have a license.') = s_('License|You do not have a license.')
- if License.eligible_for_trial? - if License.eligible_for_trial?
%p.trial-description= s_('License|You can start a free trial of GitLab Ultimate without any obligation or payment details.') %p.trial-description= s_('License|You can start a free trial of GitLab Ultimate without any obligation or payment details.')
= link_to 'Start free trial', new_trial_url, target: '_blank', class: "btn btn-success btn-start-trial prepend-top-10" = link_to 'Start free trial', new_trial_url, target: '_blank', class: "btn btn-success btn-start-trial gl-mt-3"
- else - else
%p.trial-description %p.trial-description
= s_('License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.').html_safe % {trial_ends_on: License.trial_ends_on} = s_('License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.').html_safe % {trial_ends_on: License.trial_ends_on}
......
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
= clipboard_button(text: "#{proxy_url}", title: _("Copy %{proxy_url}") % { proxy_url: proxy_url }) = clipboard_button(text: "#{proxy_url}", title: _("Copy %{proxy_url}") % { proxy_url: proxy_url })
.row .row
.col-12.help-block.prepend-top-10 .col-12.help-block.gl-mt-3
= _('Contains %{count} blobs of images (%{size})') % { count: @blobs_count, size: number_to_human_size(@blobs_total_size) } = _('Contains %{count} blobs of images (%{size})') % { count: @blobs_count, size: number_to_human_size(@blobs_total_size) }
%section.saml-settings.prepend-top-10 %section.saml-settings.gl-mt-3
.well-segment .well-segment
%p= _("To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:") %p= _("To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:")
%ol %ol
......
...@@ -47,7 +47,7 @@ Array [ ...@@ -47,7 +47,7 @@ Array [
exports[`SubscriptionTable component when created matches the snapshot 1`] = ` exports[`SubscriptionTable component when created matches the snapshot 1`] = `
<div> <div>
<gl-loading-icon-stub <gl-loading-icon-stub
class="prepend-top-10 gl-mb-3" class="gl-mt-3 gl-mb-3"
color="orange" color="orange"
label="Loading subscriptions" label="Loading subscriptions"
size="lg" size="lg"
......
...@@ -75,7 +75,7 @@ exports[`SidebarDatePicker renders expected template 1`] = ` ...@@ -75,7 +75,7 @@ exports[`SidebarDatePicker renders expected template 1`] = `
</div> </div>
<abbr <abbr
class="value-type-dynamic text-secondary d-flex prepend-top-10" class="value-type-dynamic text-secondary d-flex gl-mt-3"
data-html="true" data-html="true"
data-original-title="Select an issue with milestone to set date" data-original-title="Select an issue with milestone to set date"
data-placement="bottom" data-placement="bottom"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment