zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-07-06 02:53:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into customdomains

Browse source
This commit is contained in:
Kyle Drake 2013-07-27 06:08:09 +02:00
commit dc0a88b541
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
views/site_files/text_editor.slim
View file

@ -56,7 +56,7 @@ css:
.row
.span12
div id="editor" style="width: 100%; height: 600px; position: relative;"
#{@file_data}
== encoding_fix @file_data
.row

2
views/site_files/upload.slim
View file

@ -43,7 +43,7 @@ javascript:
.row
.span5.text-center
h5 NeoCities uses a drop and drop file upload. Simply take files and drop them from your computer on the white box (or click it) and they are uploaded.
h5 NeoCities uses a "drag and drop" file upload. Simply take files and drop them from your computer on the white box (or click it) and they are uploaded.
div style="background-color: #FFFFFF;"
form action="/site_files/upload" class="dropzone" id="uploads"
input name="csrf_token" type="hidden" value="#{csrf_token}"