Menu bar looking better.

pinaxcon/templates/pyconau2017/content_page.html

@@ -23,10 +23,10 @@
   {% endblock %}
 
   {% block content_base %}
-    <!--div class="l-content-page"-->
-        {% block content %}
-        {% endblock %}
-    <!--/div-->
+    <div class="l-content-page">
+                {% block content %}
+                {% endblock %}
+    </div>
   {% endblock %}
 {% endblock %}
 

pinaxcon/templates/site_base.html

@@ -26,6 +26,7 @@
       <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
       <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
       <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
+      <link href="{% static 'pyconau2017/css/pyconau2016.css' %}" rel="stylesheet">
 
       <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"
 
@@ -57,11 +58,9 @@
     {% block topbar_base %}
 
       {% block nav %}
-      {% comment %}
         {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
            <a href="#" data-menu-opener="" class="l-header--menu-opener"></a>
         {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %}
-      {% endcomment %}
       {% endblock %}
 
     {% endblock %}

static/src/pyconau2017/css/pyconau.css

@@ -27,6 +27,13 @@ body {
     margin-bottom: 60px;
 }
 
+.jumbotron-white {
+    background-color: rgba(240,240,240,0.9);
+    color: black;
+    margin-top: 60px;
+    margin-bottom: 60px;
+}
+
 @font-face {
     font-family: 'Flux Regular';
     src: url('fonts/FLUXRegular.ttf');
@@ -38,15 +45,32 @@ body {
 }
 
 #announcements {
+    /*
     background-color: rgba(0,0,0,0.9);
     color: white;
+    */
     border-radius: 6px;
     padding: 2em;
     margin-top: 60px;
     margin-bottom: 60px;
 }
+
 #announcements h2 {
     font-size: 2em;
     font-family: 'Flux Regular';
-    color: white;
+    /*color: white;*/
+}
+
+nav {
+    background-color: #000;
+    width: 100%;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 20px;
+}
+
+.l-header--nav  {
+    font-size: 1.4em;
+    font-weight: bold;
+    color: #a6e9f5;
 }

static/src/pyconau2017/css/pyconau2016.css

@@ -0,0 +1,104 @@
+body {
+  background: url(/img/mcec_mini.jpg) no-repeat center center fixed;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+}
+
+@font-face {
+    font-family: 'Flux Regular';
+    src: url('/fonts/FLUXRegular.ttf');
+}
+
+.wrapper {
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 6px;
+    padding: 1em;
+}
+
+h1,h2,h3,h4,h5 {
+    font-family: 'Flux Regular';
+}
+
+.font-flux {
+    font-family: 'Flux Regular';
+}
+
+.nav-head {
+    font-weight: bold;
+    margin-left: .5em;
+}
+
+#t-shirt td {
+    padding-right: 2em;
+}
+
+.prices th {
+    padding-right: 2em;
+}
+
+.prices td {
+    padding-right: 2em;
+}
+
+td {
+    padding-right: 1em;
+}
+
+th {
+    padding-right: 1em;
+}
+
+.mandatory {
+  color: #ff0000;
+  background: inherit;
+  margin-right: 5px;
+  float: left;
+}
+
+ul.entries {
+  list-style-type: none;
+}
+
+
+.graph-bar-sold
+{
+  background-color: #FF2233;
+  height: 20px;
+  float: left;
+}
+
+.graph-bar-available
+{
+  background-color: #BBDD99;
+  height: 20px;
+  float: left;
+}
+
+#programme td, #programme th {
+  text-align: center;
+  font-size: 13px;
+  vertical-align: middle;
+  border-right: 1px solid #ccc;
+}
+
+#programme td {
+  border-bottom: 1px solid #ccc;
+}
+
+#programme td i, #programme th i {
+  font-style: italic;
+}
+
+#programme .programme_break {
+  background-color: #ececec;
+}
+
+#programme .programme_plenary {
+  background-color: #d7dfe5;
+}
+
+#programme .multi {
+  background-color: #d2e7db;
+}