wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1341 from ProgramFan/5.x

Browse Source 
Fix absense of visual feedback when uploading with drag-and-drop. Fixes #1327.
This commit is contained in:
Bart Kamphorst
2018-10-30 12:46:43 +01:00
committed by GitHub
parent b1ac06cd5f daef5fe9d2
commit eade94dcfd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
+1 -1
View File
@@ -47,7 +47,7 @@
height: textarea.height(), height: textarea.height(),
'class': textarea.attr('class'), 'class': textarea.attr('class'),
'id': 'gollum-editor-body-ace' 'id': 'gollum-editor-body-ace'
}).insertBefore(textarea); }).insertAfter(textarea);
textarea.css('display', 'none'); textarea.css('display', 'none');
// NOTE: This requires the page to have only one 'gollum-editor-body'. // NOTE: This requires the page to have only one 'gollum-editor-body'.
lib/gollum/public/gollum/stylesheets/editor.scss
+2 -2
View File
@@ -374,7 +374,7 @@ a#function-search { @include editor-button(16); }
/* @section uploads */ /* @section uploads */
#gollum-editor-body { #gollum-editor-body-ace {
& + div { & + div {
display: none; display: none;
font-size: 1.5em; font-size: 1.5em;
@@ -502,4 +502,4 @@ a#function-search { @include editor-button(16); }
margin: 0 0 1em 0; margin: 0 0 1em 0;
padding: 0; padding: 0;
} }
} }