Commit bf76df22 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'markdown-form-hint' into 'master'

Render same markdown hint for issue, merge request, wiki and comment forms

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2595Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1763
parents e9f3db15 4099751c
......@@ -106,6 +106,7 @@
}
.markdown-area {
@include border-radius(0);
background: #FFF;
border: 1px solid #ddd;
min-height: 140px;
......
......@@ -56,6 +56,10 @@
.note_text {
width: 100%;
}
.comment-hints {
margin-top: -12px;
}
}
/* loading indicator */
......@@ -168,7 +172,7 @@
color: #999;
background: #FFF;
padding: 7px;
margin-top: -11px;
margin-top: -7px;
border: 1px solid $border-color;
font-size: 13px;
}
......@@ -23,9 +23,7 @@
.col-sm-10
= render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do
= render 'projects/zen', f: f, attr: :content, classes: 'description form-control js-quick-submit'
.col-sm-12.hint
.pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
.pull-right Attach files by dragging &amp; dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
= render 'projects/notes/hints'
.clearfix
.error-alert
......
......@@ -27,14 +27,7 @@
= render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
= render 'projects/zen', f: f, attr: :description,
classes: 'description form-control js-quick-submit'
.col-sm-12.hint
.pull-left
Parsed with
#{link_to 'GitLab Flavored Markdown', help_page_path('markdown', 'markdown'), target: '_blank'}.
.pull-right
Attach files by dragging &amp; dropping
or #{link_to 'selecting them', '#', class: 'markdown-selector' }.
= render 'projects/notes/hints'
.clearfix
.error-alert
%hr
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment