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-03-17 12:08:53 -07:00
commit 235a828214
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -577,7 +577,7 @@
width: 10em!important; width: 10em!important;
float: right; float: right;
padding: 0 0 18px 0; padding: 0 0 18px 0;
margin-top: -28px; margin-top: -77px;
} }
} }
.interior .header-Outro.with-columns .col-66 { .interior .header-Outro.with-columns .col-66 {
@ -600,10 +600,16 @@
margin-top: 1.4em; margin-top: 1.4em;
font-size: 0.8em; font-size: 0.8em;
margin-left: 1.5em; margin-left: 1.5em;
@media (max-device-width:480px), screen and (max-width:800px) {
margin: 0;
clear: left;
margin-bottom: 1.5em;
}
} }
.interior .header-Outro .feed-filter a { .interior .header-Outro .feed-filter a {
color: white; color: white;
margin-left: 13px; margin-right: 13px;
} }
.site-suggestion { .site-suggestion {
float: left; float: left;

5
views/home.erb
View file

@ -4,9 +4,8 @@
<h3>Your Feed</h3> <h3>Your Feed</h3>
<div class="feed-filter"> <div class="feed-filter">
<% if !@events.empty? && (site.followings_dataset.count > 0) %> <% if !@events.empty? && (site.followings_dataset.count > 0) %>
<a href="/" <% if params[:activity].nil? %>class="selected"<% end %>>All Activity</a> <a href="/" <% if params[:activity].nil? %>class="selected"<% end %>>All</a>
&nbsp;&nbsp; <a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>Profile Activity</a>
<a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>Activity on your profile</a>
<% end %> <% end %>
<a href="/activity">Global Activity</a> <a href="/activity">Global Activity</a>
</div> </div>