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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
093c2c6a
Commit
093c2c6a
authored
10 years ago
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply ZEN mode to all GFM forms
parent
51bc636e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
13 deletions
+28
-13
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+3
-0
app/assets/stylesheets/generic/gfm.scss
app/assets/stylesheets/generic/gfm.scss
+20
-0
app/assets/stylesheets/generic/issuable.scss
app/assets/stylesheets/generic/issuable.scss
+0
-9
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+2
-2
app/views/projects/wikis/_form.html.haml
app/views/projects/wikis/_form.html.haml
+2
-2
No files found.
CHANGELOG
View file @
093c2c6a
...
...
@@ -11,6 +11,7 @@ v 7.4.0
- Prevent notes polling when there are not notes
- API: Add support for forking a project via the API (Bernhard Kaindl)
- API: filter project issues by milestone (Julien Bianchi)
- Zen mode for wiki and milestones (Robert Schilling)
v 7.3.2
- Fix creating new file via web editor
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/dispatcher.js.coffee
View file @
093c2c6a
...
...
@@ -27,6 +27,8 @@ class Dispatcher
new
ZenMode
()
when
'projects:milestones:show'
new
Milestone
()
when
'projects:milestones:new'
new
ZenMode
()
when
'projects:issues:new'
,
'projects:issues:edit'
GitLab
.
GfmAutoComplete
.
setup
()
shortcut_handler
=
new
ShortcutsNavigation
()
...
...
@@ -87,6 +89,7 @@ class Dispatcher
when
'wikis'
new
Wikis
()
shortcut_handler
=
new
ShortcutsNavigation
()
new
ZenMode
()
when
'snippets'
,
'labels'
,
'graphs'
shortcut_handler
=
new
ShortcutsNavigation
()
when
'team_members'
,
'deploy_keys'
,
'hooks'
,
'services'
,
'protected_branches'
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/generic/gfm.scss
0 → 100644
View file @
093c2c6a
/**
* Styles that apply to all GFM related forms.
*/
.issue-form
,
.merge-request-form
,
.wiki-form
{
.description
{
height
:
20em
;
}
}
.wiki-form
{
.description
{
height
:
26em
;
}
}
.milestone-form
{
.description
{
height
:
14em
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/generic/issuable.scss
deleted
100644 → 0
View file @
51bc636e
/**
* Styles that apply to both issues and merge requests.
*/
.issue-form
,
.merge-request-form
{
.description
{
height
:
20em
;
}
}
This diff is collapsed.
Click to expand it.
app/views/projects/milestones/_form.html.haml
View file @
093c2c6a
...
...
@@ -5,7 +5,7 @@
%hr
=
form_for
[
@project
,
@milestone
],
html:
{
class:
"new_milestone form-horizontal gfm-form"
}
do
|
f
|
=
form_for
[
@project
,
@milestone
],
html:
{
class:
'form-horizontal milestone-form gfm-form'
}
do
|
f
|
-
if
@milestone
.
errors
.
any?
.alert.alert-danger
%ul
...
...
@@ -21,7 +21,7 @@
.form-group
=
f
.
label
:description
,
"Description"
,
class:
"control-label"
.col-sm-10
=
f
.
text_area
:description
,
maxlength:
65535
,
class:
"form-control markdown-area"
,
rows:
10
=
render
'projects/zen'
,
f:
f
,
attr: :description
,
classes:
'description form-control'
.hint
.pull-left
Milestones are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.
.pull-left
Attach images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
}
.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/_form.html.haml
View file @
093c2c6a
=
form_for
[
@project
,
@page
],
method:
@page
.
persisted?
?
:put
:
:post
,
html:
{
class:
'form-horizontal gfm-form'
}
do
|
f
|
=
form_for
[
@project
,
@page
],
method:
@page
.
persisted?
?
:put
:
:post
,
html:
{
class:
'form-horizontal
wiki-form
gfm-form'
}
do
|
f
|
-
if
@page
.
errors
.
any?
#error_explanation
.alert.alert-danger
...
...
@@ -22,7 +22,7 @@
.form-group
=
f
.
label
:content
,
class:
'control-label'
.col-sm-10
=
f
.
text_area
:content
,
class:
'form-control js-gfm-input markdown-area'
,
rows:
18
=
render
'projects/zen'
,
f:
f
,
attr: :content
,
classes:
'description form-control'
.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 images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
}
.
...
...
This diff is collapsed.
Click to expand it.
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