zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-05-09 22:16:20 -07:00
commit 5a07d9d0f1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sass/_project-sass/_project-Main.scss
View file

@ -233,7 +233,7 @@
} }
.files { .files {
float:left; float:left;
background: #E4D8CB; background: #EAE1D5;
width: 100%; width: 100%;
position: relative; position: relative;
margin-top: 7px; margin-top: 7px;
@ -278,7 +278,7 @@
padding: 10px; padding: 10px;
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
border-radius: 8px; border-radius: 6px;
min-height: 300px; min-height: 300px;
} }
.files .list .upload-Boundary.with-instruction { .files .list .upload-Boundary.with-instruction {

2
views/dashboard.erb
View file

@ -101,7 +101,7 @@
<% end %> <% end %>
</div> </div>
<div class="actions"> <div class="actions">
<a href="#createFile" class="btn-Action" data-toggle="modal"><i class="fa fa-file"></i> New Page / File</a> <a href="#createFile" class="btn-Action" data-toggle="modal"><i class="fa fa-file"></i> New File</a>
<a href="#createDir" class="btn-Action" data-toggle="modal"><i class="fa fa-folder"></i> New Folder</a> <a href="#createDir" class="btn-Action" data-toggle="modal"><i class="fa fa-folder"></i> New Folder</a>
<a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-arrow-circle-up"></i> Upload</a> <a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-arrow-circle-up"></i> Upload</a>
</div> </div>