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-02-25 14:25:54 -08:00
commit 79b2d2322e
4 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,9 +98,9 @@
margin-left: 8px; margin-left: 8px;
} }
h2{ h3 {
margin-bottom: 0px; margin-bottom: 0px;
font-size: 1.725em; font-size: 1.7em;
} }
p { p {

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

@ -99,7 +99,7 @@
font-size: 1em; font-size: 1em;
} }
.content.misc-page h1 { .content.misc-page h1 {
font-size: 2em; font-size: 1.8em;
margin-bottom: 20px; margin-bottom: 20px;
} }
.content.misc-page hr { .content.misc-page hr {

35
views/activity.erb
View file

@ -1,26 +1,19 @@
<div class="header-Outro with-columns"> <div class="header-Outro">
<div class="row content"> <div class="row content single-Col">
<div class="col col-100"> <h1>Latest Activity on Neocities</h1>
<h3>Latest Activity on Neocities</h3>
</div>
</div> </div>
</div> </div>
<div style="margin-left:auto; margin-right:auto; max-width:800px;">
<div class="container"> <div class="content single-Col misc-page" style="float:left;">
<div class="content misc-page columns"> <% if !signed_in? %>
<div class="col-left"> <div class="welcome">
<div class="col col-100"> <h4>All the latest Neocities site news!</h4>
<% if !signed_in? %> <p>
<div class="welcome"> Neocities allows anyone to create a free web site to express themselves. Want to create your own awesome site? <a href="/#new">Join us!</a>
<h4>All the latest Neocities site news!</h4> </p>
<p>
Neocities allows everyone create a free web site to express themselves. Want to create your own websome site? <a href="/#new">Join us!</a>
</p>
</div>
<% end %>
<%== erb :'_news', locals: {current_site: nil, events: @events} %>
</div> </div>
</div> <% end %>
<%== erb :'_news', locals: {current_site: nil, events: @events} %>
</div> </div>
</div> </div>

8
views/site.erb
View file

@ -22,10 +22,11 @@
<h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2> <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
<p class="site-url"><a href="<%= site.uri %>"><%= site.host %></a></p> <p class="site-url"><a href="<%= site.uri %>"><%= site.host %></a></p>
<div class="stats"> <div class="stats">
<div class="stat"><strong><%= site.views.format_large_number %></strong> <span>views</span></div> <div class="stat"><strong><%= site.views.format_large_number %></strong> <span>view<%= site.views == 1 ? '' : 's' %></span></div>
<% follows_count = site.follows_dataset.count %> <% follows_count = site.follows_dataset.count %>
<div class="stat"><strong><%= follows_count.format_large_number %></strong> <span>follower<%= follows_count == 0 ? '' : 's' %></span></div> <div class="stat"><strong><%= follows_count.format_large_number %></strong> <span>follower<%= follows_count == 1 ? '' : 's' %></span></div>
<!-- <div class="stat tips"><strong><%= site.tips_dataset.count %></strong> <span>tips</span></div> --> <div class="stat"><strong><%= site.changed_count.format_large_number %></strong> <span>update<%= site.changed_count == 1 ? '' : 's' %></span></div>
<!-- <div class="stat"><strong><%= site.tips_dataset.count %></strong> <span>tips</span></div> -->
</div> </div>
<div class="actions"> <div class="actions">
<% if current_site == site %> <% if current_site == site %>
@ -107,7 +108,6 @@
<% end %> <% end %>
</strong> </strong>
</div> </div>
<div class="stat"><span>Number of updates</span><strong><%= site.changed_count.format_large_number %></strong></div>
<div class="stat"><span>Created</span><strong><%= site.created_at.strftime('%b %-d, %Y') %></strong></div> <div class="stat"><span>Created</span><strong><%= site.created_at.strftime('%b %-d, %Y') %></strong></div>
</div> </div>