Apply ZEN mode to all GFM forms
This commit is contained in:
parent
51bc636eb3
commit
093c2c6a01
6 changed files with 28 additions and 13 deletions
|
@ -11,6 +11,7 @@ v 7.4.0
|
||||||
- Prevent notes polling when there are not notes
|
- Prevent notes polling when there are not notes
|
||||||
- API: Add support for forking a project via the API (Bernhard Kaindl)
|
- API: Add support for forking a project via the API (Bernhard Kaindl)
|
||||||
- API: filter project issues by milestone (Julien Bianchi)
|
- API: filter project issues by milestone (Julien Bianchi)
|
||||||
|
- Zen mode for wiki and milestones (Robert Schilling)
|
||||||
|
|
||||||
v 7.3.2
|
v 7.3.2
|
||||||
- Fix creating new file via web editor
|
- Fix creating new file via web editor
|
||||||
|
|
|
@ -27,6 +27,8 @@ class Dispatcher
|
||||||
new ZenMode()
|
new ZenMode()
|
||||||
when 'projects:milestones:show'
|
when 'projects:milestones:show'
|
||||||
new Milestone()
|
new Milestone()
|
||||||
|
when 'projects:milestones:new'
|
||||||
|
new ZenMode()
|
||||||
when 'projects:issues:new','projects:issues:edit'
|
when 'projects:issues:new','projects:issues:edit'
|
||||||
GitLab.GfmAutoComplete.setup()
|
GitLab.GfmAutoComplete.setup()
|
||||||
shortcut_handler = new ShortcutsNavigation()
|
shortcut_handler = new ShortcutsNavigation()
|
||||||
|
@ -87,6 +89,7 @@ class Dispatcher
|
||||||
when 'wikis'
|
when 'wikis'
|
||||||
new Wikis()
|
new Wikis()
|
||||||
shortcut_handler = new ShortcutsNavigation()
|
shortcut_handler = new ShortcutsNavigation()
|
||||||
|
new ZenMode()
|
||||||
when 'snippets', 'labels', 'graphs'
|
when 'snippets', 'labels', 'graphs'
|
||||||
shortcut_handler = new ShortcutsNavigation()
|
shortcut_handler = new ShortcutsNavigation()
|
||||||
when 'team_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
|
when 'team_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
|
||||||
|
|
20
app/assets/stylesheets/generic/gfm.scss
Normal file
20
app/assets/stylesheets/generic/gfm.scss
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,9 +0,0 @@
|
||||||
/**
|
|
||||||
* Styles that apply to both issues and merge requests.
|
|
||||||
*/
|
|
||||||
|
|
||||||
.issue-form, .merge-request-form {
|
|
||||||
.description {
|
|
||||||
height: 20em;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
%hr
|
%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?
|
-if @milestone.errors.any?
|
||||||
.alert.alert-danger
|
.alert.alert-danger
|
||||||
%ul
|
%ul
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :description, "Description", class: "control-label"
|
= f.label :description, "Description", class: "control-label"
|
||||||
.col-sm-10
|
.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
|
.hint
|
||||||
.pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
|
.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' }.
|
.pull-left Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
= 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?
|
-if @page.errors.any?
|
||||||
#error_explanation
|
#error_explanation
|
||||||
.alert.alert-danger
|
.alert.alert-danger
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
.form-group
|
.form-group
|
||||||
= f.label :content, class: 'control-label'
|
= f.label :content, class: 'control-label'
|
||||||
.col-sm-10
|
.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
|
.col-sm-12.hint
|
||||||
.pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
|
.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' }.
|
.pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
|
||||||
|
|
Loading…
Reference in a new issue