summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-06-22 18:08:07 +0000
committerMike Greiling <mike@pixelcog.com>2018-06-22 18:08:07 +0000
commit59d48848b87eacc7f9c442c220a484470fb3b78a (patch)
treebde47883a5d3d1b7185548affb80228542223ac9
parent95842f230bbce6204d2ad547c7b2be1d73deeee9 (diff)
parent0c9da2e40d69589db47097e59bbad3e809792e6f (diff)
downloadgitlab-ce-46524-sourcemaps-in-vue-files-are-broken.tar.gz
Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master'46524-sourcemaps-in-vue-files-are-broken
Resolve "Remove top padding on GPG popovers" Closes #48296 See merge request gitlab-org/gitlab-ce!20110
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 0d8e867f41d..ba1f0a975a9 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -173,6 +173,12 @@ table {
display: none;
}
+h3.popover-header {
+ // Default bootstrap popovers use <h3>
+ // which we default to having a top margin
+ margin-top: 0;
+}
+
// Add to .label so that old system notes that are saved to the db
// will still receive the correct styling
.badge,