diff options
| author | Darby <darbsies@gmail.com> | 2015-07-01 15:49:31 -0700 |
|---|---|---|
| committer | Darby <darbsies@gmail.com> | 2015-07-01 15:49:31 -0700 |
| commit | c611b6f6238ce6ce164f173df551552ffe83f596 (patch) | |
| tree | 261b2dcd83060a49e127edb1732d72e3a5a74670 /app/views/projects/notes | |
| parent | 6288677134d0e6d1f805748bc557091ad4747bd9 (diff) | |
| download | gitlab-ce-c611b6f6238ce6ce164f173df551552ffe83f596.tar.gz | |
Comment box/Placeholder text redo
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_edit_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml index a663950f031..9c4c5dc0c7f 100644 --- a/app/views/projects/notes/_edit_form.html.haml +++ b/app/views/projects/notes/_edit_form.html.haml @@ -5,8 +5,8 @@ = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text js-task-list-field' .comment-hints.clearfix - .pull-left Comments are parsed with #{link_to 'GitLab Flavored Markdown', help_page_path('markdown', 'markdown'),{ target: '_blank', tabindex: -1 }} - .pull-right Attach files by dragging & dropping or #{link_to 'selecting them', '#', class: 'markdown-selector', tabindex: -1 }. + .pull-left #{link_to 'Markdown tip:', help_page_path('markdown', 'markdown'),{ target: '_blank', tabindex: -1 }} + .pull-right #{link_to 'Attach a file', '#', class: 'markdown-selector', tabindex: -1 } .note-form-actions .buttons diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 3fb044d736e..4c662336428 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -12,8 +12,13 @@ classes: 'note_text js-note-text' .comment-hints.clearfix - .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }} - .pull-right Attach files by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector', tabindex: -1 }. + .pull-left + = link_to "Markdown tip:", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 } + = random_markdown_tip + .pull-right + = link_to '#', class: 'markdown-selector', tabindex: -1 do + Attach a file + = icon('paperclip') .error-alert .note-form-actions |