summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/notes.scss
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2019-03-23 14:14:31 +0100
committerDouwe Maan <douwe@selenight.nl>2019-03-26 14:31:58 +0100
commit6ce05643dad355c383bf51cc559b078d295c4bbb (patch)
tree57355787ecbdf1d18eb96f744b88e39b420f0175 /app/assets/stylesheets/pages/notes.scss
parent838f7e56a407aa335cf4406632373bac3d05dee0 (diff)
downloadgitlab-ce-6ce05643dad355c383bf51cc559b078d295c4bbb.tar.gz
Move all Markdown styling to .md in typography
When https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4765 was created, comments were wrapped in `.note-text`, while Markdown previews were wrapped in `.md.md-preview-holder`. Both `.note-text` and `.md` included the `md-typography` mixin, but for some reason the bulleted list styling had previously been only under `.note-text`, rather than `md-typography`. It could've been moved there, but instead was moved to a new `bulleted-list` mixin that now became included by both `.md.md-preview-holder` and `.note-text`. Since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5162, comments have also been wrapped in `.md`, which means we only need to define these bulleted list styles there! Similarly, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10909 added table styling to `.md`, `.note-text`, and `.wiki` through the `markdown-table` mixin. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25666 removed it from `.note-text`, since all `.note-text` elements already have `.md` too, and copied some of the styling from this mixin into the `md-typography` mixin which was used by both `.md` and `.wiki`. As of an earlier commit in this MR, `.wiki` is gone, which means we only still need it under `.md`.
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 9c72dcbc54c..6156ab06234 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -225,8 +225,6 @@ $note-form-margin-left: 72px;
overflow-y: hidden;
.note-text {
- // Reset ul style types since we're nested inside a ul already
- @include bulleted-list;
word-wrap: break-word;
}
}