Commit 6db42a00 authored by Martin Wortschack's avatar Martin Wortschack

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

Replace prepend-top-15 css class

See merge request gitlab-org/gitlab!37846
parents 93ebd272 79235846
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
@input="updateCommitMessage" @input="updateCommitMessage"
@submit="commit" @submit="commit"
/> />
<div class="clearfix prepend-top-15"> <div class="clearfix gl-mt-5">
<actions /> <actions />
<loading-button <loading-button
:loading="submitCommitLoading" :loading="submitCommitLoading"
......
- hide_remember_me = local_assigns.fetch(:hide_remember_me, false) - hide_remember_me = local_assigns.fetch(:hide_remember_me, false)
.omniauth-container.prepend-top-15 .omniauth-container.gl-mt-5
%label.label-bold.d-block %label.label-bold.d-block
Sign in with Sign in with
- providers = enabled_button_based_providers - providers = enabled_button_based_providers
......
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
.form-text.text-muted .form-text.text-muted
= s_('GroupSettings|The Auto DevOps pipeline will run if no alternative CI configuration file is found.') = s_('GroupSettings|The Auto DevOps pipeline will run if no alternative CI configuration file is found.')
= link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank'
= f.submit _('Save changes'), class: 'btn btn-success prepend-top-15' = f.submit _('Save changes'), class: 'btn btn-success gl-mt-5'
...@@ -54,4 +54,4 @@ ...@@ -54,4 +54,4 @@
= s_('CICD|Automatic deployment to staging, manual deployment to production') = s_('CICD|Automatic deployment to staging, manual deployment to production')
= link_to icon('question-circle'), help_page_path('topics/autodevops/customize.md', anchor: 'incremental-rollout-to-production-premium'), target: '_blank' = link_to icon('question-circle'), help_page_path('topics/autodevops/customize.md', anchor: 'incremental-rollout-to-production-premium'), target: '_blank'
= f.submit _('Save changes'), class: "btn btn-success prepend-top-15", data: { qa_selector: 'save_changes_button' } = f.submit _('Save changes'), class: "btn btn-success gl-mt-5", data: { qa_selector: 'save_changes_button' }
- if @registries.any? - if @registries.any?
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.gl-mt-5
.card-header{ id: "project-#{project_registry.project_id}-header" } .card-header{ id: "project-#{project_registry.project_id}-header" }
.d-flex.align-items-center .d-flex.align-items-center
- if project_registry.project.nil? - if project_registry.project.nil?
......
- if @registries.any? - if @registries.any?
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.gl-mt-5
.card-header{ id: "project-#{project_registry.project_id}-header" } .card-header{ id: "project-#{project_registry.project_id}-header" }
.d-flex.align-items-center .d-flex.align-items-center
- if project_registry.project.nil? - if project_registry.project.nil?
......
- if @registries.any? - if @registries.any?
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.gl-mt-5
.card-header{ id: "project-#{project_registry.project_id}-header" } .card-header{ id: "project-#{project_registry.project_id}-header" }
.d-flex.align-items-center .d-flex.align-items-center
- if project_registry.project.nil? - if project_registry.project.nil?
......
- if @registries.any? - if @registries.any?
- @registries.each do |project_registry| - @registries.each do |project_registry|
.card.project-card.prepend-top-15 .card.project-card.gl-mt-5
.card-header{ id: "project-#{project_registry.project_id}-header" } .card-header{ id: "project-#{project_registry.project_id}-header" }
.d-flex.align-items-center .d-flex.align-items-center
- if project_registry.project.nil? - if project_registry.project.nil?
......
.card.upload-card.prepend-top-15 .card.upload-card.gl-mt-5
.card-header{ id: "upload-#{upload_registry.id}-header" } .card-header{ id: "upload-#{upload_registry.id}-header" }
.d-flex .d-flex
%strong.text-truncate.flex-fill %strong.text-truncate.flex-fill
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: 'Close' } } %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: 'Close' } }
%span &times; %span &times;
.modal-body-contents .modal-body-contents
.trial-activated-graphic.prepend-top-15 .trial-activated-graphic.gl-mt-5
= custom_icon('ee_trial_license_activated', size: 100) = custom_icon('ee_trial_license_activated', size: 100)
%h3.confirmation-title %h3.confirmation-title
Your trial license was issued! Your trial license was issued!
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%a#show-license.show-license{ href: '#show-license' } %a#show-license.show-license{ href: '#show-license' }
Hide license key Hide license key
= icon('chevron-up') = icon('chevron-up')
.card.trial-license-preview.prepend-top-15 .card.trial-license-preview.gl-mt-5
= license_key = license_key
.modal-footer.form-actions .modal-footer.form-actions
%button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel
......
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
%p %p
= _('Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group.') = _('Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group.')
= link_to _('Read more'), help_page_path('user/project/integrations/webhooks.md'), target: '_blank' = link_to _('Read more'), help_page_path('user/project/integrations/webhooks.md'), target: '_blank'
.prepend-top-15 .gl-mt-5
= render 'shared/promotions/promotion_link_project' = render 'shared/promotions/promotion_link_project'
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