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
Tatuya Kamada
gitlab-ce
Commits
c5d7b467
Commit
c5d7b467
authored
Apr 13, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated dropzone hover styling
parent
094cafca
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
22 deletions
+20
-22
app/assets/javascripts/dropzone_input.js.coffee
app/assets/javascripts/dropzone_input.js.coffee
+5
-4
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+3
-10
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+0
-8
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+12
-0
No files found.
app/assets/javascripts/dropzone_input.js.coffee
View file @
c5d7b467
...
@@ -15,11 +15,13 @@ class @DropzoneInput
...
@@ -15,11 +15,13 @@ class @DropzoneInput
project_uploads_path
=
window
.
project_uploads_path
or
null
project_uploads_path
=
window
.
project_uploads_path
or
null
max_file_size
=
gon
.
max_file_size
or
10
max_file_size
=
gon
.
max_file_size
or
10
form_textarea
=
$
(
form
).
find
(
"
textarea.markdown-area
"
)
form_textarea
=
$
(
form
).
find
(
"
.js-gfm-input
"
)
form_textarea
.
wrap
"<div class=
\"
div-dropzone
\"
></div>"
form_textarea
.
wrap
"<div class=
\"
div-dropzone
\"
></div>"
form_textarea
.
on
'paste'
,
(
event
)
=>
form_textarea
.
on
'paste'
,
(
event
)
=>
handlePaste
(
event
)
handlePaste
(
event
)
$mdArea
=
$
(
form_textarea
).
closest
(
'.md-area'
)
$
(
form
).
setupMarkdownPreview
()
$
(
form
).
setupMarkdownPreview
()
form_dropzone
=
$
(
form
).
find
(
'.div-dropzone'
)
form_dropzone
=
$
(
form
).
find
(
'.div-dropzone'
)
...
@@ -49,17 +51,16 @@ class @DropzoneInput
...
@@ -49,17 +51,16 @@ class @DropzoneInput
$
(
".div-dropzone-alert"
).
alert
"close"
$
(
".div-dropzone-alert"
).
alert
"close"
dragover
:
->
dragover
:
->
form_textarea
.
addClass
"div-dropzone-focus"
$mdArea
.
addClass
'is-dropzone-hover'
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0.7
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0.7
return
return
dragleave
:
->
dragleave
:
->
form_textarea
.
removeClass
"div-dropzone-focus"
$mdArea
.
removeClass
'is-dropzone-hover'
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0
return
return
drop
:
->
drop
:
->
form_textarea
.
removeClass
"div-dropzone-focus"
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0
form
.
find
(
".div-dropzone-hover"
).
css
"opacity"
,
0
form_textarea
.
focus
()
form_textarea
.
focus
()
return
return
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
c5d7b467
.div-dropzone-wrapper
{
.div-dropzone-wrapper
{
.div-dropzone
{
.div-dropzone
{
position
:
relative
;
position
:
relative
;
margin-bottom
:
-5px
;
.div-dropzone-focus
{
border-color
:
#66afe9
!
important
;
box-shadow
:
inset
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.075
)
,
0
0
8px
rgba
(
102
,
175
,
233
,
0
.6
)
!
important
;
outline
:
0
!
important
;
}
.div-dropzone-hover
{
.div-dropzone-hover
{
position
:
absolute
;
position
:
absolute
;
top
:
50%
;
top
:
50%
;
left
:
50%
;
left
:
50%
;
margin-top
:
-
0
.5em
;
margin-top
:
-
11
.5px
;
margin-left
:
-
0
.6em
;
margin-left
:
-
15px
;
opacity
:
0
;
opacity
:
0
;
font-size
:
5
0px
;
font-size
:
3
0px
;
transition
:
opacity
200ms
ease-in-out
;
transition
:
opacity
200ms
ease-in-out
;
pointer-events
:
none
;
pointer-events
:
none
;
}
}
...
...
app/assets/stylesheets/framework/typography.scss
View file @
c5d7b467
...
@@ -250,14 +250,6 @@ a > code {
...
@@ -250,14 +250,6 @@ a > code {
* Textareas intended for GFM
* Textareas intended for GFM
*
*
*/
*/
.js-gfm-input
{
font-family
:
$monospace_font
;
color
:
$gl-text-color
;
}
.md-preview
{
}
.strikethrough
{
.strikethrough
{
text-decoration
:
line-through
;
text-decoration
:
line-through
;
}
}
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
c5d7b467
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
}
}
.note-textarea
{
.note-textarea
{
display
:
block
;
padding
:
10px
0
;
padding
:
10px
0
;
font-family
:
$regular_font
;
font-family
:
$regular_font
;
border
:
0
;
border
:
0
;
...
@@ -72,6 +73,17 @@
...
@@ -72,6 +73,17 @@
}
}
}
}
&
.is-dropzone-hover
{
border-color
:
$gl-success
;
box-shadow
:
0
0
2px
rgba
(
#000
,
.2
)
,
0
0
4px
rgba
(
$gl-success
,
.4
);
.comment-toolbar
,
.nav-links
{
border-color
:
$gl-success
;
}
}
p
{
p
{
code
{
code
{
white-space
:
normal
;
white-space
:
normal
;
...
...
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