diff options
author | Robert Speicher <robert@gitlab.com> | 2015-09-21 21:18:55 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-09-21 21:18:55 +0300 |
commit | cacc70daf4b61b127b778b7a6e8244ab18116a14 (patch) | |
tree | 402b6d60cbd9bff92b6e8df29b692a76b6d43f9e /app/views | |
parent | cc851b04c01f17756eaaa3d2ec3ab743a52bb71d (diff) | |
parent | ef2fb20135242f9ee453fae18b1e7d11b6774406 (diff) |
Merge branch 'fix-note-edit-preview-css' into 'master'
More tweaks to make note edit/preview CSS consistent
Closes #2585
See merge request !1378
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/notes/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |