summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2019-01-02 21:42:55 +0100
committerLukas Eipert <leipert@gitlab.com>2019-01-03 08:07:21 +0100
commit47b57de8997dd9a256de141ebed59b73f198a2b1 (patch)
treeb356a29daf90af9eae7295277f51ded6437cf94b
parent6a8b89d9086cbe1a083641b4747c5acba1e3c2c6 (diff)
downloadgitlab-ce-47b57de8997dd9a256de141ebed59b73f198a2b1.tar.gz
Remove top margin in modal header titles55883-modal-header-titles-have-an-unnecessary-top-margin
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss15
-rw-r--r--app/assets/stylesheets/framework/modal.scss4
-rw-r--r--changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml5
3 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index f0671e36130..b7dbb48632e 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -70,6 +70,17 @@ h6,
margin-bottom: 10px;
}
+/* Our adjustments to hx & .hx above add unnecessary margins to modal-title
+ and page-title in modals, so we set them to 0 in order to have properly
+ formatted modal headers. */
+.modal-header {
+ .modal-title,
+ .page-title {
+ margin-top: 0;
+ margin-bottom: 0;
+ }
+}
+
h5,
.h5 {
font-size: $gl-font-size;
@@ -142,7 +153,9 @@ table {
@include media-breakpoint-up($breakpoint) {
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);
- .d#{$infix}-table-header-group { display: table-header-group !important; }
+ .d#{$infix}-table-header-group {
+ display: table-header-group !important;
+ }
}
}
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index 95291b4a9ad..46d40ea7aa5 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -29,10 +29,6 @@
padding-right: 28px;
}
}
-
- .page-title {
- margin-top: 0;
- }
}
.modal-body {
diff --git a/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml b/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml
new file mode 100644
index 00000000000..7dc783cc2b8
--- /dev/null
+++ b/changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml
@@ -0,0 +1,5 @@
+---
+title: Remove top margin in modal header titles
+merge_request: 24108
+author:
+type: fixed