diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-21 18:18:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-21 18:18:55 +0000 |
| commit | cacc70daf4b61b127b778b7a6e8244ab18116a14 (patch) | |
| tree | 402b6d60cbd9bff92b6e8df29b692a76b6d43f9e | |
| parent | cc851b04c01f17756eaaa3d2ec3ab743a52bb71d (diff) | |
| parent | ef2fb20135242f9ee453fae18b1e7d11b6774406 (diff) | |
| download | gitlab-ce-cacc70daf4b61b127b778b7a6e8244ab18116a14.tar.gz | |
Merge branch 'fix-note-edit-preview-css' into 'master'
More tweaks to make note edit/preview CSS consistent
Closes #2585
See merge request !1378
| -rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index 41189432bf6..d5f0d86a307 100644 --- a/app/assets/stylesheets/generic/typography.scss +++ b/app/assets/stylesheets/generic/typography.scss @@ -105,6 +105,10 @@ textarea.js-gfm-input { font-family: $monospace_font; } +.md-preview { + font-family: $monospace_font; +} + .strikethrough { text-decoration: line-through; } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index b311d26d675..fdc2c3332df 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -109,7 +109,7 @@ .note-edit-form { display: none; - font-size: 13px; + font-size: 15px; .form-actions { padding-left: 20px; diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index 8f7d2e84c70..a0e26f9827e 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -1,7 +1,7 @@ .note-edit-form = form_for note, url: namespace_project_note_path(@project.namespace, @project, note), method: :put, remote: true, authenticity_token: true do |f| = note_target_fields(note) - = render layout: 'projects/md_preview', locals: { preview_class: 'note-text' } do + = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview' } do = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text js-task-list-field' = render 'projects/notes/hints' diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 3be8f44b282..d99445da59a 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -7,7 +7,7 @@ = f.hidden_field :noteable_id = f.hidden_field :noteable_type - = render layout: 'projects/md_preview', locals: { preview_class: "note-text", referenced_users: true } do + = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text' = render 'projects/notes/hints' .error-alert |