summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-09-10 18:59:21 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-09-10 18:59:21 +0000
commit230b36ecf45435f3b23f64c1d4f6aa5bf89e0dbf (patch)
tree1c9698cb5c16f26157b64c9fdf5b297c1144f1b9
parentd7df3aa0275051f32b52675b63d65d766d184fb3 (diff)
parent3b01589c3e227611c8df937c1c0fa908ffeb45e9 (diff)
downloadgitlab-ce-230b36ecf45435f3b23f64c1d4f6aa5bf89e0dbf.tar.gz
Merge branch '34338-details-element' into 'master'
Add padding to details element in markdown Closes #34338 See merge request gitlab-org/gitlab-ce!32716
-rw-r--r--app/assets/stylesheets/framework/typography.scss12
-rw-r--r--changelogs/unreleased/34338-details-element.yml5
2 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 33caac4d725..ba123ff9a67 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -67,6 +67,18 @@
max-height: calc(100vh - 100px);
}
+ details {
+ margin-bottom: $gl-padding;
+
+ summary {
+ margin-bottom: $gl-padding;
+ }
+
+ *:first-child:not(summary) {
+ margin-top: $gl-padding;
+ }
+ }
+
// Single code lines should wrap
code {
font-family: $monospace-font;
diff --git a/changelogs/unreleased/34338-details-element.yml b/changelogs/unreleased/34338-details-element.yml
new file mode 100644
index 00000000000..95e50e1d4a9
--- /dev/null
+++ b/changelogs/unreleased/34338-details-element.yml
@@ -0,0 +1,5 @@
+---
+title: Add some padding to details markdown element
+merge_request: 32716
+author:
+type: fixed