diff options
| author | Douwe Maan <douwe@selenight.nl> | 2019-03-23 16:09:14 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2019-03-26 16:29:33 +0300 |
| commit | 838f7e56a407aa335cf4406632373bac3d05dee0 (patch) | |
| tree | 07848abf08df3b4724e6e2a746636856766ab95f /app/views/help | |
| parent | 30479246ed4ed2cdbadb4d359a38e592ffef2fe5 (diff) | |
Remove .wiki and @md-typography mixin in favor of .md and .md-file
Before, the styling for `img:not(.emoji)`` was repeated between
`.md:not(.use-csslab):not(.wiki)` (for comments and the Markdown
preview), `.documentation.wiki` (for help pages), and
`.issuable-details .description .wiki` (for MR and issue descriptions).
In these places, we now simply use `.md`. Wherever we use `.md` but
don't want this image styling (like wikis and blobs), `.md-file` is
added.
Diffstat (limited to 'app/views/help')
| -rw-r--r-- | app/views/help/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/help/instance_configuration.html.haml | 2 | ||||
| -rw-r--r-- | app/views/help/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index dfa5d820ce9..f40fdb0b86b 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.wiki + .documentation-index.md = markdown(@help_index) .col-md-4 .card diff --git a/app/views/help/instance_configuration.html.haml b/app/views/help/instance_configuration.html.haml index f09e3825a4b..99576d45f76 100644 --- a/app/views/help/instance_configuration.html.haml +++ b/app/views/help/instance_configuration.html.haml @@ -1,5 +1,5 @@ - page_title 'Instance Configuration' -.wiki.documentation +.documentation.md %h1 Instance Configuration %p diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml index c07c148a12a..dce27dee9be 100644 --- a/app/views/help/show.html.haml +++ b/app/views/help/show.html.haml @@ -1,3 +1,3 @@ - page_title @path.split("/").reverse.map(&:humanize) -.documentation.wiki.prepend-top-default +.documentation.md.prepend-top-default = markdown @markdown diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 506f580b246..969df69aafb 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -513,7 +513,7 @@ %h2#markdown Markdown %h4 - %code .md or .wiki and others + %code .md Markdown rendering has a bit different css and presented in next UI elements: |