diff options
Diffstat (limited to 'app/views')
98 files changed, 130 insertions, 130 deletions
diff --git a/app/views/admin/appearances/_form.html.haml b/app/views/admin/appearances/_form.html.haml index c7efc4955ab..fcb1c1a6f3e 100644 --- a/app/views/admin/appearances/_form.html.haml +++ b/app/views/admin/appearances/_form.html.haml @@ -1,6 +1,6 @@ - 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 diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 3afed99334b..7c6c21bc509 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -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 diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index ccb3f8594d4..da2b2c60b15 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -1,7 +1,7 @@ - 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 diff --git a/app/views/admin/hook_logs/_index.html.haml b/app/views/admin/hook_logs/_index.html.haml index eeeb58f9c76..5e70e80cff7 100644 --- a/app/views/admin/hook_logs/_index.html.haml +++ b/app/views/admin/hook_logs/_index.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-3 %h4.gl-mt-0 Recent Deliveries diff --git a/app/views/admin/hooks/_form.html.haml b/app/views/admin/hooks/_form.html.haml index 072f80b56b9..17bb054b869 100644 --- a/app/views/admin/hooks/_form.html.haml +++ b/app/views/admin/hooks/_form.html.haml @@ -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 diff --git a/app/views/admin/hooks/edit.html.haml b/app/views/admin/hooks/edit.html.haml index 360b85fd451..f9faf5b11fa 100644 --- a/app/views/admin/hooks/edit.html.haml +++ b/app/views/admin/hooks/edit.html.haml @@ -1,7 +1,7 @@ - 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 diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 1d2850b2bee..d70baa592ea 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -1,6 +1,6 @@ - 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 diff --git a/app/views/admin/impersonation_tokens/index.html.haml b/app/views/admin/impersonation_tokens/index.html.haml index 8342507d8a6..ec393fdd794 100644 --- a/app/views/admin/impersonation_tokens/index.html.haml +++ b/app/views/admin/impersonation_tokens/index.html.haml @@ -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', diff --git a/app/views/admin/requests_profiles/index.html.haml b/app/views/admin/requests_profiles/index.html.haml index b7a4401d90e..6e1ac452d52 100644 --- a/app/views/admin/requests_profiles/index.html.haml +++ b/app/views/admin/requests_profiles/index.html.haml @@ -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 diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml index 4ce1629bb53..67c607270a5 100644 --- a/app/views/admin/sessions/new.html.haml +++ b/app/views/admin/sessions/new.html.haml @@ -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? diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index b7648979edd..312ca62cfdf 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -1,6 +1,6 @@ - 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) diff --git a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml index b9fff03b938..3869ca6591c 100644 --- a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml +++ b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml @@ -1,5 +1,5 @@ - 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" } × .gcp-signup-offer--content .gcp-signup-offer--icon.gl-mr-3 diff --git a/app/views/clusters/clusters/new.html.haml b/app/views/clusters/clusters/new.html.haml index fae78fbb7f4..0a51d4b2e93 100644 --- a/app/views/clusters/clusters/new.html.haml +++ b/app/views/clusters/clusters/new.html.haml @@ -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 diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml index 79abe31a056..d74cba984e8 100644 --- a/app/views/doorkeeper/applications/_form.html.haml +++ b/app/views/doorkeeper/applications/_form.html.haml @@ -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" diff --git a/app/views/doorkeeper/applications/index.html.haml b/app/views/doorkeeper/applications/index.html.haml index 1ed59e97315..bf8e2d2dd31 100644 --- a/app/views/doorkeeper/applications/index.html.haml +++ b/app/views/doorkeeper/applications/index.html.haml @@ -1,7 +1,7 @@ - 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 diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 9bf7ad228d9..75712c0efb2 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -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 diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml index 1f2fb747c7d..c488e75da09 100644 --- a/app/views/groups/group_members/index.html.haml +++ b/app/views/groups/group_members/index.html.haml @@ -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 diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index ed016206310..a231702012c 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -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 diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index c9cf8c5a76c..bf9d89da24a 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -1,7 +1,7 @@ - breadcrumb_title _("Projects") - page_title _("Projects") -.card.prepend-top-default +.card.gl-mt-3 .card-header %strong= @group.name projects: diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml index 742bf50fb89..0094104e07d 100644 --- a/app/views/groups/settings/_general.html.haml +++ b/app/views/groups/settings/_general.html.haml @@ -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' diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 4f5fb0afb1f..d4886a3c631 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -40,4 +40,4 @@ = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group = render_if_exists 'groups/member_lock_setting', f: f, group: @group - = f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } + = f.submit _('Save changes'), class: 'btn btn-success gl-mt-3 js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } diff --git a/app/views/groups/settings/ci_cd/_form.html.haml b/app/views/groups/settings/ci_cd/_form.html.haml index 54e88d11827..139c710fac0 100644 --- a/app/views/groups/settings/ci_cd/_form.html.haml +++ b/app/views/groups/settings/ci_cd/_form.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default +.row.gl-mt-3 .col-lg-12 = form_for group, url: group_settings_ci_cd_path(group, anchor: 'js-general-pipeline-settings') do |f| = form_errors(group) diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index ed904c48ddb..03f8539293b 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -1,6 +1,6 @@ %div - if Gitlab::CurrentSettings.help_page_text.present? - .prepend-top-default.md + .gl-mt-3.md = markdown_field(Gitlab::CurrentSettings.current_application_settings, :help_page_text) %hr @@ -28,7 +28,7 @@ %p= link_to 'Check the current instance configuration ', help_instance_configuration_url %hr -.row.prepend-top-default +.row.gl-mt-3 .col-md-8 .documentation-index.md = markdown(@help_index) diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml index dace8a77736..c41f6ea3ed4 100644 --- a/app/views/help/show.html.haml +++ b/app/views/help/show.html.haml @@ -1,5 +1,5 @@ - page_title @path.split("/").reverse.map(&:humanize) - @content_class = "limit-container-width" unless fluid_layout -.documentation.md.prepend-top-default +.documentation.md.gl-mt-3 = markdown @markdown diff --git a/app/views/instance_statistics/dev_ops_score/_callout.html.haml b/app/views/instance_statistics/dev_ops_score/_callout.html.haml index 64eb72c0d8d..31ae7721f5f 100644 --- a/app/views/instance_statistics/dev_ops_score/_callout.html.haml +++ b/app/views/instance_statistics/dev_ops_score/_callout.html.haml @@ -1,4 +1,4 @@ -.prepend-top-default +.gl-mt-3 .user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } } .bordered-box.landing.content-block %button.btn.btn-default.close.js-close-callout{ type: 'button', diff --git a/app/views/instance_statistics/dev_ops_score/index.html.haml b/app/views/instance_statistics/dev_ops_score/index.html.haml index 44c6e9664db..215624d27ce 100644 --- a/app/views/instance_statistics/dev_ops_score/index.html.haml +++ b/app/views/instance_statistics/dev_ops_score/index.html.haml @@ -5,7 +5,7 @@ - if usage_ping_enabled && show_callout?('dev_ops_score_intro_callout_dismissed') = render 'callout' - .prepend-top-default + .gl-mt-3 - if !usage_ping_enabled = render 'disabled' - elsif @metric.blank? diff --git a/app/views/kaminari/gitlab/_paginator.html.haml b/app/views/kaminari/gitlab/_paginator.html.haml index 1b2edc0ad22..91998147966 100644 --- a/app/views/kaminari/gitlab/_paginator.html.haml +++ b/app/views/kaminari/gitlab/_paginator.html.haml @@ -6,7 +6,7 @@ -# remote: data-remote -# paginator: the paginator that renders the pagination tags inside = paginator.render do - .gl-pagination.prepend-top-default + .gl-pagination.gl-mt-3 %ul.pagination.justify-content-center = prev_page_tag - each_page do |page| diff --git a/app/views/kaminari/gitlab/_without_count.html.haml b/app/views/kaminari/gitlab/_without_count.html.haml index d13f6ca5fa8..dc9dcbeed1d 100644 --- a/app/views/kaminari/gitlab/_without_count.html.haml +++ b/app/views/kaminari/gitlab/_without_count.html.haml @@ -1,4 +1,4 @@ -.gl-pagination.prepend-top-default +.gl-pagination.gl-mt-3 %ul.pagination.justify-content-center - if previous_path %li.page-item.prev diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index e884d2d5df6..ea2f888c129 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -5,7 +5,7 @@ .alert.alert-info = s_('Profiles|Some options are unavailable for LDAP accounts') -.row.prepend-top-default +.row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = s_('Profiles|Two-Factor Authentication') @@ -22,7 +22,7 @@ %hr - if display_providers_on_profile? - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = s_('Profiles|Social sign-in') @@ -32,7 +32,7 @@ = render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities] %hr - if current_user.can_change_username? - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0.warning-title = s_('Profiles|Change username') @@ -45,7 +45,7 @@ #update-username{ data: data } %hr -.row.prepend-top-default +.row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0.danger-title = s_('Profiles|Delete account') diff --git a/app/views/profiles/active_sessions/index.html.haml b/app/views/profiles/active_sessions/index.html.haml index 62538908d8f..f444f236cfc 100644 --- a/app/views/profiles/active_sessions/index.html.haml +++ b/app/views/profiles/active_sessions/index.html.haml @@ -1,7 +1,7 @@ - page_title _('Active Sessions') - @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 diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml index 02aadcc5c8b..aec855c790e 100644 --- a/app/views/profiles/audit_log.html.haml +++ b/app/views/profiles/audit_log.html.haml @@ -1,7 +1,7 @@ - page_title _('Authentication log') - @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 diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml index 05870e0e221..e0b0f839455 100644 --- a/app/views/profiles/chat_names/index.html.haml +++ b/app/views/profiles/chat_names/index.html.haml @@ -1,7 +1,7 @@ - page_title _('Chat') - @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 diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 4b24fc7288a..f91c7343921 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -1,7 +1,7 @@ - page_title _('Emails') - @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 @@ -14,7 +14,7 @@ .form-group = f.label :email, _('Email'), class: 'label-bold' = f.text_field :email, class: 'form-control', data: { qa_selector: 'email_address_field' } - .prepend-top-default + .gl-mt-3 = f.submit _('Add email address'), class: 'btn btn-success', data: { qa_selector: 'add_email_address_button' } %hr %h4.gl-mt-0 diff --git a/app/views/profiles/gpg_keys/_form.html.haml b/app/views/profiles/gpg_keys/_form.html.haml index 225487b2638..2fb07adc006 100644 --- a/app/views/profiles/gpg_keys/_form.html.haml +++ b/app/views/profiles/gpg_keys/_form.html.haml @@ -6,5 +6,5 @@ = f.label :key, s_('Profiles|Key'), class: 'label-bold' = f.text_area :key, class: "form-control", rows: 8, required: true, placeholder: _("Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'.") - .prepend-top-default + .gl-mt-3 = f.submit s_('Profiles|Add key'), class: "btn btn-success" diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml index 852c67ed78f..053cb3547ba 100644 --- a/app/views/profiles/gpg_keys/index.html.haml +++ b/app/views/profiles/gpg_keys/index.html.haml @@ -1,7 +1,7 @@ - page_title _('GPG Keys') - @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 diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml index 7709aa8f4b9..d507f15ab4b 100644 --- a/app/views/profiles/keys/_form.html.haml +++ b/app/views/profiles/keys/_form.html.haml @@ -23,5 +23,5 @@ %button.btn.btn-success.js-add-ssh-key-validation-confirm-submit= _("Yes, add it") - .prepend-top-default + .gl-mt-3 = f.submit s_('Profiles|Add key'), class: "btn btn-success js-add-ssh-key-validation-original-submit qa-add-key-button" diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index 88deb0f11cb..59d953678e7 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -1,5 +1,5 @@ - is_admin = defined?(admin) ? true : false -.row.prepend-top-default +.row.gl-mt-3 .col-md-4 .card .card-header diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index f11a54bcbaa..dd6b0ddbd71 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -1,7 +1,7 @@ - page_title _('SSH Keys') - @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 diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 522522c5023..ab04d977a4d 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -9,7 +9,7 @@ %li= msg = hidden_field_tag :notification_type, 'global' - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = page_title @@ -21,7 +21,7 @@ %h5.gl-mt-0 = _('Global notification settings') - = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications prepend-top-default' } do |f| + = form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications gl-mt-3' } do |f| = render_if_exists 'profiles/notifications/email_settings', form: f = label_tag :global_notification_level, "Global notification level", class: "label-bold" diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index b6653048367..d21db0a6511 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -2,7 +2,7 @@ - page_title _('Password') - @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 @@ -29,7 +29,7 @@ .form-group = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold' = f.password_field :password_confirmation, required: true, class: 'form-control', data: { qa_selector: 'confirm_password_field' } - .prepend-top-default.gl-mb-3 + .gl-mt-3.gl-mb-3 = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' } - unless @user.password_automatically_set? = link_to _('I forgot my password'), reset_profile_password_path, method: :put diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index 769502e0026..11750f2a6d5 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -4,7 +4,7 @@ - type_plural = _('personal access tokens') - @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 @@ -33,7 +33,7 @@ revoke_route_helper: ->(token) { revoke_profile_personal_access_token_path(token) } %hr -.row.prepend-top-default +.row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = s_('AccessTokens|Feed token') @@ -51,7 +51,7 @@ - if incoming_email_token_enabled? %hr - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4.profile-settings-sidebar %h4.gl-mt-0 = s_('AccessTokens|Incoming email token') @@ -69,7 +69,7 @@ - if static_objects_external_storage_enabled? %hr - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 = s_('AccessTokens|Static object token') diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index d18dc0d7dc7..a90e43fcd86 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -1,7 +1,7 @@ - page_title _('Preferences') - @content_class = "limit-container-width" unless fluid_layout -= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| += form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row gl-mt-3 js-preferences-form' } do |f| .col-lg-4.application-theme %h4.gl-mt-0 = s_('Preferences|Navigation theme') diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index c7c01f0b623..05f62784703 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -3,7 +3,7 @@ - @content_class = "limit-container-width" unless fluid_layout - gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host -= bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default js-quick-submit gl-show-field-errors' }, authenticity_token: true do |f| += bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user gl-mt-3 js-quick-submit gl-show-field-errors' }, authenticity_token: true do |f| = form_errors(@user) .row @@ -118,7 +118,7 @@ = f.check_box :include_private_contributions, label: s_('Profiles|Include private contributions on my profile'), wrapper_class: 'mb-2', inline: true .help-block = s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information") - .prepend-top-default.gl-mb-3 + .gl-mt-3.gl-mb-3 = f.submit s_("Profiles|Update profile settings"), class: 'btn btn-success' = link_to _("Cancel"), user_path(current_user), class: 'btn btn-cancel' diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 7e566361848..6e3de0447ac 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -3,7 +3,7 @@ - @content_class = "limit-container-width" unless fluid_layout .js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path } - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 = _('Register Two-Factor Authenticator') @@ -50,12 +50,12 @@ .form-group = label_tag :pin_code, _('Pin code'), class: "label-bold" = text_field_tag :pin_code, nil, class: "form-control", required: true - .prepend-top-default + .gl-mt-3 = submit_tag _('Register with two-factor app'), class: 'btn btn-success' %hr - .row.prepend-top-default + .row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 = _('Register Universal Two-Factor (U2F) Device') diff --git a/app/views/projects/_wiki.html.haml b/app/views/projects/_wiki.html.haml index 761af314469..991c95153da 100644 --- a/app/views/projects/_wiki.html.haml +++ b/app/views/projects/_wiki.html.haml @@ -1,6 +1,6 @@ - if @wiki_home.present? %div{ class: container_class } - .md.prepend-top-default.gl-mb-3 + .md.gl-mt-3.gl-mb-3 = render_wiki_content(@wiki_home) - else - can_create_wiki = can?(current_user, :create_wiki, @project) diff --git a/app/views/projects/blob/viewers/_loading.html.haml b/app/views/projects/blob/viewers/_loading.html.haml index 606db3657a6..5fbe9b0df0c 100644 --- a/app/views/projects/blob/viewers/_loading.html.haml +++ b/app/views/projects/blob/viewers/_loading.html.haml @@ -1,2 +1,2 @@ -.text-center.prepend-top-default.gl-mb-3 +.text-center.gl-mt-3.gl-mb-3 = icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner') diff --git a/app/views/projects/blob/viewers/_sketch.html.haml b/app/views/projects/blob/viewers/_sketch.html.haml index 22b08a85b8d..aa8d1dd326f 100644 --- a/app/views/projects/blob/viewers/_sketch.html.haml +++ b/app/views/projects/blob/viewers/_sketch.html.haml @@ -1,3 +1,3 @@ .file-content#js-sketch-viewer{ data: { endpoint: blob_raw_path } } - .js-loading-icon.text-center.prepend-top-default.gl-mb-3.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } + .js-loading-icon.text-center.gl-mt-3.gl-mb-3.js-loading-icon{ 'aria-label' => 'Loading Sketch preview' } = icon('spinner spin 2x', 'aria-hidden' => 'true'); diff --git a/app/views/projects/blob/viewers/_stl.html.haml b/app/views/projects/blob/viewers/_stl.html.haml index cbae6057630..6983c3cc81b 100644 --- a/app/views/projects/blob/viewers/_stl.html.haml +++ b/app/views/projects/blob/viewers/_stl.html.haml @@ -1,7 +1,7 @@ .file-content.is-stl-loading .text-center#js-stl-viewer{ data: { endpoint: blob_raw_path } } - = icon('spinner spin 2x', class: 'prepend-top-default gl-mb-3', 'aria-hidden' => 'true', 'aria-label' => 'Loading') - .text-center.prepend-top-default.gl-mb-3.stl-controls + = icon('spinner spin 2x', class: 'gl-mt-3 gl-mb-3', 'aria-hidden' => 'true', 'aria-label' => 'Loading') + .text-center.gl-mt-3.gl-mb-3.stl-controls .btn-group %button.btn.btn-default.btn-sm.js-material-changer{ data: { type: 'wireframe' } } Wireframe diff --git a/app/views/projects/environments/_form.html.haml b/app/views/projects/environments/_form.html.haml index f49431932f1..d83970d4f3f 100644 --- a/app/views/projects/environments/_form.html.haml +++ b/app/views/projects/environments/_form.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-3 %h4.gl-mt-0 = _("Environments") diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index 3b0555908f6..786af3714a6 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -23,5 +23,5 @@ = _('There are no matching files') %p.text-secondary = _('Try using a different search term to find the file you are looking for.') - .text-center.prepend-top-default.loading + .text-center.gl-mt-3.loading .spinner.spinner-md diff --git a/app/views/projects/forks/_fork_button.html.haml b/app/views/projects/forks/_fork_button.html.haml index 1b20a89ecb0..378491f1cc9 100644 --- a/app/views/projects/forks/_fork_button.html.haml +++ b/app/views/projects/forks/_fork_button.html.haml @@ -2,17 +2,17 @@ - can_create_project = current_user.can?(:create_projects, namespace) - if forked_project = namespace.find_fork_of(@project) - .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.prepend-top-default.gl-mb-3.forked + .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.gl-mt-3.gl-mb-3.forked = link_to project_path(forked_project) do - if /no_((\w*)_)*avatar/.match(avatar) = group_icon(namespace, class: "avatar rect-avatar s100 identicon mx-auto") - else .avatar-container.s100.mx-auto = image_tag(avatar, class: "avatar s100") - %h5.prepend-top-default + %h5.gl-mt-3 = namespace.human_name - else - .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.prepend-top-default.gl-mb-3{ class: ("disabled" unless can_create_project) } + .bordered-box.fork-thumbnail.text-center.prepend-left-default.append-right-default.gl-mt-3.gl-mb-3{ class: ("disabled" unless can_create_project) } = link_to project_forks_path(@project, namespace_key: namespace.id), method: "POST", class: ("disabled has-tooltip" unless can_create_project), @@ -22,5 +22,5 @@ - else .avatar-container.s100.mx-auto = image_tag(avatar, class: "avatar s100") - %h5.prepend-top-default{ data: { qa_selector: 'fork_namespace_content', qa_name: namespace.human_name } } + %h5.gl-mt-3{ data: { qa_selector: 'fork_namespace_content', qa_name: namespace.human_name } } = namespace.human_name diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml index 763e31c4a8b..1acb446adff 100644 --- a/app/views/projects/forks/new.html.haml +++ b/app/views/projects/forks/new.html.haml @@ -1,6 +1,6 @@ - page_title _("Fork project") -.row.prepend-top-default +.row.gl-mt-3 .col-lg-3 %h4.gl-mt-0 = _("Fork project") @@ -16,6 +16,6 @@ - else %strong = _("No available namespaces to fork the project.") - %p.prepend-top-default + %p.gl-mt-3 = _("You must have permission to create a project in a namespace before forking.") diff --git a/app/views/projects/hook_logs/show.html.haml b/app/views/projects/hook_logs/show.html.haml index 37330788ca4..4f76c3fee71 100644 --- a/app/views/projects/hook_logs/show.html.haml +++ b/app/views/projects/hook_logs/show.html.haml @@ -2,7 +2,7 @@ - add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path - page_title _('Webhook Logs') -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-3 %h4.gl-mt-0 Request details diff --git a/app/views/projects/hooks/edit.html.haml b/app/views/projects/hooks/edit.html.haml index 066cf183ac9..e0ef0c0d3f9 100644 --- a/app/views/projects/hooks/edit.html.haml +++ b/app/views/projects/hooks/edit.html.haml @@ -2,7 +2,7 @@ - add_to_breadcrumbs _('Webhook Settings'), namespace_project_hooks_path - page_title _('Webhook') -.row.prepend-top-default +.row.gl-mt-3 .col-lg-3 = render 'shared/web_hooks/title_and_docs', hook: @hook diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 56e60e747b2..1845bd190d3 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -2,7 +2,7 @@ - breadcrumb_title _('Webhook Settings') - page_title _('Webhooks') -.row.prepend-top-default +.row.gl-mt-3 .col-lg-4 = render 'shared/web_hooks/title_and_docs', hook: @hook diff --git a/app/views/projects/merge_requests/diffs/_commit_widget.html.haml b/app/views/projects/merge_requests/diffs/_commit_widget.html.haml index 066c8d5dba6..efc052ca791 100644 --- a/app/views/projects/merge_requests/diffs/_commit_widget.html.haml +++ b/app/views/projects/merge_requests/diffs/_commit_widget.html.haml @@ -3,7 +3,7 @@ - `assets/javascripts/diffs/components/commit_widget.vue` -#----------------------------------------------------------------- - if @commit - .info-well.d-none.d-sm-block.prepend-top-default + .info-well.d-none.d-sm-block.gl-mt-3 .well-segment %ul.blob-commit-info = render 'projects/commits/commit', commit: @commit, merge_request: @merge_request, view_details: true diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index b83204c27e3..5239af82ba6 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -9,10 +9,10 @@ = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project - if can?(current_user, :read_issue, @project) && @milestone.total_issues_count.zero? - .alert.alert-success.prepend-top-default + .alert.alert-success.gl-mt-3 %span= _('Assign some issues to this milestone.') - elsif @milestone.complete? && @milestone.active? - .alert.alert-success.prepend-top-default + .alert.alert-success.gl-mt-3 %span= _('All issues for this milestone are closed. You may close this milestone now.') = render 'shared/milestones/tabs', milestone: @milestone diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index ebd43d2153b..15c9076c1ab 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -1,4 +1,4 @@ -.account-well.prepend-top-default.gl-mb-3 +.account-well.gl-mt-3.gl-mb-3 %ul %li = _('The repository must be accessible over <code>http://</code>, diff --git a/app/views/projects/mirrors/_ssh_host_keys.html.haml b/app/views/projects/mirrors/_ssh_host_keys.html.haml index 90236dc0c48..ca8ed417255 100644 --- a/app/views/projects/mirrors/_ssh_host_keys.html.haml +++ b/app/views/projects/mirrors/_ssh_host_keys.html.haml @@ -28,6 +28,6 @@ = _('Input host keys manually') %span.label-hide = _('Hide host keys manual input') - .js-ssh-known-hosts.collapse.prepend-top-default + .js-ssh-known-hosts.collapse.gl-mt-3 = f.label :ssh_known_hosts, _('SSH host keys'), class: 'label-bold' = f.text_area :ssh_known_hosts, class: 'form-control known-hosts js-known-hosts', rows: '10' diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index b8b4507c80f..d134bfb488e 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -16,5 +16,5 @@ - if @commit .network-graph{ data: { url: @url, commit_url: @commit_url, ref: @ref, commit_id: @commit.id } } - .text-center.prepend-top-default + .text-center.gl-mt-3 .spinner.spinner-md diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 81a778f76f4..ce87daf36fa 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -4,7 +4,7 @@ - header_title _("Projects"), dashboard_projects_path - active_tab = local_assigns.fetch(:active_tab, 'blank') -.project-edit-container.prepend-top-default +.project-edit-container.gl-mt-3 .project-edit-errors = render 'projects/errors' diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index c24a9061146..88e53a99ced 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -1,7 +1,7 @@ - page_title _("Members") - can_admin_project_members = can?(current_user, :admin_project_member, @project) -.row.prepend-top-default +.row.gl-mt-3 .col-lg-12 - if project_can_be_shared? %h4 diff --git a/app/views/projects/protected_branches/show.html.haml b/app/views/projects/protected_branches/show.html.haml index 0e22b1e3105..c671757a603 100644 --- a/app/views/projects/protected_branches/show.html.haml +++ b/app/views/projects/protected_branches/show.html.haml @@ -1,6 +1,6 @@ - page_title @protected_ref.name, _("Protected Branches") -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-3 %h4.gl-mt-0.ref-name = @protected_ref.name diff --git a/app/views/projects/protected_tags/show.html.haml b/app/views/projects/protected_tags/show.html.haml index aad9e5a9340..c8052e6ae8d 100644 --- a/app/views/projects/protected_tags/show.html.haml +++ b/app/views/projects/protected_tags/show.html.haml @@ -1,6 +1,6 @@ - page_title @protected_ref.name, _("Protected Tags") -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-3 %h4.gl-mt-0.ref-name = @protected_ref.name diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index dd0a5aeb043..966ad3ca14f 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-4 %h4.gl-mt-0 = @service.title diff --git a/app/views/projects/services/prometheus/_configuration_banner.html.haml b/app/views/projects/services/prometheus/_configuration_banner.html.haml index dfcb1c5d240..b4e8458d8b9 100644 --- a/app/views/projects/services/prometheus/_configuration_banner.html.haml +++ b/app/views/projects/services/prometheus/_configuration_banner.html.haml @@ -12,14 +12,14 @@ .svg-container = image_tag 'illustrations/monitoring/getting_started.svg' .col-sm-10 - %p.text-success.prepend-top-default + %p.text-success.gl-mt-3 = s_('PrometheusService|Prometheus is being automatically managed on your clusters') = link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn' - else .col-sm-2 = image_tag 'illustrations/monitoring/loading.svg' .col-sm-10 - %p.prepend-top-default + %p.gl-mt-3 = s_('PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments') = link_to s_('PrometheusService|Install Prometheus on clusters'), project_clusters_path(project), class: 'btn btn-success' diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml index 5eeebe4160f..3ffa029a25d 100644 --- a/app/views/projects/settings/_general.html.haml +++ b/app/views/projects/settings/_general.html.haml @@ -31,7 +31,7 @@ = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :project - .form-group.prepend-top-default.append-bottom-20 + .form-group.gl-mt-3.append-bottom-20 .avatar-container.s90 = project_icon(@project, alt: _('Project avatar'), class: 'avatar project-avatar s90') = f.label :avatar, _('Project avatar'), class: 'label-bold d-block' diff --git a/app/views/projects/settings/access_tokens/index.html.haml b/app/views/projects/settings/access_tokens/index.html.haml index 092f9c2333c..4992288a8c8 100644 --- a/app/views/projects/settings/access_tokens/index.html.haml +++ b/app/views/projects/settings/access_tokens/index.html.haml @@ -4,7 +4,7 @@ - type_plural = _('project access tokens') - @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 diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index a1809cecafb..e8e5a5f0256 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default +.row.gl-mt-3 .col-lg-12 = form_for @project, url: project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings') do |f| = form_errors(@project) @@ -147,5 +147,5 @@ %hr -.row.prepend-top-default +.row.gl-mt-3 = render partial: 'badge', collection: @badges diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml index e7a509abc8b..d9068bde847 100644 --- a/app/views/projects/settings/integrations/show.html.haml +++ b/app/views/projects/settings/integrations/show.html.haml @@ -3,7 +3,7 @@ - page_title _('Integrations') - if show_webhooks_moved_alert? - .gl-alert.gl-alert-info.js-webhooks-moved-alert.prepend-top-default{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } } + .gl-alert.gl-alert-info.js-webhooks-moved-alert.gl-mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } } = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } = sprite_icon('close', size: 16, css_class: 'gl-icon') diff --git a/app/views/projects/settings/operations/_configuration_banner.html.haml b/app/views/projects/settings/operations/_configuration_banner.html.haml index bdbc9b7d69d..69bbd0edac7 100644 --- a/app/views/projects/settings/operations/_configuration_banner.html.haml +++ b/app/views/projects/settings/operations/_configuration_banner.html.haml @@ -12,13 +12,13 @@ .svg-container = image_tag 'illustrations/monitoring/getting_started.svg' .col-sm-10 - %p.text-success.prepend-top-default + %p.text-success.gl-mt-3 = s_('PrometheusService|Prometheus is being automatically managed on your clusters') = link_to s_('PrometheusService|Manage clusters'), project_clusters_path(project), class: 'btn' - else .col-sm-2 = image_tag 'illustrations/monitoring/loading.svg' .col-sm-10 - %p.prepend-top-default + %p.gl-mt-3 = s_('PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments') = link_to s_('PrometheusService|Install Prometheus on clusters'), project_clusters_path(project), class: 'btn btn-success' diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml index 79a00b00fa6..12294417803 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -26,7 +26,7 @@ = _("Release") = link_to release.name, project_releases_path(@project, anchor: release.tag), class: 'tag-release-link' - if release.description.present? - .md.prepend-top-default + .md.gl-mt-3 = markdown_field(release, :description) .row-fixed-content.controls.flex-row diff --git a/app/views/projects/tags/releases/edit.html.haml b/app/views/projects/tags/releases/edit.html.haml index 55564808e6e..896dbe454e6 100644 --- a/app/views/projects/tags/releases/edit.html.haml +++ b/app/views/projects/tags/releases/edit.html.haml @@ -14,6 +14,6 @@ = render 'shared/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here…" = render 'shared/notes/hints' .error-alert - .prepend-top-default + .gl-mt-3 = f.submit 'Save changes', class: 'btn btn-success' = link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn btn-default btn-cancel" diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml index a3cbee98dcc..edb0577cebd 100644 --- a/app/views/projects/tags/show.html.haml +++ b/app/views/projects/tags/show.html.haml @@ -59,7 +59,7 @@ %pre.wrap{ data: { qa_selector: 'tag_message_content' } } = strip_signature(@tag.message) -.gl-mb-3.prepend-top-default +.gl-mb-3.gl-mt-3 - if @release.description.present? .description.md{ data: { qa_selector: 'tag_release_notes_content' } } = markdown_field(@release, :description) diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml index 53f55442b01..4e097f345c2 100644 --- a/app/views/projects/triggers/_index.html.haml +++ b/app/views/projects/triggers/_index.html.haml @@ -1,4 +1,4 @@ -.row.prepend-top-default.gl-mb-3.triggers-container +.row.gl-mt-3.gl-mb-3.triggers-container .col-lg-12 .card .card-header @@ -38,7 +38,7 @@ %code REF_NAME with the trigger token and the branch or tag name respectively. - %h5.prepend-top-default + %h5.gl-mt-3 Use cURL %p.light @@ -51,7 +51,7 @@ -F token=TOKEN \ -F ref=REF_NAME \ #{builds_trigger_url(@project.id)} - %h5.prepend-top-default + %h5.gl-mt-3 Use .gitlab-ci.yml %p.light @@ -66,7 +66,7 @@ stage: deploy script: - "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}" - %h5.prepend-top-default + %h5.gl-mt-3 Use webhook %p.light @@ -76,7 +76,7 @@ %pre :plain #{builds_trigger_url(@project.id, ref: 'REF_NAME')}?token=TOKEN - %h5.prepend-top-default + %h5.gl-mt-3 Pass job variables %p.light diff --git a/app/views/projects/triggers/edit.html.haml b/app/views/projects/triggers/edit.html.haml index 67ca4994146..ee2714e1eb9 100644 --- a/app/views/projects/triggers/edit.html.haml +++ b/app/views/projects/triggers/edit.html.haml @@ -1,6 +1,6 @@ - page_title _("Trigger") -.row.prepend-top-default.gl-mb-3 +.row.gl-mt-3.gl-mb-3 .col-lg-12 %h4.gl-mt-0 Update trigger diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml index f300e1d4841..869890cdf31 100644 --- a/app/views/search/show.html.haml +++ b/app/views/search/show.html.haml @@ -7,7 +7,7 @@ = _('Search') = render_if_exists 'search/form_elasticsearch', attrs: { class: 'ml-sm-auto' } -.prepend-top-default +.gl-mt-3 = render 'search/form' - if @search_term = render 'search/category' diff --git a/app/views/shared/access_tokens/_form.html.haml b/app/views/shared/access_tokens/_form.html.haml index 680626f7880..820a6cbd15d 100644 --- a/app/views/shared/access_tokens/_form.html.haml +++ b/app/views/shared/access_tokens/_form.html.haml @@ -30,5 +30,5 @@ = f.label :scopes, _('Scopes'), class: 'label-bold' = render 'shared/tokens/scopes_form', prefix: prefix, token: token, scopes: scopes - .prepend-top-default + .gl-mt-3 = f.submit _('Create %{type}') % { type: type }, class: 'btn btn-success', data: { qa_selector: 'create_token_button' } diff --git a/app/views/shared/dashboard/_no_filter_selected.html.haml b/app/views/shared/dashboard/_no_filter_selected.html.haml index 32246dac4c7..48c844d93e8 100644 --- a/app/views/shared/dashboard/_no_filter_selected.html.haml +++ b/app/views/shared/dashboard/_no_filter_selected.html.haml @@ -1,6 +1,6 @@ .row.empty-state.text-center .col-12 - .svg-130.prepend-top-default + .svg-130.gl-mt-3 = image_tag 'illustrations/issue-dashboard_results-without-filter.svg' .col-12 .text-content diff --git a/app/views/shared/deploy_tokens/_form.html.haml b/app/views/shared/deploy_tokens/_form.html.haml index 512644518fa..8d74e12e943 100644 --- a/app/views/shared/deploy_tokens/_form.html.haml +++ b/app/views/shared/deploy_tokens/_form.html.haml @@ -45,5 +45,5 @@ = label_tag ("deploy_token_write_package_registry"), 'write_package_registry', class: 'label-bold form-check-label' .text-secondary= s_('DeployTokens|Allows write access to the package registry') - .prepend-top-default + .gl-mt-3 = f.submit s_('DeployTokens|Create deploy token'), class: 'btn btn-success qa-create-deploy-token' diff --git a/app/views/shared/file_hooks/_index.html.haml b/app/views/shared/file_hooks/_index.html.haml index 3b585f037df..cab0adf159b 100644 --- a/app/views/shared/file_hooks/_index.html.haml +++ b/app/views/shared/file_hooks/_index.html.haml @@ -1,6 +1,6 @@ - file_hooks = Gitlab::FileHook.files -.row.prepend-top-default +.row.gl-mt-3 .col-lg-4 %h4.gl-mt-0 = _('File Hooks') diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml index 1f62c3cbcf4..e1e7aa36a78 100644 --- a/app/views/shared/members/_requests.html.haml +++ b/app/views/shared/members/_requests.html.haml @@ -4,7 +4,7 @@ - return if requesters.empty? -.card.prepend-top-default{ class: ('card-mobile' if force_mobile_view ) } +.card.gl-mt-3{ class: ('card-mobile' if force_mobile_view ) } .card-header = _("Users requesting access to") %strong= membership_source.name diff --git a/app/views/shared/milestones/_issues_tab.html.haml b/app/views/shared/milestones/_issues_tab.html.haml index 6684f6d752a..dc54eefbaa9 100644 --- a/app/views/shared/milestones/_issues_tab.html.haml +++ b/app/views/shared/milestones/_issues_tab.html.haml @@ -6,7 +6,7 @@ .flash-warning#milestone-issue-count-warning = milestone_issues_count_message(@milestone) -.row.prepend-top-default +.row.gl-mt-3 .col-md-4 = render 'shared/milestones/issuables', args.merge(title: s_('Milestones|Unstarted Issues (open and unassigned)'), issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true) .col-md-4 diff --git a/app/views/shared/milestones/_merge_requests_tab.haml b/app/views/shared/milestones/_merge_requests_tab.haml index 4dba2473efc..0dbf2b27c8d 100644 --- a/app/views/shared/milestones/_merge_requests_tab.haml +++ b/app/views/shared/milestones/_merge_requests_tab.haml @@ -1,7 +1,7 @@ - args = { show_project_name: local_assigns.fetch(:show_project_name, false), show_full_project_name: local_assigns.fetch(:show_full_project_name, false) } -.row.prepend-top-default +.row.gl-mt-3 .col-md-3 = render 'shared/milestones/issuables', args.merge(title: _('Work in progress (open and unassigned)'), issuables: merge_requests.opened.unassigned, id: 'unassigned', show_counter: true) .col-md-3 diff --git a/app/views/shared/milestones/_tab_loading.html.haml b/app/views/shared/milestones/_tab_loading.html.haml index dfca6a184be..fe1184114e9 100644 --- a/app/views/shared/milestones/_tab_loading.html.haml +++ b/app/views/shared/milestones/_tab_loading.html.haml @@ -1,2 +1,2 @@ -.text-center.prepend-top-default +.text-center.gl-mt-3 .spinner.spinner-md diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index 49df00940b7..4d209c30e7b 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -7,7 +7,7 @@ = render 'shared/milestones/description', milestone: milestone - if milestone.complete? && milestone.active? - .alert.alert-success.prepend-top-default + .alert.alert-success.gl-mt-3 %span = _('All issues for this milestone are closed.') = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.') diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index 002189e6ecd..fa103ad447a 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -18,12 +18,12 @@ .timeline-content.timeline-content-form = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete - elsif !current_user - .disabled-comment.text-center.prepend-top-default + .disabled-comment.text-center.gl-mt-3 - link_to_register = link_to(_("register"), new_session_path(:user, redirect_to_referer: 'yes', anchor: 'register-pane'), class: 'js-register-link') - link_to_sign_in = link_to(_("sign in"), new_session_path(:user, redirect_to_referer: 'yes'), class: 'js-sign-in-link') = _("Please %{link_to_register} or %{link_to_sign_in} to comment").html_safe % { link_to_register: link_to_register, link_to_sign_in: link_to_sign_in } - elsif discussion_locked - .disabled-comment.text-center.prepend-top-default + .disabled-comment.text-center.gl-mt-3 %span.issuable-note-warning = sprite_icon('lock', size: 16, css_class: 'icon') %span diff --git a/app/views/shared/notifications/_new_button.html.haml b/app/views/shared/notifications/_new_button.html.haml index 796ff095eea..fbcfec5fd96 100644 --- a/app/views/shared/notifications/_new_button.html.haml +++ b/app/views/shared/notifications/_new_button.html.haml @@ -8,7 +8,7 @@ - else - button_title = _("Notification setting - %{notification_title}") % { notification_title: notification_title(notification_setting.level) } - .js-notification-dropdown.notification-dropdown.home-panel-action-button.prepend-top-default.gl-mr-3.dropdown.inline + .js-notification-dropdown.notification-dropdown.home-panel-action-button.gl-mt-3.gl-mr-3.dropdown.inline = form_for notification_setting, remote: true, html: { class: "inline notification-form no-label" } do |f| = hidden_setting_source_input(notification_setting) = hidden_field_tag "hide_label", true diff --git a/app/views/shared/runners/_runner_description.html.haml b/app/views/shared/runners/_runner_description.html.haml index a47bbd55325..d3e50cfe92f 100644 --- a/app/views/shared/runners/_runner_description.html.haml +++ b/app/views/shared/runners/_runner_description.html.haml @@ -1,4 +1,4 @@ -.light.prepend-top-default +.light.gl-mt-3 %p = _("You can set up as many Runners as you need to run your jobs.") %br diff --git a/app/views/shared/web_hooks/_index.html.haml b/app/views/shared/web_hooks/_index.html.haml index 51c99d9699b..794418b8336 100644 --- a/app/views/shared/web_hooks/_index.html.haml +++ b/app/views/shared/web_hooks/_index.html.haml @@ -10,5 +10,5 @@ - hooks.each do |hook| = render 'shared/web_hooks/hook', hook: hook - else - %p.text-center.prepend-top-default.gl-mb-3 + %p.text-center.gl-mt-3.gl-mb-3 = _('No webhooks found, add one in the form above.') diff --git a/app/views/shared/wikis/_form.html.haml b/app/views/shared/wikis/_form.html.haml index 8ea06d4d6c3..9d32b867820 100644 --- a/app/views/shared/wikis/_form.html.haml +++ b/app/views/shared/wikis/_form.html.haml @@ -1,4 +1,4 @@ -- form_classes = %w[wiki-form common-note-form prepend-top-default js-quick-submit] +- form_classes = %w[wiki-form common-note-form gl-mt-3 js-quick-submit] - if @page.persisted? - form_action = wiki_page_path(@wiki, @page) diff --git a/app/views/shared/wikis/show.html.haml b/app/views/shared/wikis/show.html.haml index cac3f84522c..365afbf511d 100644 --- a/app/views/shared/wikis/show.html.haml +++ b/app/views/shared/wikis/show.html.haml @@ -25,7 +25,7 @@ - history_link = link_to s_("WikiHistoricalPage|history"), wiki_page_path(@wiki, @page, action: :history) = (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe -.prepend-top-default.gl-mb-3 +.gl-mt-3.gl-mb-3 .md{ data: { qa_selector: 'wiki_page_content' } } = render_wiki_content(@page) diff --git a/app/views/sherlock/file_samples/show.html.haml b/app/views/sherlock/file_samples/show.html.haml index e37165ac4d3..cc8bdbae55d 100644 --- a/app/views/sherlock/file_samples/show.html.haml +++ b/app/views/sherlock/file_samples/show.html.haml @@ -12,7 +12,7 @@ = t('sherlock.file_sample') = @file_sample.id -.prepend-top-default +.gl-mt-3 %p %span.light #{t('sherlock.time')}: diff --git a/app/views/sherlock/queries/_backtrace.html.haml b/app/views/sherlock/queries/_backtrace.html.haml index 38b4d2c6102..ff5a6b73e47 100644 --- a/app/views/sherlock/queries/_backtrace.html.haml +++ b/app/views/sherlock/queries/_backtrace.html.haml @@ -1,4 +1,4 @@ -.prepend-top-default +.gl-mt-3 .card .card-header %strong diff --git a/app/views/sherlock/queries/_general.html.haml b/app/views/sherlock/queries/_general.html.haml index 1514ad55d71..92f4f16f453 100644 --- a/app/views/sherlock/queries/_general.html.haml +++ b/app/views/sherlock/queries/_general.html.haml @@ -1,4 +1,4 @@ -.prepend-top-default +.gl-mt-3 .card .card-header %strong diff --git a/app/views/sherlock/transactions/_general.html.haml b/app/views/sherlock/transactions/_general.html.haml index 9c028b5c741..7cf6f27e1af 100644 --- a/app/views/sherlock/transactions/_general.html.haml +++ b/app/views/sherlock/transactions/_general.html.haml @@ -1,4 +1,4 @@ -.prepend-top-default +.gl-mt-3 .card .card-header %strong diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml index acc0ce0fff3..2669754cc3a 100644 --- a/app/views/snippets/new.html.haml +++ b/app/views/snippets/new.html.haml @@ -6,5 +6,5 @@ .page-title-holder.d-flex.align-items-center %h1.page-title= _('New Snippet') -.prepend-top-default +.gl-mt-3 = render "shared/snippets/form", url: snippets_path(@snippet) diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml index e1277d3723d..c766f77fe6a 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -1,6 +1,6 @@ .row .col-12 - .calendar-block.prepend-top-default.gl-mb-3 + .calendar-block.gl-mt-3.gl-mb-3 .user-calendar.d-none.d-sm-block{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } } %h4.center.light .spinner.spinner-md |