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

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-02-24 18:14:01 -08:00
commit 762b3c7ba6
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1396,7 +1396,7 @@ a.tag:hover {
}
}
.section.plans.welcome {
padding: 55px 3%;
padding: 63px 3%;
h3 {
color: #5e95a1;
@ -1433,9 +1433,7 @@ a.tag:hover {
}
}
>.row {
@media(max-device-width:480px), screen and (max-width:550px) {
margin-bottom: 0;
}
margin-bottom: 0;
}
.plan-overview {
h3 {
@ -1487,7 +1485,7 @@ a.tag:hover {
margin-bottom: 15px;
.main-features {
margin-bottom: 97px;
margin-bottom: 76px;
}
}
.col.supporter {
@ -1495,7 +1493,7 @@ a.tag:hover {
background-color: #F5F5F5;
border: 1px solid #E0E0E0;
@include box-shadow(-1px 1px 5px 0px rgba(0,0,0,0.1));
margin-bottom: 1.1em!important;
margin-bottom: 1.2em!important;
.col:first-child {
width: 38%;
@ -1503,10 +1501,17 @@ a.tag:hover {
.col:last-child {
width: 62%;
margin-top: .75em;
p {
.instructions {
font-weight: bold;
font-size: 100%;
color: #777;
margin-bottom: 1em;
}
.skeuocard.js .face {
@include box-shadow(0px 1px 2px 0px rgba(0,0,0,0.25));
&.valid {
@include box-shadow(0 0 10px #00cfa7);
}
}
}
.btn-Action {

13
views/welcome.erb
View file

@ -1,6 +1,3 @@
<style>
p { font-size: 200px; }
</style>
<section class="section plans welcome">
<h2>Welcome to Neocities, <%= current_site.username %>!</h2>
<h3 class="subtitle">Free accounts will always be free and ad-free.
@ -43,7 +40,7 @@ You can support our quest to bring back the creative, independent web by upgradi
<ul class="main-features">
<li><strong><%= Site::PLAN_FEATURES[:supporter][:space].to_space_pretty %></strong> <span data-original-title="How much disk space you can use for your site. More space means you can upload more files.">storage</span></li>
<li><strong>1000 GB</strong> <span data-original-title="How much content you can serve in one month. Don’t worry—these are soft limits. Temporary surges are fine, we won't take your site down automatically, and we're very flexible.">bandwidth</span></li>
<li><strong>1000 GB</strong> <span data-original-title="How much content you can serve in one month. Don’t worry—these are soft limits. Temporary surges are fine, we won't take your site down automatically, and we’re very flexible.">bandwidth</span></li>
</ul>
<ul>
@ -55,7 +52,7 @@ You can support our quest to bring back the creative, independent web by upgradi
</div>
<div class="col col-66">
<p>To upgrade, enter your credit card info below:</p>
<p class="instructions">To upgrade, enter your credit card info below:</p>
<div>
<div id="plan_error" class="alert alert-block alert-error" style="display:none"></div>
<form id="upgradeForm" method="POST" action="/plan/update">
@ -111,7 +108,7 @@ You can support our quest to bring back the creative, independent web by upgradi
<div class="col col-50">
<h3><i class="fa fa-lock"></i> Risk-free and secure</h3>
<p>You can downgrade back to a free account at any time on the plan page. If you do, we’ll refund the amount you didn’t use.</p>
<p>You can downgrade back to a free account at any time on the Support Us page. If you do, we’ll refund the amount you didn’t use.</p>
<p>We use Stripe and PayPal for payments, and never store your credit card information directly. </p>
</div>
@ -121,12 +118,12 @@ You can support our quest to bring back the creative, independent web by upgradi
<div class="col col-50">
<h3><i class="fa fa-globe"></i> Making a better web</h3>
<p>
When you become a supporter, you are directly helping our quest to bring back the creative, independent web, and to continue to improve Neocities for everyone.
When you become a supporter, you are directly helping our quest to bring back the creative, independent web. With your help we’ll be able to work on Neocities full-time to continue improving the site and adding more features.
</p>
</div>
<div class="col col-50">
<h3><i class="fa fa-github"></i> Giving back</h3>
<h3><i class="fa fa-university"></i> Giving back</h3>
<p>
Neocities is used by educators all over the world to teach thousands of students how to program. And as an <a href="http://www.opencompany.org">Open Company</a>, our site is <a href="https://github.com/neocities">completely open source</a> and we share all our code with the community.
</p>