From 287c982f0c872cc17c46bc2cb71857cda9696a72 Mon Sep 17 00:00:00 2001
From: Aaron Wiggins <apw7177@gmail.com>
Date: Thu, 23 Jul 2015 11:18:01 -0400
Subject: [PATCH 1/2] change title of concept tree page

---
 app/assets/stylesheets/concepts.scss     | 7 +++----
 app/views/concepts/concept_tree.html.erb | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/concepts.scss b/app/assets/stylesheets/concepts.scss
index fafa488..e752db6 100644
--- a/app/assets/stylesheets/concepts.scss
+++ b/app/assets/stylesheets/concepts.scss
@@ -105,11 +105,10 @@
 	width: 80%;
 	margin: 0.5em auto;
 	padding: 0.5em;
-	font-size: 1em;
+	font-size: 2em;
 	line-height: 1.6em;
-	background-color: #F9F9F9;
-	border: 0.1em solid #323232;
-	border-radius:5px;
+	border-radius: 5px;
+	text-align: center;
 }
 
 
diff --git a/app/views/concepts/concept_tree.html.erb b/app/views/concepts/concept_tree.html.erb
index 768ce25..1d27e01 100644
--- a/app/views/concepts/concept_tree.html.erb
+++ b/app/views/concepts/concept_tree.html.erb
@@ -26,7 +26,7 @@ $(function() {
 </script>
 
 <div class="concept-tree-description">
-  This Concept Tree connects one concept to the next based on approximate complexity. Experiments at the top of the tree are the most appropriate for younger kids, while the ones at the bottom of the tree are more geared toward older children. With that said, we firmly believe, with the help of an adult, every experiment here can enrich a child of any age.
+  Concepts ordered from least to most complex
 </div>
 
 <span class="container">

From 13e42d93008b1aff36ef299912f2d516c505ffef Mon Sep 17 00:00:00 2001
From: Aaron Wiggins <apw7177@gmail.com>
Date: Thu, 23 Jul 2015 11:50:16 -0400
Subject: [PATCH 2/2] fix landing page positioning

---
 app/assets/stylesheets/landing.scss         | 28 ++++++++++-----------
 app/views/experiments/landing_page.html.erb | 19 +++++++-------
 app/views/layouts/application.html.erb      |  2 ++
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss
index 152f027..e695d3d 100644
--- a/app/assets/stylesheets/landing.scss
+++ b/app/assets/stylesheets/landing.scss
@@ -3,37 +3,39 @@
 #landing {
   /*position: relative;*/
   z-index: 1;
-  padding: 3.5em;
 }
 
 #bg {
-  background-image: image-url("discovery-crop.jpg");
   width: 100%;
+  min-height: 50vh;
+  position: relative;
+  padding: 5% 2em;
+}
+
+#bg:before {
+  background-image: image-url("discovery-crop.jpg");
+  background-position: bottom left;
   background-size: cover;
-  height: 102vh;
-  margin-top: -14.5em;
   opacity: 0.2;
-  position: fixed;
+  content: ' ';
+  position: absolute;
   top: 0;
-  bottom: 0;
   left: 0;
   right: 0;
-  z-index: -5;
+  bottom: 0;
+  z-index: -1;
 }
 
 /*hero text*/
 
 .landing-intro {
-  margin: 1em auto;
-  width: 100%;
+  text-align: center;
 }
 
 .landing-logo {
   padding-top: 0.5em;
   font-family: 'Chelsea Market', sans-serif;
   font-size: 5.5em;
-  margin: 0 auto;
-  width: 32%;
   color: #323232;
 }
 
@@ -42,7 +44,6 @@
   color: #323232;
   margin: 0.2em auto;
   font-size: 2em;
-  width: 17%;
   font-weight: bold;
 }
 
@@ -50,6 +51,7 @@
   margin: 1em auto;
   width: 25em;
   position: relative;
+  display: inline-block;
 }
 
 #landing-search-form {
@@ -87,8 +89,6 @@
   background-color: #F2F3F4;
   border: 1px solid #D6D6D6;
   clear: both;
-  margin-top: 12em;
-  position: fixed;
 }
 
 .suggested-container {
diff --git a/app/views/experiments/landing_page.html.erb b/app/views/experiments/landing_page.html.erb
index 0273fbc..722122a 100644
--- a/app/views/experiments/landing_page.html.erb
+++ b/app/views/experiments/landing_page.html.erb
@@ -1,14 +1,15 @@
 <div id="landing">
-  <div id="bg"></div>
-  <div class="landing-intro">
-  	<h1 class="landing-logo">stempirical</h1>
+  <div id="bg">
+    <div class="landing-intro">
+    	<h1 class="landing-logo">stempirical</h1>
 
-  	<p class="stempirical-tagline">share the wonder</p>
-    <div class="landing-search">
-      <%= form_tag experiments_path, :method => "get", id: "landing-search-form" do %>
-        <%= text_field_tag "query", params[:query], placeholder: "Search Experiments", class: "landing-exp-search" %>
-        <button class="fa fa-search landing-fa-search"></button>
-      <% end %>
+    	<p class="stempirical-tagline">share the wonder</p>
+      <div class="landing-search">
+        <%= form_tag experiments_path, :method => "get", id: "landing-search-form" do %>
+          <%= text_field_tag "query", params[:query], placeholder: "Search Experiments", class: "landing-exp-search" %>
+          <button class="fa fa-search landing-fa-search"></button>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5954191..9af26f5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,10 +36,12 @@
 </header>
 
 <div class="main-content">
+  <% if notice || alert %>
   <div class="messages">
     <p class="notice"><%= notice %></p>
     <p class="alert"><%= alert %></p>
   </div>
+  <% end %>
 <%= yield %></div>
 </body>
 </html>