Tweak to Edison Talks Landing Page (craigulliott#114)

dominicbruno · Aug 2, 2012 · 5b1e384 · 5b1e384
1 parent c928751
commit 5b1e384
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/assets/stylesheets/application/speakers.css.scss b/app/assets/stylesheets/application/speakers.css.scss
@@ -111,7 +111,7 @@ body.list_edison_speakers {
 			margin:-5px auto 50px auto;
 			background:transparent asset-url('application/edison_info_bg.png', image) top center no-repeat;
 
-			> div {
+			div.info {
 				width:450px;
 				float:left;
 				padding: 55px 20px;
@@ -133,7 +133,7 @@ body.list_edison_speakers {
 
 			}
 
-			> div + div {
+			div.info + div.info {
 				text-align:left;
 				font-style:normal;
 				margin-left:15px;
@@ -154,17 +154,17 @@ body.list_edison_speakers {
 				}
 			}
 
-			p#edison_talks_application {
+			div#edison_talks_application {
 				position:absolute;
-				bottom: -40px;
+				bottom: -80px;
 				width: 100%;
 				text-align: center;
 			}
 
 		}
 
 		div#edison_speakers {
-			padding-top:15px;
+			margin-top:100px;
 			min-height:208px;
 			background:transparent asset-url('application/edison_speakers_bg.png', image) top center repeat-y;
 

diff --git a/app/views/speakers/edison.html.haml b/app/views/speakers/edison.html.haml
@@ -9,21 +9,21 @@
 
   %img{ :src => "/assets/application/edison_logo.jpg", :rel => "bookmark", :title => "", :width => "1000", :height => "350" }
   %div#edison_info
-    %div
+    %div.info
       %p Edison Talks is an invitation-only, daylong gathering of provocative presentations, performances and interactive installations led by globally recognized visionaries created to connect and inspire leaders from across the globe.
-    %div
+    %div.info
       %h2
         %p Friday, October 12th, 2012
         %p 9:00am - 6:00pm
-      %p Chicago Tribune Freedom Center,
-      %p Riverfront Theater
+      %p The Oriental Theatre
       %p 
         For questions, please contact: 
         %a{:href => "mailto:[email protected]"}
           [email protected]
 
-    %p#edison_talks_application.clearfix
-      = link_to "Interested in attending the Edison Talks? Apply here.", edison_talks_applications_path
+    %div#edison_talks_application.clearfix
+      %p= link_to "Interested in attending the Edison Talks? Apply here.", edison_talks_applications_path
+      %p More Speakers Coming Soon
 
   - if @speakers.length > 0
     %div#edison_speakers