From 8a0d556fc76872420bcebb6fd28383b148264b5b Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Mon, 20 Oct 2014 17:20:49 -0700
Subject: [PATCH 1/9] Fixed Open Company link

---
 views/index.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.erb b/views/index.erb
index cf620b4b..8d6bf726 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -255,7 +255,7 @@
 
       <div class="col col-33">
         <h3><i class="fa fa-university"></i>Open Company</h3>
-        <p>Neocities is a member of the <a href="https://opencompany.org" target="_blank">Open Company Initative</a>, working to help improve trustability in tech companies. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.</p>
+        <p>Neocities is a member of the <a href="http://www.opencompany.org/" target="_blank">Open Company Initative</a>, working to help improve trustability in tech companies. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.</p>
       </div>
 
       <div class="col col-33">

From fb437bf2cfa350ed44e26fd45d510718ca6efabe Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Mon, 20 Oct 2014 18:02:01 -0700
Subject: [PATCH 2/9] Fixed dashboard screenshot image

---
 sass/_project-sass/_project-Main.scss | 6 ++++++
 views/dashboard.erb                   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 88d6e323..8bb3281f 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -105,6 +105,12 @@
   -moz-background-size:cover;
   -webkit-background-size:cover;
   background-size:cover;
+  background-position: center top;
+}
+.interior .header-Outro .screenshot.dashboard {
+  width: 249px;
+  background-size: 249px;
+  height: 143px;
 }
 .interior .header-Outro ul {
   margin:0;padding:0;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 7a85ffbb..0189274d 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -19,10 +19,10 @@
 <div class="header-Outro with-site-image">
   <div class="row content wide">
 
-    <div class="col col-50 signup-Area" style="width: 289px;">
+    <div class="col col-50 signup-Area" style="width: 293px;">
       <div class="signup-Form">
   	  <fieldset class="content">
-        <img class="screenshot" src="<%= current_site.screenshot_url('index.html', '540x405') %>">
+        <a href="/surf/<%= current_site.username %>" class="screenshot dashboard" style="background-image:url(<%= current_site.screenshot_url('index.html', '540x405') %>);"></a>
 	    </fieldset>
       </div>
     </div>

From f30b77a3e0a7592777d6b9ec7e483433bb32c2ba Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 16:24:45 -0700
Subject: [PATCH 3/9] Made the site updated box a bit more subtle

---
 sass/_project-sass/_project-Main.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 8bb3281f..5b386803 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -586,9 +586,9 @@ a.tag:hover {
   color: #aaa;
 }
 .news-item .files {
-  background: #eee;
+  background: #F5F5F5;
   padding: 8px 10px 2px 10px;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #E7E7E7;
   margin-bottom: 4px;
 }
 .news-item .file {

From a1ba1a097449ba79126260aae835dd5bee9b14d6 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 16:25:52 -0700
Subject: [PATCH 4/9] Added user icon to usernames, with heart icon denoting
 supporter status

---
 sass/_project-sass/_project-Main.scss            | 14 +++++++++++++-
 sass/_project-sass/_project-Website-Gallery.scss |  7 +++----
 views/_news.erb                                  | 12 ++++++------
 views/_news_profile_comment.erb                  |  8 ++++----
 views/browse.erb                                 |  2 +-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 5b386803..040aca5a 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -1176,7 +1176,19 @@ a.tag:hover {
   padding-top: 0px;
   padding-bottom: 4px;
 }
-
 .dropdown-submenu .dropdown-menu {
   width: 1px;
+}
+.fa-heart {
+  font-size: 0.7em;
+  color: #e93250;
+  vertical-align: .45em;
+  margin-left: -.15em;
+}
+.fa-user {
+  margin-right: 0.25em;
+  display: inline;
+  font-size: 10px;
+  vertical-align: .1em;
+  margin-left: .1em;
 }
\ No newline at end of file
diff --git a/sass/_project-sass/_project-Website-Gallery.scss b/sass/_project-sass/_project-Website-Gallery.scss
index 17eb828f..42629051 100644
--- a/sass/_project-sass/_project-Website-Gallery.scss
+++ b/sass/_project-sass/_project-Website-Gallery.scss
@@ -37,10 +37,6 @@
       width: 28%;
       text-align: right;
     }
-    .fa-user {
-      margin-right: .45em;
-      display: inline;
-    }
     .site-tags {
       width: 100%;
       height: 1.4em;
@@ -50,6 +46,9 @@
     .site-tags .fa-tag {
       vertical-align: -2px;
     }
+    .fa-user {
+      margin-right: .45em;
+    }
   }
   .title {
     margin-top: 8px;
diff --git a/views/_news.erb b/views/_news.erb
index 9a735e5a..ddd38a5c 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -18,13 +18,13 @@
     <div class="news-item follow">
       <div class="title">
       <div class="icon"></div>
-      <% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain).first %>
-      <% event_site = event.site_dataset.select(:id, :username, :title, :domain).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 %>
 
       <% if current_site && current_site.id == actioning_site.id %>
         You
       <% else %>
-        <a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.username %></a>
+        <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>
       <% end %>
 
       started following
@@ -32,7 +32,7 @@
       <% if current_site && event_site.id == current_site.id %>
         your site!
       <% else %>
-        <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.username %></a>
+        <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 %>
 
       <span class="date">
@@ -86,10 +86,10 @@
     <div class="content">
       <div class="comments">
         <% event.comments.each do |comment| %>
-          <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username).first %>
+          <% 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', '82x62') %>">
-            <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><%= comment_actioning_site.username %></a>
+            <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>
             <span class="date">
               <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
             </span>
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index fbf3d6d9..69fc1028 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -1,5 +1,5 @@
-<% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username).first %>
-<% site = profile_comment.site_dataset.select(:id, :username).first %>
+<% 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="title">
   <div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
@@ -7,14 +7,14 @@
   <% if current_site && current_site.id == actioning_site.id && request.path == '/' %>
     You
   <% else %>
-    <a href="/site/<%= actioning_site.username %>" class="user"><%= actioning_site.username %></a>
+    <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>
   <% end %>
 
   <% if request.path == '/' %>
     <% if current_site && current_site.id == profile_comment.site_id %>
       left a comment on <a href="/site/<%= current_site.username %>">your profile</a>:
     <% else %>
-      left a comment on <a href="/site/<%= profile_comment.site.username %>" class="user"><%= profile_comment.site.username %></a><%= site.username[site.username.length-1] == 's' ? "'" : "'s" %> site profile:
+      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:
     <% end %>
   <% end %>
   <span class="date">
diff --git a/views/browse.erb b/views/browse.erb
index 7602fea6..0e60b639 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -74,7 +74,7 @@
         <div class="site-info">
           <div class="username">
             <a href="/site/<%= site.username %>" title="Profile">
-              <i class="fa fa-user"></i><%= site.username %>
+              <i class="fa fa-user"><% if site.supporter? && !site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= site.username %>
             </a>
           </div>
           <div class="site-stats">

From bb5bb456873abda8a13bf032a05352855cfa144e Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 17:29:17 -0700
Subject: [PATCH 5/9] Fixed screenshots in following section in sidebar

---
 views/_follows.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/_follows.erb b/views/_follows.erb
index 9304b0a0..4ce31d27 100644
--- a/views/_follows.erb
+++ b/views/_follows.erb
@@ -6,7 +6,7 @@
       <p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags.
     <% else %>
       <% site.followings_dataset.select(:site_id).all.each do |following| %>
-        <a href="/site/<%= following.site_dataset.select(:username).first.username %>"><img src="<%= site.screenshot_path 'index.html', '50x50' %>" class="avatar"></a>
+        <a href="/site/<%= following.site_dataset.select(:username).first.username %>"><img src="<%= following.site.screenshot_url 'index.html', '50x50' %>" class="avatar"></a>
       <% end %>
     <% end %>
   </div>
@@ -21,7 +21,7 @@
     <% else %>
       <% site.follows_dataset.select(:actioning_site_id).all.each do |follow| %>
         <% follow_actioning_site = follow.actioning_site_dataset.select(:username).first %>
-        <a href="/site/<%= follow_actioning_site.username %>"><img src="<%= follow_actioning_site.screenshot_path 'index.html', '50x50' %>" class="avatar"></a>
+        <a href="/site/<%= follow_actioning_site.username %>"><img src="<%= follow_actioning_site.screenshot_url 'index.html', '50x50' %>" class="avatar"></a>
       <% end %>
     <% end %>
   </div>

From f1ffd458e4ce3ae23ba1cfe8dc5741e6c0e553f0 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 17:29:47 -0700
Subject: [PATCH 6/9] Fixed small comment avatars

---
 views/_news.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/_news.erb b/views/_news.erb
index ddd38a5c..43198ff8 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -88,7 +88,7 @@
         <% event.comments.each do |comment| %>
           <% 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', '82x62') %>">
+            <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>
             <span class="date">
               <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>

From 9cc9b0e5d72866a398f160b181cb3f54cb821f66 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 17:40:49 -0700
Subject: [PATCH 7/9] Removed actions from follow events, style changes to news
 feed

---
 sass/_project-sass/_project-Main.scss | 18 +++++++-----------
 views/_news.erb                       |  4 +++-
 views/site.erb                        |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 040aca5a..10857450 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -513,18 +513,10 @@ a.tag:hover {
 .news-item {
   width: 100%;
   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) {
-  margin-top: 0;
-}
-.news-item.first {
-  margin-top: 0;
+  margin-top: 0!important;
 }
 .news-item .user {
   font-weight: bold;
@@ -540,7 +532,8 @@ a.tag:hover {
   font-style: normal;
   margin-top: .2em;
   font-size: .9em;
-  margin-bottom: -.4em;
+  margin-bottom: -.1em;
+  margin-left: 2.35em;
 }
 .news-item .icon {
   width: 20px;
@@ -568,6 +561,9 @@ a.tag:hover {
 .news-item.tip .icon {
   background: #FFCC00;
 }
+.news-item.follow {
+  margin: .3em 0 .3em 0;
+}
 .news-item.follow .icon {
   background: #3399CC;
 }
diff --git a/views/_news.erb b/views/_news.erb
index 43198ff8..75acd7c5 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -80,7 +80,9 @@
       <% 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 %>
     <div class="content">
diff --git a/views/site.erb b/views/site.erb
index ba750837..03c18a72 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -90,7 +90,7 @@
       </div>
       <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
     <% else %>
-      <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
+      <div><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
     <% end %>
 
   </div>

From 1fd6dd9101126633c471fca4c9a412054e40f7ba Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 19:14:38 -0700
Subject: [PATCH 8/9] Fixed browse page surf links

---
 views/browse.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/browse.erb b/views/browse.erb
index 0e60b639..e64d7114 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -63,13 +63,13 @@
   <ul class="row website-Gallery content int-Gall">
     <% @sites.each_with_index do |site,i| %>
       <li>
-        <a href="" class="neo-Screen-Shot" target="_blank" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false">  
+        <a href="" class="neo-Screen-Shot" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false">
           <span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;">
             <img src="/img/placeholder.png" alt="<%= site.title %>" />
           </span>
         </a>
         <div class="title">
-          <a href="/surf/<%= site.username %>" title="<%= site.title %>"><%= site.title.shorten(30) %></a>
+          <a href="" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false"><%= site.title.shorten(30) %></a>
         </div>
         <div class="site-info">
           <div class="username">

From 3016ef8d7903cf26b24a30b5903feba96d4c362a Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 19:27:28 -0700
Subject: [PATCH 9/9] adjusted news feed pagination style

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

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 10857450..2c7fd5d3 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -1161,6 +1161,10 @@ a.tag:hover {
 .browse-page .tags {
   padding: 0 30px 40px 30px;
 }
+.misc-page .pagination {
+  width: 100%;
+  float: left;
+}
 .pagination .arrow {
   vertical-align: 1px;
 }