diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 88d6e323..2c7fd5d3 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; @@ -507,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; @@ -534,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; @@ -562,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; } @@ -580,9 +582,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 { @@ -1159,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; } @@ -1170,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/_follows.erb b/views/_follows.erb index 9304b0a0..4ce31d27 100644 --- a/views/_follows.erb +++ b/views/_follows.erb @@ -6,7 +6,7 @@

You are not following any sites yet. Add some by browsing sites or looking at your tags. <% else %> <% site.followings_dataset.select(:site_id).all.each do |following| %> - + <% end %> <% end %> @@ -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 %> - + <% end %> <% end %> diff --git a/views/_news.erb b/views/_news.erb index 9a735e5a..75acd7c5 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -18,13 +18,13 @@

- <% 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 %> - <%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> started following @@ -32,7 +32,7 @@ <% if current_site && event_site.id == current_site.id %> your site! <% else %> - <%= event_site.username %> + <% if event_site.supporter? && !event_site.ended_supporter? %><% end %><%= event_site.username %> <% end %> @@ -80,16 +80,18 @@ <% 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 %>
<% 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 %>
- - <%= comment_actioning_site.username %> + + <% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><% end %><%= comment_actioning_site.username %> <%= comment.created_at.ago %> 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 %>
@@ -7,14 +7,14 @@ <% if current_site && current_site.id == actioning_site.id && request.path == '/' %> You <% else %> - <%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> <% if request.path == '/' %> <% if current_site && current_site.id == profile_comment.site_id %> left a comment on your profile: <% else %> - left a comment on <%= profile_comment.site.username %><%= site.username[site.username.length-1] == 's' ? "'" : "'s" %> site profile: + left a comment on <% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><% end %><%= profile_comment.site.username %><%= site.username[site.username.length-1] == 's' ? "’" : "'s" %> profile: <% end %> <% end %> diff --git a/views/browse.erb b/views/browse.erb index 69081d5f..e64d7114 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -63,18 +63,18 @@
    <% @sites.each_with_index do |site,i| %>
  • - + <%= site.title %>
    - <%= site.title.shorten(30) %> + <%= site.title.shorten(30) %>
    - <%= site.username %> + <% if site.supporter? && !site.ended_supporter? %><% end %><%= site.username %>
    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 @@
    -