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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
adaec60a
Commit
adaec60a
authored
Sep 20, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factor zen mode.
parent
ac516abe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
19 deletions
+22
-19
app/assets/stylesheets/generic/issuable.scss
app/assets/stylesheets/generic/issuable.scss
+9
-0
app/views/projects/_issuable_form.html.haml
app/views/projects/_issuable_form.html.haml
+2
-6
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+7
-0
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+2
-6
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+2
-7
No files found.
app/assets/stylesheets/generic/issuable.scss
0 → 100644
View file @
adaec60a
/**
* Styles that apply to both issues and merge requests.
*/
.issue-form
,
.merge-request-form
{
.description
{
height
:
20em
;
}
}
app/views/projects/_issuable_form.html.haml
View file @
adaec60a
...
@@ -7,12 +7,8 @@
...
@@ -7,12 +7,8 @@
.form-group.issuable-description
.form-group.issuable-description
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
.col-sm-10
.zennable
=
render
'projects/zen'
,
f:
f
,
attr: :description
,
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
classes:
'description form-control'
.zen-backdrop
=
f
.
text_area
:description
,
rows:
14
,
class:
'form-control js-gfm-input markdown-area'
,
placeholder:
'Leave a comment'
%label
{
for:
'zen-toggle-comment'
,
class:
'expand'
}
Edit in fullscreen
%label
{
for:
'zen-toggle-comment'
,
class:
'collapse'
}
.col-sm-12.hint
.col-sm-12.hint
.pull-left
.pull-left
Parsed with
Parsed with
...
...
app/views/projects/_zen.html.haml
0 → 100644
View file @
adaec60a
.zennable
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
.zen-backdrop
-
classes
<<
' js-gfm-input markdown-area'
=
f
.
text_area
attr
,
class:
classes
,
placeholder:
'Leave a comment'
%label
{
for:
'zen-toggle-comment'
,
class:
'expand'
}
Edit in fullscreen
%label
{
for:
'zen-toggle-comment'
,
class:
'collapse'
}
app/views/projects/merge_requests/_new_submit.html.haml
View file @
adaec60a
...
@@ -21,12 +21,8 @@
...
@@ -21,12 +21,8 @@
.form-group
.form-group
.light
.light
=
f
.
label
:description
,
"Description"
=
f
.
label
:description
,
"Description"
.zennable
=
render
'projects/zen'
,
f:
f
,
attr: :description
,
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
classes:
'description form-control'
.zen-backdrop
=
f
.
text_area
:description
,
class:
'form-control js-gfm-input markdown-area'
,
rows:
10
,
placeholder:
'Leave a comment'
%label
{
for:
'zen-toggle-comment'
,
class:
'expand'
}
Edit in fullscreen
%label
{
for:
'zen-toggle-comment'
,
class:
'collapse'
}
.clearfix.hint
.clearfix.hint
.pull-left
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.
.pull-left
Description 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'
}
.
...
...
app/views/projects/notes/_form.html.haml
View file @
adaec60a
...
@@ -14,13 +14,8 @@
...
@@ -14,13 +14,8 @@
Preview
Preview
%div
%div
.note-write-holder
.note-write-holder
.zennable
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
classes:
'note_text js-note-text'
.zen-backdrop
=
f
.
text_area
:note
,
size:
255
,
class:
'note_text js-note-text js-gfm-input markdown-area'
,
placeholder:
'Leave a comment'
%label
{
for:
'zen-toggle-comment'
,
class:
'expand'
}
Edit in fullscreen
%label
{
for:
'zen-toggle-comment'
,
class:
'collapse'
}
.light.clearfix
.light.clearfix
.pull-left
Comments are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),{
target:
'_blank'
,
tabindex:
-
1
}
}
.pull-left
Comments are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),{
target:
'_blank'
,
tabindex:
-
1
}
}
.pull-right
Attach images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
}
.
.pull-right
Attach images (JPG, PNG, GIF) by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
}
.
...
...
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