diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-29 21:24:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-29 21:24:38 +0300 |
| commit | bd7e569f725327f0ad784273741aa38e756ed495 (patch) | |
| tree | cf74d3ad6bbf83405e23d6f673eead2e7e88bf43 | |
| parent | 2c6577a15ebe1efd93e2e2cfcce493fb838f3108 (diff) | |
| download | gitlab-ce-bd7e569f725327f0ad784273741aa38e756ed495.tar.gz | |
Prevent top margin for first element in markdown/wiki/readme typography
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/typography.scss | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index 865c593f822..b9abb5e4c67 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss @@ -76,6 +76,10 @@ } @mixin md-typography { + *:first-child { + margin-top: 0; + } + code { padding: 0 4px; } h1 { margin-top: 30px;} h2 { margin-top: 25px;} diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index 07df7f546d6..69292ca0b64 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -94,12 +94,16 @@ a:focus { * */ .wiki { - font-size: 14px; - line-height: 1.6; @include md-typography; - .white .highlight pre { background: #f5f5f5; } - ul { margin: 0 0 9px 25px !important; } + font-size: 14px; + line-height: 1.6; + .white .highlight pre { + background: #f5f5f5; + } + ul { + margin: 0 0 9px 25px !important; + } } .md { |