Merge branch 'v2' of github.com:neocities/neocities into v2

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;

views/plan/_pricing.erb

@@ -5,7 +5,7 @@
     if !parent_site
       %{<a href="/#new" class="btn-Action">Sign Up</a>}
     elsif parent_site && parent_site.plan_type == plan_type
-      %{<p style="padding-top: 15px; padding-bottom: 14px"><strong>Current Plan</strong></p>}
+      %{<div class="current-plan">Current Plan</div>}
     else
       if plan_type == 'supporter'
         plan_price = "$#{Site::PLAN_FEATURES[plan_type.to_sym][:price]*12}, once per year"

views/site.erb

@@ -51,7 +51,7 @@
   </div>
 </div>
 
-<div class="container">
+<div class="container site-profile">
 <div class="content misc-page columns right-col"><div class="col-left">
   <div class="col col-66">
     <% if current_site && site.profile_comments_enabled %>
@@ -80,7 +80,7 @@
     <% end %>
 
     <% if @latest_events.empty? %>
-      <div>
+      <div class="site-profile-padding">
         <p>No recent activity.</p>
         <% if current_site && site.owned_by?(parent_site) %>
           <p>
@@ -90,9 +90,8 @@
       </div>
       <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
     <% else %>
-      <div><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
+      <div class="site-profile-padding"><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
     <% end %>
-
   </div>
 
   <div class="col col-33">