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 + You <% else %> - <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> - started following + followed <% if current_site && event_site.id == current_site.id %> - your site. + you <% else %> <% if event_site.supporter? && !event_site.ended_supporter? %><% end %><%= event_site.username %> <% end %> @@ -91,7 +91,7 @@ <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
- <% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><% end %><%= 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_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? %> - - <% if event.profile_comment_id %> - Reply - <% else %> - Comment - <% end %> - + <% if event.profile_comment_id %>Reply<% else %>Comment<% end %> <% if event.profile_comment_id && event.created_by?(current_site) %> Edit <% 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 @@
<% if current_site && current_site.id == actioning_site.id %> - You + You <% else %> - <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> + <% if actioning_site.supporter? && !actioning_site.ended_supporter? %><% end %><%= actioning_site.username %> <% end %> + + <% if current_site && current_site.id == profile_comment.site_id %> - left a comment on your profile: + You <% else %> - 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: + <% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><% end %><%= profile_comment.site.username %> <% end %> <%= profile_comment.created_at.ago %>