diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-21 16:54:43 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-21 16:54:43 +0000 |
| commit | 1b3197f0779bf41b159c381992e6382d3547dc8d (patch) | |
| tree | 8669f07067a049d1d030c09fa2d27532ed0ac25d | |
| parent | 6c3398165469de7890cd7881b175858f7c6be8e5 (diff) | |
| parent | c70ffe11183c7ef348e102656b881bc8561ef398 (diff) | |
| download | gitlab-ce-1b3197f0779bf41b159c381992e6382d3547dc8d.tar.gz | |
Merge branch 'dz-improve-help-page' into 'master'
Add wiki css to help page
See merge request gitlab-org/gitlab-ce!15488
| -rw-r--r-- | app/assets/stylesheets/pages/help.scss | 20 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss index dae8ccdef6c..9cc9e11bcd1 100644 --- a/app/assets/stylesheets/pages/help.scss +++ b/app/assets/stylesheets/pages/help.scss @@ -1,23 +1,3 @@ -.documentation-index { - h1 { - margin: 0; - } - - h2 { - font-size: 20px; - } - - li { - line-height: 24px; - color: $document-index-color; - - a { - margin-right: 3px; - } - } -} - - .shortcut-mappings { font-size: 12px; color: $help-shortcut-mapping-color; diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index d0c2e0b1d69..021de4f0caf 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -29,7 +29,7 @@ .row.prepend-top-default .col-md-8 - .documentation-index + .documentation-index.wiki = markdown(@help_index) .col-md-4 .panel.panel-default |