From c2eedc3952e8f4650b02b737d5e6a116830b08ff Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Fri, 5 Dec 2014 03:05:16 -0600 Subject: [PATCH] sigh --- sass/_project-sass/_project-Header.scss | 17 ++++++++--------- sass/_project-sass/_project-Main.scss | 21 +++++++++++++++------ views/index.erb | 23 +++++++++++------------ 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 141497a1..7cdb3f13 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -145,8 +145,10 @@ border-radius:4px 4px 0 0; @include box-shadow($signupShadow); height:700%; + float: left; position:absolute; top: -40px; + margin-bottom: 15px; @media (max-device-width:480px), screen and (max-width:800px){ height:auto; @@ -154,7 +156,7 @@ overflow:visible; padding-bottom:20px; position:static; - width:auto; + width:100%; } h2{ @@ -166,12 +168,13 @@ hr{ border-bottom:1px solid #4a6677; border-top:1px solid #1d282d; - margin:4px 0 26px; + margin: 4px 0 21px; } fieldset{ - background:url(/img/sign-up-bg.png) repeat-x center top; padding: 25px 33px; + background:url(/img/sign-up-bg.png) repeat-x center top; + border-radius: 4px 4px 0 0; } label{ @@ -180,7 +183,7 @@ label#domain-name { display: inline; - vertical-align: 51%; + vertical-align: 8px; color: #C2CFD4; } @@ -189,7 +192,7 @@ border:0 solid black; @include box-shadow($inputAreaShadow); color:#C2CFD4; - margin-bottom:27px; + margin-bottom: 21px; margin-right:$spacing; padding: 10px 10px 7px 10px; width:100%; @@ -215,10 +218,6 @@ padding:10px 25px; margin-top: 2em; font-size: 1em; - - @media (max-device-width:480px), screen and (max-width:800px){ - margin-top: 0; - } } } diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 817d30d5..d9c584ba 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1101,10 +1101,8 @@ a.tag:hover { background: #4F7E89; text-align: center; - .row:first-child { - @media (max-device-width:480px), screen and (max-width:800px){ - margin-bottom: 0; - } + .row:first-of-type { + margin-bottom: 0; } } .section.features .col { @@ -1116,6 +1114,7 @@ a.tag:hover { @media (max-device-width:480px), screen and (max-width:800px){ padding-left: 20px; + width: 100%; } } @@ -1181,6 +1180,9 @@ a.tag:hover { @media (max-width:1170px) and (min-width:900px){ width: 170px; } + @media (max-device-width:480px), screen and (max-width:900px){ + margin-right: auto!important; + } } .section .logo.fastco { width: 262px; @@ -1221,6 +1223,7 @@ a.tag:hover { margin: 0 auto .5em auto; h3 { + margin-top: .5em; text-align: center; font-style: italic; font-size: 1.4em; @@ -1397,10 +1400,15 @@ a.tag:hover { } } .section.bottom-signup { - padding-top: 1em; - padding-bottom: 6.5em; +// padding-top: 1em; +// padding-bottom: 6.5em; + + padding-top: 0; + background: #4F7E89; + padding-bottom: 7em; a { + color: white; text-decoration: underline; font-weight:bold; &:hover { @@ -1408,6 +1416,7 @@ a.tag:hover { } } h2 { + color: white; max-width: none; } } diff --git a/views/index.erb b/views/index.erb index 7e223fb4..0f658210 100644 --- a/views/index.erb +++ b/views/index.erb @@ -118,21 +118,21 @@

Create your own free web site.

- Neocities is a community of <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites that are bringing back the lost individual creativity of the web by giving everyone in the world a free web site. Anyone can make a site—only your imagination is required. Join us! + Neocities is a community of <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites that are bringing back the lost individual creativity of the web. We provide free hosting and tools that allow anyone to make a web site. Only your imagination is required. Join us!

@@ -179,7 +179,7 @@ -
+
@@ -276,30 +276,30 @@ -->
-

Our mission: to make the web fun again, by giving you back control of how you express yourself online.

-

+

Our mission: To make the web fun again by giving you back control of how you express yourself online.

+

Zero advertising

-

Neocities will never sell your personal data or embed advertising on your site. Instead, we are supporter and donation driven.

+

Neocities will never sell your personal data or embed advertising on your site. Instead, we are funded directly by our community through supporter plans and donations. This allows us to base all our decisions on making the best possible web building experience for you, rather than on appeasing ad companies.

More space, speed, and security

-

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, your site loads fast. And if you need more space, we've got you covered. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.

+

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, your site loads fast. And if you need more space, we've got you covered. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.

Developer tools

-

We have an in-browser HTML editor, file uploading, mounting your site to your computer (just like Dropbox), powerful APIs for building developer applications, and much more!

+

We have an in-browser HTML editor, easy file uploading, WebDAV publishing, support for custom domains, RSS feeds for every site, powerful APIs for building developer applications, and much more!

Open Company

-

Neocities is a member of the Open Company Initative, working to help improve trustability in tech companies. We publish the code that powers the site for inspection, and strive for openness in our company's operations. We want to win your trust - not lock you in.

+

Neocities is a member of the Open Company Initative, working to help improve trustability in tech companies. We publish the code that powers the site for inspection, and strive for openness in our company's operations. We want to win your trust—not lock you in.

@@ -339,8 +339,7 @@

Support Us

- Neocities is funded exclusively by supporters and donations. If you’d like to contribute, you can help us - pay our server costs using CC, Bitcoin, or PayPal. + Neocities is funded by supporters and donations. If you’d like to contribute, you can help us pay our server costs using credit card, Bitcoin, or PayPal.

Donate Today