From 1aa4ab6d8c6bb4ef87aea398e148f88767865537 2019-06-09 22:08:26
From: Christopher Neugebauer <_@chrisjrn.com>
Date: 2019-06-09 22:08:26
Subject: [PATCH] WIP Homepage

---

diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html
index be02d2ce8d2db2422e57ae5413f05bbb42703d0e..410ca6a7ff936a9e99243eefd5386509c84df9d8 100644
--- a/pinaxcon/templates/_footer.html
+++ b/pinaxcon/templates/_footer.html
@@ -2,7 +2,7 @@
 {% load sponsorship_tags %}
 <div class="row">
 
-  <div class="logo">
+  <div class="logo small right">
     <div class="circle">
       <div class="fill" style="background-image: url('{% static "images/logo.svg" %}');"></div>
     </div>
diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html
index 9a23ab2181bac08068a4f4049b2056c01b1925bb..6452c21ea8333c17390bdbd9f51d9b0c06f3517b 100644
--- a/pinaxcon/templates/static_pages/homepage.html
+++ b/pinaxcon/templates/static_pages/homepage.html
@@ -17,13 +17,22 @@
 
 
     <div class="homepage-block-bg hphbg"></div>
-    <div class="container homepage-block-content-cloud">
+
+    <div class="container homepage-block-content-cloudsep">
+      <div class="row">
+      <div class="logo large left" style="margin: 20px;">
+        <div class="circle">
+          <div class="fill" style="background-image: url('{% static "images/logo.svg" %}');"></div>
+        </div>
+      </div>
       <h1 class="homepage-title">North Bay<br/>
         Python</h1>
+
+      </div>
       <h2 class="homepage-subtitle">
-        <span class="wrap-break">A one-track Python conference, north of the Golden Gate.</span>
+        <span class="wrap-break">A one-track Python conference,</span> <span class="wrap-break">north of the Golden Gate.</span><br/>
         <span class="wrap-break">November 2 &amp; 3, 2019.</span>
-        <span class="wrap-break">Mystic Theatre, Petaluma, California</span>
+        <span class="wrap-break">Mystic Theatre, Petaluma, California.</span>
       </h2>
     </div>
 
@@ -31,11 +40,15 @@
       <div class="grey-gradient"></div>
       <div class="clouds main"></div>
     </div>
-
-  <div class="container homepage-block-footer">
-    <p>Talk proposal submissions now upon until August 8th.<br />
-      Submit your proposal now!</p>
   </div>
+
+  <div class="jumbotron homepage-block dark shallow">
+
+      <div class="container homepage-block-footer">
+        <p>Talk proposal submissions now upon until August 8th.<br />
+          Submit your proposal now!</p>
+      </div>
+
   </div>
 
   <div class="jumbotron homepage-block white">
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index b5d95684f3151f17815c9c51f3b6b6daf785db9e..d958cd13017b55c34d9dc6459db096d08e9defe7 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -132,6 +132,12 @@ $homepage-block-min-height: 480px;
   box-shadow: $box-shadow;
   z-index: 3;
 
+  &.shallow {
+    min-height: 0px;
+    padding-top: 12px;
+    padding-bottom: 12px
+  }
+
   .sponsor {
     $sponsor-height: 150px;
     @include make-xs-column(6);
@@ -191,12 +197,12 @@ $homepage-block-min-height: 480px;
 
 
 .homepage-block-content-cloudsep {
-  min-height: ($homepage-block-min-height - 200px);
+  min-height: ($homepage-block-min-height - 20px);
 }
 
 
 .homepage-block-bloop {
-  min-height: 120px;
+  min-height: 20px;
 }
 
 
@@ -475,14 +481,38 @@ span.date {
 }
 
 .logo {
-  float: right !important;
-  width: 80px;
-  height: 80px;
-  margin: 0 1em 2em 2em;
 
-  .circle {
+  &.left {
+    float: left !important;
+  }
+
+  &.right {
+    float: right !important;
+  }
+
+  &.small {
     width: 80px;
     height: 80px;
+    margin: 0 1em 2em 2em;
+
+    .circle {
+      width: 80px;
+      height: 80px;
+    }
+  }
+
+  &.large {
+
+    $sz: $jumbotron-heading-font-size * 2;
+
+    width: $sz;
+    height: $sz;
+
+    .circle {
+      width: $sz;
+      height: $sz;
+    }
+
   }
 }
 
@@ -535,6 +565,7 @@ footer .footer-copy {
 }
 
 .homepage-title {
+  font-size: $font-size-h1;
   font-weight: 600;
 }