summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-05 11:48:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-05 11:48:29 +0000
commita31d2f2a712ded89c24f16766f8255faff6ab8ee (patch)
treef6a8f1997dc0472a90c61fecf404611d168ab3d8 /app/assets/stylesheets/framework
parentaa3c7219e3b82e815023f8e2b8fccaf600b41e2b (diff)
parent00e8532d89fb04b39e9811c5ec5953dd2d098f6f (diff)
downloadgitlab-ce-a31d2f2a712ded89c24f16766f8255faff6ab8ee.tar.gz
Merge branch 'new-markdown' into 'master'
markdown fixes old ![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png) new ![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png) See merge request !2295
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/typography.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index c3e4ad0ad00..714369d9f15 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -54,17 +54,17 @@
h3 {
margin: 24px 0 12px 0;
- font-size: 1.25em;
+ font-size: 1.1em;
}
h4 {
margin: 24px 0 12px 0;
- font-size: 1.1em;
+ font-size: 0.98em;
}
h5 {
margin: 24px 0 12px 0;
- font-size: 1em;
+ font-size: 0.95em;
}
h6 {