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

Removed actions from follow events, style changes to news feed

Browse source
This commit is contained in:
Victoria Wang 2014-10-21 17:40:49 -07:00
parent f1ffd458e4
commit 9cc9b0e5d7
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -513,18 +513,10 @@ a.tag:hover {
.news-item { .news-item {
width: 100%; width: 100%;
float: left; float: left;
margin: 1em 0; margin: 1.25em 0 1.25em 0;
} }
/*
.news-item.update, .news-item.tags, .news-item.comment.for-me, .news-item.tip.for-me {
margin: 1.0em 0;
}
*/
.news-item:nth-of-type(1) { .news-item:nth-of-type(1) {
margin-top: 0; margin-top: 0!important;
}
.news-item.first {
margin-top: 0;
} }
.news-item .user { .news-item .user {
font-weight: bold; font-weight: bold;
@ -540,7 +532,8 @@ a.tag:hover {
font-style: normal; font-style: normal;
margin-top: .2em; margin-top: .2em;
font-size: .9em; font-size: .9em;
margin-bottom: -.4em; margin-bottom: -.1em;
margin-left: 2.35em;
} }
.news-item .icon { .news-item .icon {
width: 20px; width: 20px;
@ -568,6 +561,9 @@ a.tag:hover {
.news-item.tip .icon { .news-item.tip .icon {
background: #FFCC00; background: #FFCC00;
} }
.news-item.follow {
margin: .3em 0 .3em 0;
}
.news-item.follow .icon { .news-item.follow .icon {
background: #3399CC; background: #3399CC;
} }

4
views/_news.erb
View file

@ -80,7 +80,9 @@
<% end %> <% end %>
<% end %> <% end %>
<%== erb :'_news_actions', layout: false, locals: {event: event} %> <% if !event.follow_id %>
<%== erb :'_news_actions', layout: false, locals: {event: event} %>
<% end %>
<% if event.comments_dataset.count > 0 %> <% if event.comments_dataset.count > 0 %>
<div class="content"> <div class="content">

2
views/site.erb
View file

@ -90,7 +90,7 @@
</div> </div>
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %> <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
<% else %> <% else %>
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %> <div><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
<% end %> <% end %>
</div> </div>