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 fix

Browse source
This commit is contained in:
Kyle Drake 2014-04-19 19:54:16 -07:00
commit dda7e10c38
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,7 +149,7 @@
.btn-Action.new-Page span { .btn-Action.new-Page span {
background-image: url(../img/new-page.png); background-image: url(../img/new-page.png);
background-position-y: 1px; background-position-y: 1px;
padding-left: 30px; padding-left: 29px;
} }
.btn-Action.new-Folder span { .btn-Action.new-Folder span {
background-image: url(../img/new-folder.png); background-image: url(../img/new-folder.png);
@ -157,7 +157,7 @@
} }
.btn-Action.upload span { .btn-Action.upload span {
background-image: url(../img/upload.png); background-image: url(../img/upload.png);
padding-left: 26px; padding-left: 24px;
} }
.files .list { .files .list {
padding: 20px; padding: 20px;

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

File diff suppressed because one or more lines are too long

4
views/dashboard.erb
View file

@ -37,12 +37,12 @@
<div class="col col-50"> <div class="col col-50">
<h2 class="eps">My Website</h2> <h2 class="eps">My Website</h2>
<p style="font-size:19px; margin-top: -5px; margin-bottom: 8px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p> <p style="font-size:19px; margin-top: -11px; margin-bottom: 8px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
<ul> <ul>
<% if current_site.updated_at %> <% if current_site.updated_at %>
<li>Last updated <%= current_site.updated_at %></li> <li>Last updated <%= current_site.updated_at %></li>
<% end %> <% end %>
<li>Using <strong><%= current_site.space_percentage_used %>% (<%= current_site.used_space_in_megabytes %>MB) of your <%= current_site.maximum_space_in_megabytes %> MB</strong> of free space. <% if !current_site.supporter? %>Need more space? <a href="/plan">Become a Supporter</a><% end %></li> <li>Using <strong><%= current_site.space_percentage_used %>% (<%= current_site.used_space_in_megabytes %>MB) of your <%= current_site.maximum_space_in_megabytes %> MB</strong>. <% if !current_site.supporter? %>Need more space? <a href="/plan">Become a Supporter!</a><% end %></li>
<li><strong><%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %></strong> hits</li> <li><strong><%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %></strong> hits</li>
</ul> </ul>
</div> </div>