zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Kyle Drake 2014-10-27 17:57:14 -07:00
commit 26b11aa9f7
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sass/_project-sass/_project-Main.scss
View file

@ -404,15 +404,17 @@
background-color: white; background-color: white;
right: 33%; right: 33%;
} }
.content.misc-page.columns .col { .content.misc-page.columns .col, .site-profile-padding {
padding: 25px 30px 30px 30px; padding: 25px 30px 30px 30px;
position: relative; position: relative;
overflow:hidden;
} }
.content.misc-page.columns .col-66 { .content.misc-page.columns .col-66 {
width: 67%; width: 67%;
left: 33%; left: 33%;
} }
.site-profile .content.misc-page.columns .col-66 {
padding: 0;
}
.content.misc-page.columns .col-33 { .content.misc-page.columns .col-33 {
width: 33%; width: 33%;
left: 33%; left: 33%;
@ -806,9 +808,9 @@ a.tag:hover {
.post-comment { .post-comment {
background: #DAEEA5; background: #DAEEA5;
float: left; float: left;
width: 111%; width: 100%;
padding: 20px 0 10px 30px; padding: 20px 0 10px 30px;
margin: -25px 0 28px -30px; margin: 0 0 28px 0;
} }
.post-comment input { .post-comment input {
width: 84%; width: 84%;
@ -1092,9 +1094,17 @@ a.tag:hover {
font-size: .8em; font-size: .8em;
margin-top: -.6em; margin-top: -.6em;
} }
.plan-overview .btn-Action { .plan-overview .btn-Action, .plan-overview .current-plan {
margin: .9em 0 1.4em 0; margin: .9em 0 1.4em 0;
} }
.plans .current-plan {
@extend %btn;
background: #777;
&:hover{
background: #777;
cursor: default;
}
}
.plan-overview .col { .plan-overview .col {
padding-bottom:1.5em; padding-bottom:1.5em;
padding-left: 0; padding-left: 0;

2
views/plan/_pricing.erb
View file

@ -5,7 +5,7 @@
if !parent_site if !parent_site
%{<a href="/#new" class="btn-Action">Sign Up</a>} %{<a href="/#new" class="btn-Action">Sign Up</a>}
elsif parent_site && parent_site.plan_type == plan_type 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 else
if plan_type == 'supporter' if plan_type == 'supporter'
plan_price = "$#{Site::PLAN_FEATURES[plan_type.to_sym][:price]*12}, once per year" plan_price = "$#{Site::PLAN_FEATURES[plan_type.to_sym][:price]*12}, once per year"

7
views/site.erb
View file

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