diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-07 15:15:35 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-07 15:15:35 +0200 |
| commit | 4f629dab2a14c190b641bd709c28ebdad5b7a062 (patch) | |
| tree | 00035d114b896a38b4a2a6ac835411ba36d3e1e5 /app/assets/stylesheets/generic/typography.scss | |
| parent | 48837850838c8acb0c02ae60b29e18d287865878 (diff) | |
| parent | 0611a18964a998b6edc81ef9b469f9f70430e542 (diff) | |
| download | gitlab-ce-4f629dab2a14c190b641bd709c28ebdad5b7a062.tar.gz | |
Merge branch 'master' into rs-redactor-filter
Diffstat (limited to 'app/assets/stylesheets/generic/typography.scss')
| -rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index 34b4ee3e17e..6a3cb49baae 100644 --- a/app/assets/stylesheets/generic/typography.scss +++ b/app/assets/stylesheets/generic/typography.scss @@ -2,11 +2,29 @@ * Headers * */ +body { + text-rendering:optimizeLegibility; + -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; +} + .page-title { margin-top: 0px; - line-height: 1.5; - font-weight: normal; - margin-bottom: 5px; + line-height: 1.3; + font-size: 1.25em; + font-weight: 600; +} + +.page-title-empty { + margin-top: 0px; + line-height: 1.3; + font-size: 1.25em; + font-weight: 600; + margin: 12px 7px 12px 7px; +} + +h1, h2, h3, h4, h5, h6 { + color: $gl-header-color; + font-weight: 500; } /** CODE **/ @@ -50,6 +68,7 @@ a > code { @include md-typography; word-wrap: break-word; + padding: 7px; /* Link to current header. */ h1, h2, h3, h4, h5, h6 { @@ -78,12 +97,19 @@ a > code { } } - ul { + ul,ol { padding: 0; - margin: 0 0 9px 25px !important; + margin: 6px 0 6px 18px !important; + } + ol { + color: #5c5d5e; } } +.md-area { + @include md-typography; +} + .md { @include md-typography; } @@ -96,6 +122,9 @@ textarea.js-gfm-input { font-family: $monospace_font; } +.md-preview { +} + .strikethrough { text-decoration: line-through; -} +}
\ No newline at end of file |