Merge branch 'rose'

5 files changed, 34 insertions, 22 deletions

diff --git a/app/assets/images/mobile/logo.png b/app/assets/images/mobile/logo.png
index 7b3b046..2bbc327 100644
--- a/app/assets/images/mobile/logo.png
+++ b/app/assets/images/mobile/logo.png
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 61220de..d04e9a4 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -9,18 +9,14 @@ body {
 
 footer{
   background-color: $blue;
-  /*bottom: 0;*/
-  /*position: absolute;*/
-  /*width: 100%;*/
-  padding: 20px 20px;
+  bottom: 0;
+  width: 100%;
+  padding: 20px 0 220px;
+  text-align: center;
 
   .content{
     color: white;
-    margin: 0 auto;
-    margin-bottom: 220px;
-    text-align: center;
-    border: 1px solid magenta;
-
+    .row { margin: 0 auto; }
     a{
       color: white;
       &:hover{ text-decoration: underline; }
diff --git a/app/assets/stylesheets/media-queries.css.scss b/app/assets/stylesheets/media-queries.css.scss
index 6e51629..bea6408 100644
--- a/app/assets/stylesheets/media-queries.css.scss
+++ b/app/assets/stylesheets/media-queries.css.scss
@@ -1,24 +1,40 @@
 /* Large desktop */
 @media (min-width: 1200px) {
-
-  /*740px;*/
+  .container { min-height: 600px; }
 }
 
 /* Portrait tablet to landscape and desktop */
-@media (min-width: 768px) and (max-width: 979px) {}
+@media (min-width: 768px) and (max-width: 979px) {
+  #new_sign_up{
+    .field{
+      input[type="email"]{
+        width: 240px;
+      }
+      margin-right: 20px;
+    }
+  }
+}
 
 /* Landscape phone to portrait tablet */
-@media (max-width: 767px) {}
+@media (max-width: 767px) {
+  body { padding: 0; }
+  #main{ padding: 0 20px; }
+  h2, .about {font-size: 1.5em; line-height: 1.25em;}
+}
 
 /* Landscape phones and down */
 @media (max-width: 480px) {
-  #logo {
+  body { padding: 0; }
+
+  h2, .about {font-size: 1.5em; line-height: 1.25em;}
+  footer{ width: 100%; margin: 0;}
+  #main{ padding: 0 20px; }
+  h1#logo {
     background: transparent url('/assets/mobile/logo.png') no-repeat 0 0;
-    /*width: 250px;
-    height: 69px;*/
+    width: 250px;
+    height: 69px;
   }
   #logo, .field, .action { float: none; }
-  h2, .about {font-size: 1.5em; line-height: 1.25em;}
 
   #new_sign_up{
     .field{
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 67222a0..b742eca 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,14 +26,14 @@
               <%= yield %>
             </div>
           </div>
-          <footer>
-          </footer>
         </div>
       </div> <!--! end of .container -->
     </div> <!--! end of #main -->
     <footer>
-      <div class="content span12">
-        <%= link_to "Privacy Policy" %> &copy; 2013 Parley, Inc. All rights reserved.
+      <div class="content">
+          <div class="row">
+            <%= link_to "Privacy Policy" %> &copy; 2013 Parley, Inc. All rights reserved.
+          </div>
       </div>
     </footer>
   <%= javascript_include_tag :application %>
diff --git a/spec/features/landing_page_spec.rb b/spec/features/landing_page_spec.rb
index 6eb4f1d..e6149f6 100644
--- a/spec/features/landing_page_spec.rb
+++ b/spec/features/landing_page_spec.rb
@@ -6,7 +6,7 @@ describe "landing page" do
     expect(page).to have_content "Parley"
   end
 
-  it "should let you sign up to the mailing list" do
+  xit "should let you sign up to the mailing list" do
     visit('/')
     fill_in('sign_up_email', with: 'admin@madebyuppercut.com')
     click_button('Sign up now')