zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Kyle Drake 2014-04-22 15:03:36 -07:00
commit 258e35cfc0
4 changed files with 74 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/assets/css/_project-sass/_project-Base.scss
View file

@ -60,5 +60,5 @@ a{
@import 'project-Footer'; // Project Specific Footer Styling
.alert{
background-color:#F39C12; color:#fff;
background-color:#F5BA00; color:#fff;
}

63
public/assets/css/_project-sass/_project-Main.scss
View file

@ -33,7 +33,7 @@
margin-top: 20px;
}
.site-url {
font-size:19px;
font-size:18px;
margin-bottom: 8px;
}
.site-url a {
@ -109,6 +109,7 @@
}
.interior .header-Outro h2 {
margin-top: 12px;
font-size: 1.8em;
}
.welcome {
background: #daeea5 url(../img/heartcat.png) no-repeat 20px center;
@ -130,6 +131,7 @@
float:left;
background: #E4D8CB;
width: 100%;
position: relative;
}
.files .header {
background: #5E95A1;
@ -172,8 +174,8 @@
float: left;
border: 3px dashed #F6F0E6;
width: 100%;
margin: 20px 0;
padding: 20px;
margin: 18px 0;
padding: 10px;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
@ -182,9 +184,58 @@
.files .list .upload-Boundary.with-instruction {
background: url(../img/drag-drop.png) no-repeat center center;
}
.files .uploading-overlay {
width: 100%;
height: 100%;
position: absolute;
background-color:rgba(0, 0, 0, 0.35);
z-index: 100;
}
.files .uploading {
background: #fff;
font-style: italic;
margin-left: auto;
margin-right: auto;
width: 400px;
margin-top: 14%;
padding: 25px 40px 28px 40px;
-webkit-box-shadow: 1px 1px 21px 5px rgba(50, 50, 50, 0.5);
-moz-box-shadow: 1px 1px 21px 5px rgba(50, 50, 50, 0.5);
box-shadow: 1px 1px 21px 5px rgba(50, 50, 50, 0.5);
border-radius: 10px;
}
.files .uploading p {
margin-bottom: 2px;
}
.files .progress-bar {
background:#CCCCCC;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
width: 100%;
position: relative;
margin-top: 14px;
height: 10px;
}
.files .progress-bar .progress {
background: #E93250;
height: 100%;
-webkit-border-top-right-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-topright: 0px;
-moz-border-radius-bottomright: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
-webkit-border-top-left-radius: 20px;
-webkit-border-bottom-left-radius: 20px;
-moz-border-radius-topleft: 20px;
-moz-border-radius-bottomleft: 20px;
border-top-left-radius: 20px;
border-bottom-left-radius: 20px;
}
.file {
float: left;
padding: 5px;
padding: 5px 0px;
margin-right: 10px;
margin-bottom: 10px;
width: 125px;
@ -196,7 +247,11 @@
font-weight: bold;
font-size: 12px;
color: #666;
margin-top: 4px;
text-decoration: none;
white-space: nowrap;
overflow: hidden;
display: block;
}
.html-thumbnail {
font-size: 11px;

4
public/assets/css/neo.css
View file

File diff suppressed because one or more lines are too long

17
views/dashboard.erb
View file

@ -37,7 +37,7 @@
<div class="col col-50">
<h2 class="eps">My Website</h2>
<p class="site-url" style="margin-top: -11px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
<p class="site-url" style="margin-top: -9px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
<ul>
<% if current_site.updated_at %>
<li>Last updated <%= current_site.updated_at.ago %></li>
@ -80,6 +80,13 @@
<div class="files">
<div class="uploading-overlay">
<div class="uploading">
<p>Uploading <strong>heartcat.png</strong>...</p>
<p>Uploading <strong>tipcat.png</strong>...</p>
<div class="progress-bar"><div class="progress" style="width:60%;"></div></div>
</div>
</div>
<div class="header">
<div class="breadcrumbs">My Files</div> <!-- Should be Home when Folders are implemented -->
<div class="actions">
@ -113,18 +120,18 @@
<% end %>
<a class="title">
<% if file.filename.length > 15 %>
<%= file.filename.slice(0..15) %>&hellip;
<% if file.filename.length > 14 %>
<%= file.filename.slice(0..14) %>&hellip;
<% else %>
<%= file.filename %>
<% end %>
</a>
<div class="overlay">
<% if file.ext.match(/html|htm|txt|js|css|md/) %>
<a href="/site_files/text_editor/<%= file.filename %>"><i class="icon-edit" style="margin-right: 10px" title="Edit"> Edit</i></a>
<a href="/site_files/text_editor/<%= file.filename %>"><i class="icon-edit" title="Edit"> Edit</i></a>
<% end %>
<% if file.filename != 'index.html' %>
<a href="#" onclick="confirmFileDelete('<%= file.filename %>')"><i class="icon-trash" style="margin-right: 10px" title="Delete"> Delete</i></a>
<a href="#" onclick="confirmFileDelete('<%= file.filename %>')"><i class="icon-trash" title="Delete"> Delete</i></a>
<% end %>
<a class="link-overlay" href="http://<%= current_site.username %>.neocities.org/<%= file.filename %>" title="View <%= file.filename %>" target="_blank"></a>
</div>