Add 2015 styling for conf announcements

writethedocs · Jan 15, 2015 · 53b25e7 · 53b25e7
1 parent ab95533
commit 53b25e7
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 15 deletions.
diff --git a/docs/blog/announcing-2015.md b/docs/blog/announcing-2015.md
@@ -1,3 +1,5 @@
+template: blog.2015.html
+
 # Announcing Write the Docs NA 2015
 
 We are excited to announce the dates for the 2015 conference!

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -3,6 +3,7 @@ theme_dir: theme
 pages:
   - ['index.md', 'Write the Docs']
   - ['code-of-conduct.md', 'Code of Conduct']
+  - ['blog/announcing-2015.md', 'Announcing Write the Docs 2015 NA']
   - ['conf/index.md', 'Conferences']
   - ['conf/na/2015.md', 'Conferences', 'North America 2015']
   - ['meetups.md', 'Meetups']
diff --git a/theme/blog.2015.html b/theme/blog.2015.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block head_link %}
+  {{ super() }}
+  <link href="{{ base_url }}/css/2015.main.css" rel="stylesheet" />
+{% endblock %}
+
+{% block container %}
+  <div class="hero hero-blog">
+    <div class="container">
+      <div class="row row-logo">
+        <a href="/conf/na/2015/">
+          <img src="{{ base_url }}/img/2015/email-logo.png" />
+        </a>
+      </div>
+      <div class="row row-nav">
+        <div class="hero-nav col-md-8 col-md-offset-2 col-sm-12">
+          <ul class="nav nav-pills nav-center">
+            <li class="highlight"><a href="/conf/na/2015/">Learn about the conference</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1 col-content">
+        {% include "content.html" %}
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/theme/conf.2015.html b/theme/conf.2015.html
@@ -6,9 +6,15 @@
 {% endblock %}
 
 {% block container %}
-  <div class="hero">
+  <div class="hero hero-conf">
     <div class="container">
-      <div class="row row-logo"></div>
+      <div class="row row-logo">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 col-sm-12">
+          <a href="/conf/na/2015/">
+            <img src="{{ base_url }}/img/2015/site-logo.png" />
+          </a>
+        </div>
+      </div>
       <div class="row row-nav">
         <div class="hero-nav col-md-8 col-md-offset-2 col-sm-12">
           <ul class="nav nav-pills nav-center">

diff --git a/theme/css/2015.main.css b/theme/css/2015.main.css
@@ -16,21 +16,12 @@ div.hero {
     color: #f2f0eb;
 }
 
-div.hero div.row.row-logo {
-    height: 350px;
-    padding: 50px 0px 25px 0px;
-    background-image: url('../img/2015/site-logo.png');
-    background-repeat: no-repeat;
-    background-size: contain;
-    background-position: center;
+div.hero div.row.row-logo img {
+    width: 100%;
 }
 
-@media (min-width: 768px) {
-    div.hero div.row.row-logo {
-        height: 475px;
-        background-size: 750px 400px;
-        background-position: center 50px;
-    }
+div.hero.hero-conf div.row.row-logo {
+    padding: 1em;
 }
 
 div.hero-nav {