From 47b57de8997dd9a256de141ebed59b73f198a2b1 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Wed, 2 Jan 2019 21:42:55 +0100
Subject: Remove top margin in modal header titles

---
 app/assets/stylesheets/bootstrap_migration.scss | 15 ++++++++++++++-
 app/assets/stylesheets/framework/modal.scss     |  4 ----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'app')

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 {
-- 
cgit v1.2.3