added top cities again; styled top-cities

aitchabee · Mar 2, 2015 · 952a02e · 952a02e
1 parent eedbe07
commit 952a02e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 11 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -179,7 +179,7 @@ h1 {
 
 footer {
     text-align: center;
-    text-size: 15px;
+    font-size: 8pt;
     color: #41326b;
     background-color: #ffffff;
 }

diff --git a/app/assets/stylesheets/splash.css.scss b/app/assets/stylesheets/splash.css.scss
@@ -18,7 +18,6 @@
   footer {
     color: white;
     background-color: transparent;
-    position: fixed;
     bottom: 0px;
     left: 0px;
     right: 0px;
@@ -38,6 +37,18 @@
 .splash-content {
   padding: 75px 10px 0px 10px;
 
+  .search-bar {
+    height: 70px;
+    font-size: 18pt;
+  }
+
+  .input-group-btn > .btn {
+    height: 70px;
+    &:hover {
+      border-color: $dark-purple;
+    }
+  }
+
   .splash-text-container {
     @include border-radius(5px);
     color: white;
@@ -47,7 +58,7 @@
 
   h1 {
     font-weight: bold;
-    font-size: 52pt;
+    font-size: 34pt;
     padding-bottom: 20px
   }
 
@@ -56,6 +67,10 @@
     padding-top: 20px
   }
 
+  .splash-add-restroom-container {
+    padding-bottom: 40px
+  }
+
   .splash-add-restroom-btn {
     margin: 0 auto;
     display: block;
@@ -69,4 +84,17 @@
       margin-left: 20px
     }
   }
+}
+
+.top-cities-container {
+  padding: 5px;
+  color: white;
+  background: rgb(0, 0, 0); /* fallback color */
+  background: rgba(0, 0, 0, 0.7);
+  p {
+    margin: 0
+  }
+  a {
+    color: white;
+  }
 }
diff --git a/app/views/welcome/_topcities.html.haml b/app/views/welcome/_topcities.html.haml
@@ -1,7 +1,8 @@
-#top-cities-content
+.top-cities-container
   %p
-    Popular Cities
-  %ul
+    %strong
+      Popular Cities:
     - @cities.each do |city_and_state|
-      %li
-        = link_to city_and_state.join(', '), restrooms_path(search: city_and_state)
+      = link_to city_and_state.join(', '), restrooms_path(search: city_and_state)
+      - unless city_and_state == @cities.last
+        |
diff --git a/app/views/welcome/index.html.haml b/app/views/welcome/index.html.haml
@@ -1,17 +1,18 @@
 .splash-content
   .row
-    .col-xs-12.col-sm-8.col-sm-offset-2
+    .col-xs-10.col-xs-offset-1.col-sm-6.col-sm-offset-3
       .splash-text-container.centered-text
         %h3.headroom
           Sometimes life is tough...
         %h1.centered-text
-          Find Your Refuge
+          Find Refuge
 
   .row.more-headroom
     .col-xs-12.col-sm-8.col-sm-offset-2
       = render partial: "layouts/search", locals: {splash: true}
+      = render partial: "welcome/topcities"
 
-  .row.more-headroom
+  .row.more-headroom.splash-add-restroom-container
     .col-xs-12.col-sm-6.col-sm-offset-3
       = button_to new_restroom_path, method: :get, class: "btn btn-lg btn-purple splash-add-restroom-btn" do
         Add A Restroom