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

Initial work on news feed redesign

Browse source
This commit is contained in:
Victoria Wang 2015-04-08 17:18:36 -07:00
parent 95659e1662
commit baf5884b7b
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -709,9 +709,12 @@ a.tag:hover {
width: 100%; width: 100%;
float: left; float: left;
margin: 1.25em 0 1.25em 0; margin: 1.25em 0 1.25em 0;
padding: 1em 0 0 0;
border-top: 1px solid #EBEBEB;
} }
.news-item:nth-of-type(1) { .news-item:nth-of-type(1) {
margin-top: 0!important; margin-top: 0!important;
border: 0;
} }
.news-item .user { .news-item .user {
font-weight: bold; font-weight: bold;
@ -733,21 +736,22 @@ a.tag:hover {
margin-bottom: -.1em; margin-bottom: -.1em;
} }
.news-item .icon { .news-item .icon {
width: 20px; width: 49px;
height: 20px; height: 37px;
background: #E6E6E6; background: #E6E6E6;
float: left; float: left;
padding-left: 12px;
margin-right: 12px; margin-right: 12px;
a {
background-position: 0px 0px;
background-repeat: no-repeat;
}
} }
.news-item.comment .icon { .news-item.comment .icon {
background: #DAEEA5; background: #DAEEA5;
} }
.news-item.comment.for-me .icon, .news-item.tip.for-me .icon { .news-item.comment.for-me .icon, .news-item.tip.for-me .icon {
background-size: 62px 62px;
width: 82px;
height: 62px;
background-position: right top;
background-repeat: no-repeat;
} }
.news-item .icon-mini { .news-item .icon-mini {
@ -823,7 +827,9 @@ a.tag:hover {
} }
.news-item .actions { .news-item .actions {
font-size: 11px; font-size: 11px;
margin-left: 32px; }
.news-item > .actions {
margin-left: 61px!important;
} }
.news-item .actions a { .news-item .actions a {
margin-right: 6px; margin-right: 6px;

3
views/_news.erb
View file

@ -17,10 +17,11 @@
<% elsif event.follow_id %> <% elsif event.follow_id %>
<div class="news-item follow"> <div class="news-item follow">
<div class="title"> <div class="title">
<div class="icon"></div>
<% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %> <% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %>
<% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %> <% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %>
<div class="icon"><a href="/site/<%= actioning_site.username %>" title="<%= actioning_site.username %>" class="avatar" style="background-image: url(<%= actioning_site.screenshot_url 'index.html', '50x50' %>);"></a></div>
<% if current_site && current_site.id == actioning_site.id %> <% if current_site && current_site.id == actioning_site.id %>
<a href="/site/<%= current_site.username %>" class="you">You</a> <a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %> <% else %>

2
views/_news_profile_comment.erb
View file

@ -2,7 +2,7 @@
<% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id, :plan_type, :parent_site_id).first %> <% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id, :plan_type, :parent_site_id).first %>
<div class="title"> <div class="title">
<a href="/site/<%= actioning_site.username %>" class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></a> <div class="icon"><a href="/site/<%= actioning_site.username %>" class="avatar" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '50x50') %>);"></a></div>
<% if current_site && current_site.id == actioning_site.id %> <% if current_site && current_site.id == actioning_site.id %>
<a href="/site/<%= current_site.username %>" class="you">You</a> <a href="/site/<%= current_site.username %>" class="you">You</a>