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/shared | |
| 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/shared')
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index 55b1c14022f..edaeff782de 100644 --- a/app/views/shared/milestones/_top.html.haml +++ b/app/views/shared/milestones/_top.html.haml @@ -42,9 +42,8 @@ = markdown_field(milestone, :title) - if milestone.group_milestone? && milestone.description.present? %div - .description - .wiki - = markdown_field(milestone, :description) + .description.md + = markdown_field(milestone, :description) - if milestone.complete?(current_user) && milestone.active? .alert.alert-success.prepend-top-default diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 0c07eae8643..ebb634fe75f 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -22,7 +22,7 @@ - if @snippet.description.present? .description.qa-snippet-description - .wiki + .md = markdown_field(@snippet, :description) %textarea.hidden.js-task-list-field = @snippet.description |