make pages#index pretty again

mike-lang · Dec 13, 2014 · 0ec5cb3 · 0ec5cb3
1 parent a9ee586
commit 0ec5cb3
Show file tree

Hide file tree

Showing 18 changed files with 134 additions and 160 deletions.
diff --git a/app/assets/stylesheets/about.css.scss b/app/assets/stylesheets/about.css.scss
diff --git a/app/assets/stylesheets/get_involved.css.scss b/app/assets/stylesheets/get_involved.css.scss
diff --git a/app/assets/stylesheets/index.css.scss b/app/assets/stylesheets/index.css.scss
@@ -1,12 +1,11 @@
-#earth_container {
-  margin: auto;
-  margin-top: 5em;
-}
-
-.index_page {
-
-  .top_spacing {
-    padding-top: 7em;
+.index-page {
+  .col-md-4 {
+    p.feature-description {
+      min-height: 130px;
+    }
   }
 
+  .services-teaser-image {
+    margin-top: 30px;
+  }
 }
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -8,6 +8,12 @@ nav.navbar-fixed-top {
   }
 }
 
+.page-header {
+  h1 {
+    text-align: center;
+  }
+}
+
 #masthead, #footer {
   h1, p {
     color: #111;
@@ -83,6 +89,10 @@ footer {
   }
 }
 
+.feature-header-image {
+  min-height: 85px;
+}
+
 .more-info {
   color: #808080;
   font-style: italic;
@@ -91,3 +101,16 @@ footer {
 .center {
   text-align: center;
 }
+
+.top-spacing {
+  padding-top: 5em;
+}
+
+.minor-top-spacing {
+  margin-top: 3em;
+}
+
+.major-top-spacing {
+  margin-top: 8em;
+}
+
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -12,7 +12,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span4">&nbsp;</div>
     <div class="span8">
       <h1><%= t '.decentralize' %></h1>
@@ -23,7 +23,7 @@
 
   <hr />
 
-  <div class="row minor_top_spacing">
+  <div class="row minor-top-spacing">
     <div class="span8">
       <h2><%= t '.this' %></h2>
     </div>
@@ -32,7 +32,7 @@
     </div>
   </div>
 
-  <div class="row minor_top_spacing">
+  <div class="row minor-top-spacing">
     <div class="span8">
       <%= image_tag "network-distributed.png", alt: t('.distributed_network') %>
     </div>
@@ -41,7 +41,7 @@
     </div>
   </div>
 
-  <div class="row minor_top_spacing">
+  <div class="row minor-top-spacing">
     <div class="span8">
       <p><%= t '.this_ex' %></p>
     </div>
@@ -56,7 +56,7 @@
   </div>
 
 
-  <div class="page-header top_spacing">
+  <div class="page-header top-spacing">
     <h1><%= t '.connect' %><br /></h1>
     <p><%= t '.connect_ex' %></p>
   </div>
@@ -78,7 +78,7 @@
     </div>
   </div>
 
-  <div id="freedom" class="page-header top_spacing">
+  <div id="freedom" class="page-header top-spacing">
     <h1><%= t '.freedom' %>
       <small><%= t '.freedom_byline' %></small>
     </h1>
@@ -101,7 +101,7 @@
     </div>
   </div>
 
-  <div id="privacy" class="page-header top_spacing">
+  <div id="privacy" class="page-header top-spacing">
     <h1>
       <%= t '.privacy' %>
       <small><%= t '.privacy_byline' %></small>
@@ -128,7 +128,7 @@
     </div>
   </div>
 
-  <div id="aspects" class="page-header top_spacing">
+  <div id="aspects" class="page-header top-spacing">
     <h1>
       <%= t '.aspects' %>
       <small><%= t '.aspects_byline' %></small>
@@ -154,7 +154,7 @@
     </div>
   </div>
 
-  <div id="features" class="page-header top_spacing">
+  <div id="features" class="page-header top-spacing">
     <h1>
       <%= t '.features' %>
       <small><%= t '.features_byline' %></small>
@@ -189,14 +189,14 @@
     </div>
   </div>
 
-  <div id="host" class="page-header top_spacing">
+  <div id="host" class="page-header top-spacing">
     <h1>
       <%= t '.host' %>
       <small><%= t '.host_byline' %></small>
     </h1>
   </div>
 
-  <div class="row minor_top_spacing">
+  <div class="row minor-top-spacing">
     <div class="span7">
       <%= image_tag "network-distributed.png", alt: t('.distributed_network'), size: "400x161" %>
     </div>

diff --git a/app/views/pages/formatting.html.erb b/app/views/pages/formatting.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/get_involved.html.erb b/app/views/pages/get_involved.html.erb
@@ -11,16 +11,16 @@
 </div>
 
 <div class="container">
-  <div class="page-header minor_top_spacing">
+  <div class="page-header minor-top-spacing">
     <h1>
       <%= t '.community' %>
       <small><%= t '.community_byline' %></small>
     </h1>
   </div>
   <div class="row">
     <div class="span4">
-      <%= image_tag "agpl_logo.jpg", alt: "AGPL logo", size: "200x83", class: "minor_top_spacing" %>
-      <%= image_tag "osi_standard_logo.png", alt: "Osi_standard_logo", size: "166x190", class: "minor_top_spacing" %>
+      <%= image_tag "agpl_logo.jpg", alt: "AGPL logo", size: "200x83", class: "minor-top-spacing" %>
+      <%= image_tag "osi_standard_logo.png", alt: "Osi_standard_logo", size: "166x190", class: "minor-top-spacing" %>
     </div>
     <div class="span12">
       <h4><%= t '.meaning' %></h4>
@@ -34,7 +34,7 @@
     </div>
   </div>
 
-  <div id="ways_to_help" class="page-header top_spacing">
+  <div id="ways_to_help" class="page-header top-spacing">
     <h1><%= t '.gi_header' %></h1>
   </div>
   <div class="row" id="code">

diff --git a/app/views/pages/getting_started1.html.erb b/app/views/pages/getting_started1.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started2.html.erb b/app/views/pages/getting_started2.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started3.html.erb b/app/views/pages/getting_started3.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started4.html.erb b/app/views/pages/getting_started4.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started5.html.erb b/app/views/pages/getting_started5.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started6.html.erb b/app/views/pages/getting_started6.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">       

diff --git a/app/views/pages/getting_started7.html.erb b/app/views/pages/getting_started7.html.erb
@@ -9,7 +9,7 @@
 </div>
 
 <div class="container">
-  <div class="row top_spacing">
+  <div class="row top-spacing">
     <div class="span2">&nbsp;
     </div>
     <div class="span12">