Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
252e4fd9
Commit
252e4fd9
authored
Jan 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8489 from yglukhov/wiki-md-preview
Markdown preview in wiki
parents
d1ca3544
91a3a7a6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+2
-1
app/assets/stylesheets/generic/markdown_area.scss
app/assets/stylesheets/generic/markdown_area.scss
+1
-0
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+7
-5
No files found.
app/assets/stylesheets/generic/forms.scss
View file @
252e4fd9
...
@@ -88,7 +88,8 @@ label {
...
@@ -88,7 +88,8 @@ label {
@include
box-shadow
(
none
);
@include
box-shadow
(
none
);
}
}
.issuable-description
{
.issuable-description
,
.wiki-content
{
margin-top
:
35px
;
margin-top
:
35px
;
}
}
...
...
app/assets/stylesheets/generic/markdown_area.scss
View file @
252e4fd9
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
.edit_note
,
.edit_note
,
.issuable-description
,
.issuable-description
,
.milestone-description
,
.milestone-description
,
.wiki-content
,
.merge-request-form
{
.merge-request-form
{
.nav-tabs
{
.nav-tabs
{
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
app/views/projects/wikis/_form.html.haml
View file @
252e4fd9
...
@@ -19,13 +19,15 @@
...
@@ -19,13 +19,15 @@
%code
[Link Title](page-slug)
%code
[Link Title](page-slug)
\.
\.
.form-group
.form-group
.wiki-content
=
f
.
label
:content
,
class:
'control-label'
=
f
.
label
:content
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
render
'projects/zen'
,
f:
f
,
attr: :content
,
classes:
'description form-control'
=
render
layout:
'projects/md_preview'
do
.col-sm-12.hint
=
render
'projects/zen'
,
f:
f
,
attr: :content
,
classes:
'description form-control'
.pull-left
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.col-sm-12.hint
.pull-right
Attach images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
}
.
.pull-left
Wiki content is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.pull-right
Attach images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
}
.
.clearfix
.clearfix
.error-alert
.error-alert
.form-group
.form-group
...
...
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