Commit 95069124 authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'standardize-page-title-bottom-margin-styling' into 'master'

Standardize page title bottom margin styling

See merge request gitlab-org/gitlab!49884
parents e4b847fc 876a0c7a
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
<template> <template>
<div class="issuable-create-container"> <div class="issuable-create-container">
<slot name="title"></slot> <slot name="title"></slot>
<hr /> <hr class="gl-mt-0" />
<issuable-form <issuable-form
:description-preview-path="descriptionPreviewPath" :description-preview-path="descriptionPreviewPath"
:description-help-path="descriptionHelpPath" :description-help-path="descriptionHelpPath"
......
...@@ -573,10 +573,6 @@ body { ...@@ -573,10 +573,6 @@ body {
font-size: 1.25em; font-size: 1.25em;
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
&:last-child {
margin-bottom: 0;
}
&.with-button { &.with-button {
line-height: 34px; line-height: 34px;
} }
......
...@@ -216,10 +216,6 @@ ...@@ -216,10 +216,6 @@
} }
} }
.editor-title-row {
margin-bottom: 20px;
}
.popover.suggest-gitlab-ci-yml { .popover.suggest-gitlab-ci-yml {
z-index: $header-zindex - 1; z-index: $header-zindex - 1;
} }
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
= link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link' = link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link'
and make sure your changes will not unintentionally remove theirs. and make sure your changes will not unintentionally remove theirs.
.editor-title-row %h3.page-title.blob-edit-page-title
%h3.page-title.blob-edit-page-title
Edit file Edit file
.file-editor .file-editor
%ul.nav-links.no-bottom.js-edit-mode.nav.nav-tabs %ul.nav-links.no-bottom.js-edit-mode.nav.nav-tabs
......
- breadcrumb_title _("Repository") - breadcrumb_title _("Repository")
- page_title _("New File"), @path.presence, @ref - page_title _("New File"), @path.presence, @ref
.editor-title-row %h3.page-title.blob-new-page-title
%h3.page-title.blob-new-page-title
New file New file
.file-editor .file-editor
= form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths(@project)) do = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths(@project)) do
......
---
title: 'Remove last-child bottom-margin: 0 from page-title class'
merge_request: 49884
author:
type: fixed
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
{{ isEditing ? __('Edit iteration') : __('New iteration') }} {{ isEditing ? __('Edit iteration') : __('New iteration') }}
</h3> </h3>
</div> </div>
<hr /> <hr class="gl-mt-0" />
<gl-form class="row common-note-form"> <gl-form class="row common-note-form">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group row"> <div class="form-group row">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= render partial: 'admin/geo/shared/license_alert' = render partial: 'admin/geo/shared/license_alert'
.d-flex.align-items-center.border-bottom.border-default.mb-4 .d-flex.align-items-center.border-bottom.border-default.mb-4
%h3{ :class => "page-title gl-mb-5!" } %h3{ :class => "page-title" }
= _("Geo Nodes") = _("Geo Nodes")
- if @nodes.any? - if @nodes.any?
= link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'gl-button btn btn-success ml-auto qa-new-node-link' = link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'gl-button btn btn-success ml-auto qa-new-node-link'
......
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