diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-19 14:40:13 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-19 14:40:13 +0000 |
| commit | a726042773481e15e2f14192bea96599b200699d (patch) | |
| tree | f8961a3c1d3627ba5d8f0da578cd341d1b242167 | |
| parent | 291571ec29f1352336e34b5abee4ef6c67b16179 (diff) | |
| parent | b34f1be47f667412fc4355bafd17163f2a9f8466 (diff) | |
| download | gitlab-ce-a726042773481e15e2f14192bea96599b200699d.tar.gz | |
Merge branch 'increase-font-size' into 'master'
Increase font size
Increase markdown typography font size to 15px.
Affected:
* wiki
* issue/mr description
* md files
* comments
Fixes #1662
See merge request !1265
| -rw-r--r-- | app/assets/stylesheets/generic/files.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/mixins.scss | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss index e2b0ef0c5ea..1ed41272ac5 100644 --- a/app/assets/stylesheets/generic/files.scss +++ b/app/assets/stylesheets/generic/files.scss @@ -42,7 +42,6 @@ } .file-content { background: #fff; - font-size: 11px; &.image_file { background: #eee; @@ -54,8 +53,6 @@ } &.wiki { - font-size: 14px; - line-height: 1.6; padding: 25px; .highlight { diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss index 7f607fc4e8b..5f83913b73b 100644 --- a/app/assets/stylesheets/main/mixins.scss +++ b/app/assets/stylesheets/main/mixins.scss @@ -58,8 +58,8 @@ } @mixin md-typography { - font-size: 14px; - line-height: 1.6; + font-size: 15px; + line-height: 1.5; img { max-width: 100%; @@ -93,7 +93,7 @@ blockquote p { color: #888; - font-size: 14px; + font-size: 15px; line-height: 1.5; } |