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
58c0a4f5
Commit
58c0a4f5
authored
Sep 11, 2014
by
Robert Schilling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement zen mode for issues/MRs/notes
Close Zen mode by ESC, foward/backward
parent
6c9cb565
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
157 additions
and
6 deletions
+157
-6
app/assets/javascripts/markdown_area.js.coffee
app/assets/javascripts/markdown_area.js.coffee
+1
-1
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+137
-0
app/views/projects/_issuable_form.html.haml
app/views/projects/_issuable_form.html.haml
+7
-3
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+6
-1
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+6
-1
No files found.
app/assets/javascripts/markdown_area.js.coffee
View file @
58c0a4f5
...
@@ -27,7 +27,7 @@ $(document).ready ->
...
@@ -27,7 +27,7 @@ $(document).ready ->
dropzone
=
$
(
".div-dropzone"
).
dropzone
(
dropzone
=
$
(
".div-dropzone"
).
dropzone
(
url
:
project_image_path_upload
url
:
project_image_path_upload
dictDefaultMessage
:
""
dictDefaultMessage
:
""
clickable
:
tru
e
clickable
:
fals
e
paramName
:
"markdown_img"
paramName
:
"markdown_img"
maxFilesize
:
10
maxFilesize
:
10
uploadMultiple
:
false
uploadMultiple
:
false
...
...
app/assets/stylesheets/generic/forms.scss
View file @
58c0a4f5
...
@@ -83,3 +83,140 @@ label {
...
@@ -83,3 +83,140 @@ label {
.form-control
{
.form-control
{
@include
box-shadow
(
none
);
@include
box-shadow
(
none
);
}
}
.issuable-description
{
margin-top
:
35px
;
}
.zennable
{
position
:
relative
;
input
{
display
:
none
;
}
.collapse
{
display
:
none
;
opacity
:
0
.5
;
&
:before
{
content
:
'\f066'
;
font-family
:
FontAwesome
;
color
:
#000
;
font-size
:
28px
;
position
:
relative
;
padding
:
30px
40px
0
0
;
}
&
:hover
{
opacity
:
0
.8
;
}
}
.expand
{
opacity
:
0
.5
;
&
:before
{
content
:
'\f065'
;
font-family
:
FontAwesome
;
color
:
#000
;
font-size
:
14px
;
line-height
:
14px
;
padding-right
:
20px
;
position
:
relative
;
vertical-align
:
middle
;
}
&
:hover
{
opacity
:
0
.8
;
}
}
input
:checked
~
.zen-backdrop
.expand
{
display
:
none
;
}
input
:checked
~
.zen-backdrop
.collapse
{
display
:
block
;
position
:
absolute
;
top
:
0
;
}
label
{
position
:
absolute
;
top
:
-26px
;
right
:
0
;
font-variant
:
small-caps
;
text-transform
:
uppercase
;
font-size
:
10px
;
padding
:
4px
;
font-weight
:
500
;
letter-spacing
:
1px
;
&
:before
{
display
:
inline-block
;
width
:
10px
;
height
:
14px
;
}
}
input
:checked
~
.zen-backdrop
{
background-color
:
white
;
position
:
fixed
;
top
:
0
;
bottom
:
0
;
left
:
0
;
right
:
0
;
z-index
:
1031
;
textarea
{
border
:
none
;
box-shadow
:
none
;
border-radius
:
0
;
color
:
#000
;
font-size
:
20px
;
line-height
:
26px
;
padding
:
30px
;
display
:
block
;
outline
:
none
;
resize
:
none
;
height
:
100vh
;
max-width
:
900px
;
margin
:
0
auto
;
}
}
.
zen-backdrop
textarea
:
:-
webkit-input-placeholder
{
color
:
white
;
}
.
zen-backdrop
textarea
:
-
moz-placeholder
{
color
:
white
;
}
.
zen-backdrop
textarea
:
:-
moz-placeholder
{
color
:
white
;
}
.
zen-backdrop
textarea
:
-
ms-input-placeholder
{
color
:
white
;
}
input
:checked
~
.zen-backdrop
textarea
::-webkit-input-placeholder
{
color
:
#999
;
}
input
:checked
~
.zen-backdrop
textarea
:-moz-placeholder
{
color
:
#999
;
opacity
:
1
;
}
input
:checked
~
.zen-backdrop
textarea
::-moz-placeholder
{
color
:
#999
;
opacity
:
1
;
}
input
:checked
~
.zen-backdrop
textarea
:-ms-input-placeholder
{
color
:
#999
;
}
}
app/views/projects/_issuable_form.html.haml
View file @
58c0a4f5
...
@@ -4,11 +4,15 @@
...
@@ -4,11 +4,15 @@
.col-sm-10
.col-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
autofocus:
true
,
=
f
.
text_field
:title
,
maxlength:
255
,
autofocus:
true
,
class:
'form-control pad js-gfm-input'
,
required:
true
class:
'form-control pad js-gfm-input'
,
required:
true
.form-group
.form-group
.issuable-description
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
text_area
:description
,
rows:
14
,
.zennable
class:
'form-control js-gfm-input markdown-area'
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
.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/merge_requests/_new_submit.html.haml
View file @
58c0a4f5
...
@@ -21,7 +21,12 @@
...
@@ -21,7 +21,12 @@
.form-group
.form-group
.light
.light
=
f
.
label
:description
,
"Description"
=
f
.
label
:description
,
"Description"
=
f
.
text_area
:description
,
class:
"form-control js-gfm-input markdown-area"
,
rows:
10
.zennable
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
.zen-backdrop
=
f
.
text_area
:description
,
class:
'form-control js-gfm-input markdown-area mousetrap'
,
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 @
58c0a4f5
...
@@ -14,7 +14,12 @@
...
@@ -14,7 +14,12 @@
Preview
Preview
%div
%div
.note-write-holder
.note-write-holder
=
f
.
text_area
:note
,
size:
255
,
class:
'note_text js-note-text js-gfm-input markdown-area'
.zennable
%input
#zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
.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
}
}
...
...
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