zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge violasong changes

Browse source
This commit is contained in:
Kyle Drake 2014-10-20 15:10:07 -07:00
commit 9d9c1c4495
5 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/img/fastcompany-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

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

@ -793,11 +793,12 @@ a.tag:hover {
float: left; float: left;
} }
.section h2 { .section h2 {
font-size: 1.7em; font-size: 2em;
text-align: center; text-align: center;
line-height: 150%; line-height: 150%;
max-width: 800px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
margin-bottom: .5em;
} }
.section h3 { .section h3 {
font-size: 1.4em; font-size: 1.4em;
@ -895,7 +896,14 @@ a.tag:hover {
background-image: url(/img/wired-logo.png); background-image: url(/img/wired-logo.png);
background-size: 211px; background-size: 211px;
margin-top: 6px; margin-top: 6px;
margin-right: 40px; margin-right: 38px;
}
.section .logo.fastco {
width: 262px;
height: 39px;
background-image: url(/img/fastcompany-logo.png);
background-size: 262px;
margin-top: 7px;
} }
.section .logo.vice { .section .logo.vice {
width: 160px; width: 160px;
@ -917,14 +925,19 @@ a.tag:hover {
margin-right: 30px; margin-right: 30px;
} }
.section .quote { .section .quote {
width: 75%; width: 70%;
margin: 0 auto; margin: 0 auto .5em auto;
h3 { h3 {
text-align: center; text-align: center;
font-style: italic; font-style: italic;
font-size: 1.3em; font-size: 1.4em;
line-height: 187%; line-height: 159%;
font-family: $times;
color: #afcbd1;
}
a {
color: #afcbd1;
} }
} }
.section.plans { .section.plans {

1
sass/_project-sass/_project-Vars.scss
View file

@ -54,6 +54,7 @@ $placeholderColor:#557380;
// ---------------------------------------------------------------- // ----------------------------------------------------------------
$arial: Arial, "Helvetica Neue", Helvetica, sans-serif; $arial: Arial, "Helvetica Neue", Helvetica, sans-serif;
$georgia: Georgia, "Times New Roman", Times, serif; $georgia: Georgia, "Times New Roman", Times, serif;
$times: "Times New Roman", Times, Georgia, serif;
$helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif; $helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif;
$brand: "Lucida Grande", verdana, $helvetica; $brand: "Lucida Grande", verdana, $helvetica;
$headings: 'Droid Serif', $georgia; $headings: 'Droid Serif', $georgia;

11
views/index.erb
View file

@ -127,7 +127,7 @@
<span class="intro-Icon"></span> <span class="intro-Icon"></span>
<h2 class="delta">Share your web creation with the world</h2> <h2 class="delta">Share your web creation with the world</h2>
<p class="base"> <p class="base">
Follow your favorite Neocities sites to keep up with all the latest updates. Discover new websites related to your interests, comment on them, and share them. Unlimited creativity - and zero ads. Follow your favorite Neocities sites to keep up with all the latest updates. Discover new websites related to your interests, comment on them, and share them. Unlimited creativity—and zero ads.
</p> </p>
</li> </li>
<li class="intro-Tools"> <li class="intro-Tools">
@ -231,7 +231,7 @@
<section class="section features"> <section class="section features">
<h2 class="delta">Forget boring social networks. Let's make the internet fun again. It's time to bring back web surfing!</h2> <h2 class="delta">Forget boring social networks. Let’s make the internet fun again. It’s time to bring back web surfing!</h2>
<div class="row"> <div class="row">
<div class="col col-33"> <div class="col col-33">
<h3><i class="fa fa-home"></i>You own your site</h3> <h3><i class="fa fa-home"></i>You own your site</h3>
@ -239,7 +239,7 @@
</div> </div>
<div class="col col-33"> <div class="col col-33">
<h3><i class="fa fa-tachometer"></i>More space, speed, and security</h3> <h3><i class="fa fa-tachometer"></i>More space, speed, and security</h3>
<p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it's your personal home page, or a busy professional site for your business, your site loads fast. We also provide Snowden-grade SSL cryptography, preventing snoops from seeing what you browse.</p> <p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it’s your personal home page, or a busy professional site for your business, your site loads fast. We also provide Snowden-grade SSL cryptography, preventing snoops from seeing what you browse.</p>
</div> </div>
<div class="col col-33"> <div class="col col-33">
@ -268,13 +268,16 @@
<div class="col col-100"> <div class="col col-100">
<div class="row press"> <div class="row press">
<a href="http://www.wired.com/2013/07/neocities/" class="logo wired"></a> <a href="http://www.wired.com/2013/07/neocities/" class="logo wired"></a>
<a href="http://www.fastcodesign.com/3037028/why-the-internet-is-time-traveling-back-to-1994" class="logo fastco"></a>
<a href="http://motherboard.vice.com/blog/neocities-is-recreating-the-garish-web-10-creativity-of-geocities" class="logo vice"></a> <a href="http://motherboard.vice.com/blog/neocities-is-recreating-the-garish-web-10-creativity-of-geocities" class="logo vice"></a>
<a href="http://arstechnica.com/tech-policy/2014/05/web-host-gives-fcc-a-28-8kbps-slow-lane-in-net-neutrality-protest/" class="logo ars"></a> <a href="http://arstechnica.com/tech-policy/2014/05/web-host-gives-fcc-a-28-8kbps-slow-lane-in-net-neutrality-protest/" class="logo ars"></a>
<!--<a href="/press" class="more">See all press »</a>--> <!--<a href="/press" class="more">See all press »</a>-->
</div> </div>
<div class="row quote"> <div class="row quote">
<h3> <h3>
"Designed as a 21st century reincarnation of GeoCities, Neocities lets you make your own site for free. <strong>And it just might spark a renaissance of creativity online.</strong>"</i> - Matthew Guay, <a href="http://web.appstorm.net/reviews/web-dev/neocities-the-free-place-to-code-your-own-site-from-scratch" target="_blank">AppStorm</a> "Designed as a 21st century reincarnation of GeoCities, Neocities lets you make your own site for free. <strong>And it just might spark a renaissance of creativity online.</strong>"
<br />
—Matthew Guay, <a href="http://web.appstorm.net/reviews/web-dev/neocities-the-free-place-to-code-your-own-site-from-scratch" target="_blank">AppStorm</a>
</h3> </h3>
</div> </div>
</div> </div>

24
views/plan/_pricing.erb
View file

@ -1,5 +1,5 @@
<section class="section plans"> <section class="section plans">
<h2>Need more power? We've got you covered.<br>Upgrading gives you more space, bandwidth, features, <strong>and helps us keep the free sites free, forever.</strong></h2> <h2>Need more power? We’ve got you covered.<br>Upgrading gives you more space, bandwidth, features, <strong>and helps us keep the free sites free, forever.</strong></h2>
<div class="plan-overview"> <div class="plan-overview">
<div class="header"> <div class="header">
@ -85,7 +85,7 @@
</div> </div>
<!-- <h2><a href="">Compare Plans <i class="fa fa-caret-down"></i></a></h2> --> <!-- <h2><a href="">Compare Plans <i class="fa fa-caret-down"></i></a></h2> -->
<h2>Compare Plans:</h2> <h2>Compare Plans</h2>
<table class="plan-chart"> <table class="plan-chart">
<tr> <tr>
@ -122,7 +122,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="* How much content you can serve in one month. Don't worry - these are very soft limits, temporary surges are fine, we won't take your site down automatically, and we're very flexible.">Bandwidth</span> <span data-original-title="How much content you can serve in one month. Don’t worry—these are very soft limits, temporary surges are fine, we won't take your site down automatically, and we're very flexible.">Bandwidth</span>
</td> </td>
<td><%= Site::PLAN_FEATURES[:free][:bandwidth].to_bytes_pretty %></td> <td><%= Site::PLAN_FEATURES[:free][:bandwidth].to_bytes_pretty %></td>
<td><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_bytes_pretty %></td> <td><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_bytes_pretty %></td>
@ -131,7 +131,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="We will never put ads on your site, or give your data to marketers. In fact, we're prohibited from doing it in our own Terms of Service.">No advertising, ever</span> <span data-original-title="We will never put ads on your site, or give your data to marketers. In fact, we’re prohibited from doing it in our own Terms of Service.">No advertising, ever</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -140,7 +140,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Our worldwide network of CDN servers cache your web site regionally, making your site load fast - no matter where your users are. 頑張る, 日本!">Global CDN Site Cache</span> <span data-original-title="Our worldwide network of CDN servers cache your web site regionally, making your site load fast—no matter where your users are. 頑張る, 日本!">Global CDN Site Cache</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -185,7 +185,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Site tags make it easy to find sites you're interested in, and join communities of sites. It's like a web ring, but even better.">Site Tags</span> <span data-original-title="Site tags make it easy to find sites you’re interested in, and join communities of sites. It’s like a web ring, but even better.">Site Tags</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -194,7 +194,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Each site has it's own RSS feed that make it easy to let people know when your site changes.">RSS Feed</span> <span data-original-title="Each site has its own RSS feed that make it easy to let people know when your site changes.">RSS Feed</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -212,7 +212,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Each site now has it's own profile page, allowing users to see when your site updates, follow your site, and leave feedback.">Site Profile</span> <span data-original-title="Each site now has its own profile page, allowing users to see when your site updates, follow your site, and leave feedback.">Site Profile</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -221,7 +221,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Our HTML5 site editor makes it easy to make quick changes to your site, even if you're on the run.">Neocities Site Editor</span> <span data-original-title="Our HTML5 site editor makes it easy to make quick changes to your site, even if you’re on the run.">Neocities Site Editor</span>
</td> </td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -248,8 +248,8 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Upload your SSL certificate for your domain name, preventing snoops from seeing your user's traffic.">Custom SSL Certificates</span> <span data-original-title="Upload your SSL certificate for your domain name, preventing snoops from seeing your user’s traffic.">Custom SSL Certificates</span>
</td> </td>’
<td></td> <td></td>
<td></td> <td></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>
@ -257,7 +257,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="No whitelists - you can upload anything you want (no copyrighted content, trojans, or w4r3z, please).">No File Upload Type Restrictions</span> <span data-original-title="No whitelists—you can upload anything you want (no copyrighted content, trojans, or w4r3z, please).">No File Upload Type Restrictions</span>
</td> </td>
<td></td> <td></td>
<td></td> <td></td>