BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
4099751c
Unverified
Commit
4099751c
authored
Nov 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Render same markdown hint for issue, merge request, wiki and comment forms
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e9f3db15
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+1
-0
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+5
-1
_form.html.haml
app/views/projects/wikis/_form.html.haml
+1
-3
_form.html.haml
app/views/shared/issuable/_form.html.haml
+1
-8
No files found.
app/assets/stylesheets/framework/markdown_area.scss
View file @
4099751c
...
...
@@ -106,6 +106,7 @@
}
.markdown-area
{
@include
border-radius
(
0
);
background
:
#FFF
;
border
:
1px
solid
#ddd
;
min-height
:
140px
;
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
4099751c
...
...
@@ -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
:
-
11
px
;
margin-top
:
-
7
px
;
border
:
1px
solid
$border-color
;
font-size
:
13px
;
}
app/views/projects/wikis/_form.html.haml
View file @
4099751c
...
...
@@ -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
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
}
.
=
render
'projects/notes/hints'
.clearfix
.error-alert
...
...
app/views/shared/issuable/_form.html.haml
View file @
4099751c
...
...
@@ -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
&
dropping
or
#{
link_to
'selecting them'
,
'#'
,
class:
'markdown-selector'
}
.
=
render
'projects/notes/hints'
.clearfix
.error-alert
%hr
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment