diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 3c815973..7c8b8291 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -404,15 +404,17 @@ background-color: white; right: 33%; } -.content.misc-page.columns .col { +.content.misc-page.columns .col, .site-profile-padding { padding: 25px 30px 30px 30px; position: relative; - overflow:hidden; } .content.misc-page.columns .col-66 { width: 67%; left: 33%; } +.site-profile .content.misc-page.columns .col-66 { + padding: 0; +} .content.misc-page.columns .col-33 { width: 33%; left: 33%; @@ -806,9 +808,9 @@ a.tag:hover { .post-comment { background: #DAEEA5; float: left; - width: 111%; + width: 100%; padding: 20px 0 10px 30px; - margin: -25px 0 28px -30px; + margin: 0 0 28px 0; } .post-comment input { width: 84%; @@ -1092,9 +1094,17 @@ a.tag:hover { font-size: .8em; margin-top: -.6em; } -.plan-overview .btn-Action { +.plan-overview .btn-Action, .plan-overview .current-plan { margin: .9em 0 1.4em 0; } +.plans .current-plan { + @extend %btn; + background: #777; + &:hover{ + background: #777; + cursor: default; + } +} .plan-overview .col { padding-bottom:1.5em; padding-left: 0; diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index b2a0ac65..1123e3d6 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -5,7 +5,7 @@ if !parent_site %{Sign Up} elsif parent_site && parent_site.plan_type == plan_type - %{

Current Plan

} + %{
Current Plan
} else if plan_type == 'supporter' plan_price = "$#{Site::PLAN_FEATURES[plan_type.to_sym][:price]*12}, once per year" diff --git a/views/site.erb b/views/site.erb index 47ff9f98..baf13192 100644 --- a/views/site.erb +++ b/views/site.erb @@ -51,7 +51,7 @@ -
+
<% if current_site && site.profile_comments_enabled %> @@ -80,7 +80,7 @@ <% end %> <% if @latest_events.empty? %> -
+

No recent activity.

<% if current_site && site.owned_by?(parent_site) %>

@@ -90,9 +90,8 @@

<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %> <% else %> -
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
+
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
<% end %> -