diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 10:56:40 +0300 |
| commit | 3398e0a3d7a1bed8efb7e700dee92f95173d8334 (patch) | |
| tree | 92817b5e9127c613b61a137e6add5d28cb42c4f0 /app/views/projects/notes/_form.html.haml | |
| parent | 31fcac9ff9e1c3a0b08617bcc9d5e549c11634b6 (diff) | |
| download | gitlab-ce-3398e0a3d7a1bed8efb7e700dee92f95173d8334.tar.gz | |
Revert "Implements and refactors clipboard feature for markdown."
This reverts commit 2273234653924b731f9ef01432e392481ee1d4e2.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/issues/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/milestones/_form.html.haml
app/views/projects/notes/_form.html.haml
app/views/projects/wikis/_form.html.haml
Diffstat (limited to 'app/views/projects/notes/_form.html.haml')
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index f6a21f79952..b62aada3a9a 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -16,10 +16,10 @@ .note-write-holder = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area' - .light.clearfix.hint + .light.clearfix .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. - .error-alert + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. + .note-preview-holder.hide .js-note-preview |