From 7d43fe2ab810850c138d73baecdf2e639f033d63 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Thu, 23 Oct 2014 19:41:05 -0700
Subject: [PATCH 1/5] Trying out small icon style for my friends' comments on
 someone else's page

---
 views/_news.erb                 | 3 +--
 views/_news_profile_comment.erb | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/_news.erb b/views/_news.erb
index 7bcb4957..c8538aa1 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -12,8 +12,7 @@
 
 <% events.each do |event| %>
   <% if event.profile_comment_id %>
-    <div class="news-item comment for-me" id="event_<%= event.id %>">
-      <%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment} %>
+      <%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment, event: event} %>
   <% elsif event.follow_id %>
     <div class="news-item follow">
       <div class="title">
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 7911b079..24e21f62 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -1,8 +1,9 @@
 <% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username, :stripe_customer_id).first %>
 <% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id).first %>
+<div class="news-item comment <% if (current_site && current_site.id == profile_comment.site_id) || (request.path != '/') %>for-me<% end %>" id="event_<%= event.id %>">
 
 <div class="title">
-  <div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
+  <div class="icon" style="<% if current_site && current_site.id == profile_comment.site_id %>background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);<% end %>"></div>
 
   <% if current_site && current_site.id == actioning_site.id %>
     You

From 9ca5caab9d092edddade28da28a85982f5866c1b Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Thu, 23 Oct 2014 19:44:12 -0700
Subject: [PATCH 2/5] Reverting to large icon style for all comments

---
 views/_news.erb                 | 1 +
 views/_news_profile_comment.erb | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/_news.erb b/views/_news.erb
index c8538aa1..dbc2965f 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -12,6 +12,7 @@
 
 <% events.each do |event| %>
   <% if event.profile_comment_id %>
+    <div class="news-item comment for-me" id="event_<%= event.id %>">
       <%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment, event: event} %>
   <% elsif event.follow_id %>
     <div class="news-item follow">
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 24e21f62..7911b079 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -1,9 +1,8 @@
 <% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username, :stripe_customer_id).first %>
 <% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id).first %>
-<div class="news-item comment <% if (current_site && current_site.id == profile_comment.site_id) || (request.path != '/') %>for-me<% end %>" id="event_<%= event.id %>">
 
 <div class="title">
-  <div class="icon" style="<% if current_site && current_site.id == profile_comment.site_id %>background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);<% end %>"></div>
+  <div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
 
   <% if current_site && current_site.id == actioning_site.id %>
     You

From 0b013b55de8734edb036d413d3ed076192501cd7 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 15:18:01 -0700
Subject: [PATCH 3/5] Added supporter heart to supporter usernames in surf bar

---
 app.rb         |  2 +-
 views/surf.erb | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app.rb b/app.rb
index 9d88ad2f..b5c79d87 100644
--- a/app.rb
+++ b/app.rb
@@ -460,7 +460,7 @@ get '/surf/?' do
 end
 
 get '/surf/:username' do |username|
-  @site = Site.select(:id, :username, :title, :domain, :views).where(username: username).first
+  @site = Site.select(:id, :username, :title, :domain, :views, :stripe_customer_id).where(username: username).first
   @title = @site.title
   not_found if @site.nil?
   erb :'surf', layout: false
diff --git a/views/surf.erb b/views/surf.erb
index 3b8b6120..f778c422 100644
--- a/views/surf.erb
+++ b/views/surf.erb
@@ -122,6 +122,16 @@
     #top-bar .invisible a {
       color: #3B3B3B;
     }
+    #top-bar .fa-heart {
+      font-size: 0.7em;
+      color: #e93250;
+      vertical-align: .45em;
+      margin-left: -.15em;
+    }
+    #top-bar .fa-user {
+      display: inline;
+      font-size: 11px;
+    }
     </style>
   </head>
   <body>
@@ -162,7 +172,7 @@
       <% end %>
     </ul>
     <ul class="site-actions">
-      <li><a href="/site/<%= @site.username %>"><i class="fa fa-user"></i> <strong><%= @site.username %></strong></a></li>
+      <li><a href="/site/<%= @site.username %>"><i class="fa fa-user"><% if @site.supporter? && !@site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i> <strong><%= @site.username %></strong></a></li>
 
       <% if current_site && current_site != @site %>
         <li>

From 7e25397845702a543d547364d24d0a240de8b510 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 15:48:03 -0700
Subject: [PATCH 4/5] News feed changes - cleaned up text, improved
 colors/alignment

---
 sass/_helper-sass/_buttons.scss       |  2 +-
 sass/_project-sass/_project-Main.scss | 26 ++++++++++++++++++++++----
 views/_news.erb                       | 10 +++++-----
 views/_news_actions.erb               |  8 +-------
 views/_news_profile_comment.erb       | 10 ++++++----
 5 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/sass/_helper-sass/_buttons.scss b/sass/_helper-sass/_buttons.scss
index 3e8f8510..e4e15c8a 100644
--- a/sass/_helper-sass/_buttons.scss
+++ b/sass/_helper-sass/_buttons.scss
@@ -5,7 +5,7 @@
     background:$c-Dark; 
     @include border-radius($radius*6);
     @include box-shadow($bs-1);
-    color:$c-Lighter;
+    color:$c-Lighter!important;
     cursor:pointer;
     display:inline-block;
     font:{family:$arial; size:$base}
diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 6651d1da..bb48a817 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -510,6 +510,9 @@ a.tag:hover {
   margin: 0 4px 4px 0;
   float: left;
 }
+.misc-page.columns a:visited {
+  color: $c-Brand-1;
+}
 .news-item {
   width: 100%;
   float: left;
@@ -520,7 +523,10 @@ a.tag:hover {
 }
 .news-item .user {
   font-weight: bold;
-  color: #000;
+  color: #000!important;
+}
+.news-item .you {
+  color: #000!important;
 }
 .news-item .comment {
   color: #000;
@@ -533,7 +539,6 @@ a.tag:hover {
   margin-top: .2em;
   font-size: .9em;
   margin-bottom: -.1em;
-  margin-left: 2.35em;
 }
 .news-item .icon {
   width: 20px;
@@ -579,7 +584,7 @@ a.tag:hover {
   margin-top: .5em;
 }
 .news-item .date a {
-  color: #aaa;
+  color: #aaa!important;
 }
 .news-item .files {
   background: #F5F5F5;
@@ -616,9 +621,17 @@ a.tag:hover {
   float: none;
   margin-left: 4px;
 }
+.news-item .comments .actions, .news-item .comments p {
+  margin-left: 47px;
+}
+.news-item .comments p {
+  margin-bottom: .4em;
+  margin-top: .15em;
+  font-size: 1em;
+}
 .news-item .actions {
   font-size: 11px;
-  margin-left: 2.9em;
+  margin-left: 32px;
 }
 .news-item .actions a {
   margin-right: 6px;
@@ -632,6 +645,7 @@ a.tag:hover {
 .news-item .comments .comment {
   font-size: .8em;
   clear: both;
+  margin-top: 1em;
 }
 .news-item .comments .comment .user {
   margin-right: 5px;
@@ -639,6 +653,10 @@ a.tag:hover {
 .news-item .comments .comment .actions {
   margin-top: .3em;
 }
+.news-item .comment-symbol {
+  font-size: 80%;
+  margin-left: .2em;
+}
 .news-item .avatar {
   margin-right: 10px;
 }
diff --git a/views/_news.erb b/views/_news.erb
index dbc2965f..90f781de 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -22,15 +22,15 @@
       <% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %>
 
       <% if current_site && current_site.id == actioning_site.id %>
-        You
+        <a href="/site/<%= current_site.username %>" class="you">You</a>
       <% else %>
-        <i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.username %></a>
+        <a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
       <% end %>
 
-      started following
+      followed
 
       <% if current_site && event_site.id == current_site.id %>
-        your site.
+        <a href="/site/<%= current_site.username %>" class="you">you</a>
       <% else %>
         <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><i class="fa fa-user"><% if event_site.supporter? && !event_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= event_site.username %></a>
       <% end %>
@@ -91,7 +91,7 @@
           <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
           <div class="comment" id="comment_<%= comment.id %>">
             <img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>">
-            <i class="fa fa-user"><% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><%= comment_actioning_site.username %></a>
+            <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
             <span class="date">
               <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
             </span>
diff --git a/views/_news_actions.erb b/views/_news_actions.erb
index a6177c5d..3782048c 100644
--- a/views/_news_actions.erb
+++ b/views/_news_actions.erb
@@ -8,13 +8,7 @@
     <% end %>
   <% end %>
   <% if current_site && event.site.profile_comments_enabled && current_site.commenting_allowed? %>
-    <a id="reply" href="#" onclick="Template.renderComment(<%= event.id %>); return false">
-      <% if event.profile_comment_id %>
-        Reply
-      <% else %>
-        Comment
-      <% end %>
-    </a>
+    <a id="reply" href="#" onclick="Template.renderComment(<%= event.id %>); return false"><% if event.profile_comment_id %>Reply<% else %>Comment<% end %></a>
     <% if event.profile_comment_id && event.created_by?(current_site) %>
         <a id="editLink" href="#" onclick="ProfileComment.displayEditor('<%= event.id %>'); return false">Edit</a>
     <% end %>
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 7911b079..14516743 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -5,15 +5,17 @@
   <div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
 
   <% if current_site && current_site.id == actioning_site.id %>
-    You
+    <a href="/site/<%= current_site.username %>" class="you">You</a>
   <% else %>
-    <i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= actioning_site.username %>" class="user"><%= actioning_site.username %></a>
+    <a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
   <% end %>
 
+  <i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
+  
     <% if current_site && current_site.id == profile_comment.site_id %>
-      left a comment on <a href="/site/<%= current_site.username %>">your profile</a>:
+      <a href="/site/<%= current_site.username %>" class="you">You</a>
     <% else %>
-      left a comment on <i class="fa fa-user"><% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= profile_comment.site.username %>" class="user"><%= profile_comment.site.username %></a><%= site.username[site.username.length-1] == 's' ? "’" : "'s" %> profile:
+      <a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
     <% end %>
   <span class="date">
     <a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>

From 06205e7bde71c7d3eb669e3ba374ee8a9c546823 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 16:13:50 -0700
Subject: [PATCH 5/5] More alignment fixes for news feed

---
 sass/_project-sass/_project-Main.scss | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index bb48a817..2534aae1 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -637,7 +637,14 @@ a.tag:hover {
   margin-right: 6px;
 }
 .news-item .content {
-  padding: 0 0 0 32px;
+  padding: 0;
+  margin-left: 32px;
+}
+.news-item.comment .actions, .news-item.comment .content {
+  margin-left: 20px;
+}
+.news-item.comment .comments .actions {
+  margin-left: 47px;
 }
 .news-item .comments {
   margin-top: .7em;
@@ -680,6 +687,9 @@ a.tag:hover {
 .interior .header-Outro .actions a {
   margin-right: 6px;
 }
+.interior .header-Outro .actions a:first-of-type {
+  margin-left: 0;
+}
 .interior .header-Outro .stats {
   margin-bottom: 1.2em;
   float: left;