summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-08-29 12:21:29 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-08-29 12:21:29 +0000
commitf7e3693435307b56e4da8d8584c6af01459e4813 (patch)
tree898341a8ef481227e6bf3bd534084ec9e8327e88
parentce84140e8b878ce6e7c4d298c7202ff38170e3ac (diff)
parentec2756974ed3e797a5ae7d9aa1fd7c982605c950 (diff)
downloadgitlab-ce-f7e3693435307b56e4da8d8584c6af01459e4813.tar.gz
Merge branch '65063-Embeded-metrics-inconsistent-styles' into 'master'
Fixed embedded metrics tooltip inconsistent styling Closes #65063 See merge request gitlab-org/gitlab-ce!31517
-rw-r--r--app/assets/stylesheets/framework/typography.scss12
-rw-r--r--changelogs/unreleased/65063-Embeded-metrics-inconsistent-styles.yml5
2 files changed, 16 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index afcc7f8a1db..33caac4d725 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -384,8 +384,18 @@
@extend .fa-exclamation-circle;
}
}
-}
+ .prometheus-graph-embed {
+ h3.popover-header {
+ /** Override <h3> .popover-header
+ * as embed metrics do not follow the same
+ * style as default md <h3> (which are deeply nested)
+ */
+ margin: 0;
+ font-size: $gl-font-size-small;
+ }
+ }
+}
/**
* Headers
diff --git a/changelogs/unreleased/65063-Embeded-metrics-inconsistent-styles.yml b/changelogs/unreleased/65063-Embeded-metrics-inconsistent-styles.yml
new file mode 100644
index 00000000000..126cf29afc0
--- /dev/null
+++ b/changelogs/unreleased/65063-Embeded-metrics-inconsistent-styles.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed embeded metrics tooltip inconsistent styling
+merge_request: 31517
+author:
+type: fixed