Merge violasong changes

sass/_project-sass/_project-Header.scss

@@ -47,8 +47,11 @@
 }
 .hp {
   .header-Outro {
-    .col-50.signup-Area {
-      width: 48%;
+    .col.intro {
+      width: 53%;
+    }
+    .col.signup-Area {
+      width: 45%;
     }
     .signup-Area {
       float: right;
@@ -56,7 +59,7 @@
     .intro-text {
       color: #B8D375;
       font-size: .9em;
-      margin-bottom: 1.8em;
+      margin-bottom: 1.6em;
       
       a {
         color: #B8D375;
@@ -68,8 +71,8 @@
     }
     h2.section-header {
       font-size: 2.2em;
-      margin-top: .5em;
-      margin-bottom: 0.1em;
+      margin-top: .4em;
+      margin-bottom: 0.2em;
     }
   }
 }
@@ -88,11 +91,13 @@
   }
   
   h2{
-    margin-bottom:2px;
+    margin-bottom: 0px;
+    font-size: 1.525em;
   }
   
   p {
     color:#B2BCC1;
+    line-height: 170%;
   }
 }
 
@@ -127,11 +132,11 @@
   position:relative
 }
 
-.signup-Form{
+.header-Outro .signup-Form{
   background:#354751;
   border-radius:4px 4px 0 0;
   @include box-shadow($signupShadow);
-  height:600%;
+  height:700%;
   overflow:hidden;
   position:absolute;
   top: -40px;
@@ -160,7 +165,7 @@
   
   fieldset{
     background:url(/img/sign-up-bg.png) repeat-x center top; 
-    padding: 20px 33px;
+    padding: 22px 33px;
   }
   
   label{
@@ -181,7 +186,7 @@
     border:0 solid black;
     @include box-shadow($inputAreaShadow);
     color:#C2CFD4;
-    margin-bottom:$spacing*7;
+    margin-bottom:30px;
     margin-right:$spacing;
     padding: 10px 10px 7px 10px;
     width:100%;
@@ -196,6 +201,8 @@
   }
   .btn-Action{
     padding:10px 25px;
+    margin-top: 6px;
+    font-size: 1em;
   }
 }
 

sass/_project-sass/_project-Main.scss

@@ -13,7 +13,7 @@
 	}
 }
 .content, .footer-Content {
-	padding: 20px 3%;
+	padding: 20px 2.5%;
 }
 .single-Col{
   max-width:800px;
@@ -913,6 +913,10 @@ a.tag:hover {
 .section.plans {
   background: #fff;
   width: 100%;
+  
+  @media(max-device-width:480px), screen and (max-width:550px) {
+    padding: 55px 3%;
+  }
 }
 .section.plans h2 {
   color:#4F7E89;

views/index.erb

@@ -117,7 +117,7 @@
 
 <div class="header-Outro">
   <div class="row header-Content content">
-    <div class="col col-50">
+    <div class="col intro">
     <h2 class="section-header">Make your own web site, and discover new ones.</h2>
     <p class="intro-text">
      Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites</a> that are bringing back creative expression on the web. Anyone can make a site, only your imagination is required. We provide the space, you provide the web site ideas. Join us!
@@ -139,7 +139,7 @@
     </ul>
     </div>
 
-    <div class="col col-50 signup-Area">
+    <div class="col signup-Area">
       <% if signed_in? %>
 
         <div class="signup-Form">