symposion_app Changeset - 448aa7255869

Changeset - 448aa7255869

Parent rev.

Child rev.

[Not reviewed]

0 4 2

Nick Seidenman (N6) - 7 years ago 2017-01-17 00:42:13
n6151h@gmail.com

Added favicon and special events pdf to bring this up to look/feel of wooden site.

Removed additional (and completely superfluous) styling in app.css that was otherwise making
our site look gluggy.

Mod'd fixtures (and updated db) to reflect PyCon rather than PinaxCon.

6 files changed with 5 insertions and 19 deletions:

fixtures/conference.json

fixtures/sites.json

pinaxcon/templates/site_base.html

static/src/pyconau2017/css/app.css

static/src/pyconau2017/images/favicon.png

bin+new file

static/src/pyconau2017/special-events-2017.pdf

bin+new file

0 comments (0 inline, 0 general)

fixtures/conference.json

➞

Show inline comments

+[
+    {
         "pk": 1,
         "model": "symposion_conference.conference",
         "fields": {
             "timezone": "US/Eastern",
             "start_date": "2040-01-01",
             "end_date": "2040-01-04",
-            "title": "PinaxCon"
+            "title": "PyCon AU 2017"
+        }
     },
+    {
         "pk": 1,
         "model": "symposion_conference.section",
         "fields": {
             "conference": 1,
             "start_date": "2040-01-01",
             "name": "General Sessions",
             "end_date": "2040-01-01",
             "slug": "general-sessions"
+        }
+    }
+]

fixtures/sites.json

➞

Show inline comments

+[
+    {
         "pk": 1,
         "model": "sites.site",
         "fields": {
             "domain": "localhost:8000",
-            "name": "PinaxCon"
+            "name": "PyCon AU 2017 Dev"
+        }
     },
+    {
         "pk": 2,
         "model": "sites.site",
         "fields": {
             "domain": "conference.pinaxproject.com",
-            "name": "PinaxCon"
+            "name": "PyCon AU 2017 Dev"
+        }
+    }
+]

pinaxcon/templates/site_base.html

➞

Show inline comments

 {% load staticfiles %}
 {% load metron_tags %}
 {% load i18n %}
 {% load sitetree %}
 {# <!-- https://gist.github.com/geedmo/5682742--> #}
 <!DOCTYPE html>
 <html lang="en" class="no-js">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="description" content="">
     <!-- disable browser cache (for now) -->
     <meta http-equiv="cache-control" content="max-age=0" />
     <meta http-equiv="cache-control" content="no-cache" />
     <meta http-equiv="expires" content="0" />
     <meta http-equiv="expires" content="Tue, 01 Jan 1990 12:00:00 GMT" />
     {% block viewport %}
       <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     {% endblock %}
     <title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
     {% block styles %}
       <link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
       <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 rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
+      <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"
       <!--Meta tags-->
       <meta name="theme-color" content="#0c486c">
     {% endblock %}
     <!--Twitter-->
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@pyconau2017">
     <meta name="twitter:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria"
     <meta name="twitter:description"content="Discover the future of Open Source at linux.conf.au 2017. Tickets on sale from October.">
     <meta name="twitter:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'pyconau2017/images/socmed/twitter-tuz.png' %}">
     <meta name="twitter:image:alt" content="Tuz">
     <!--Open Graph-->
     <meta property="og:url" content="https://2017.pycon-au.org/">
     <meta property="og:title" content="Pycon AU – 3 - 8  2017 – Melbourne, Victoria">
     <meta property="og:description" content="Discover Python at Pycon AU 2017. Tickets on sale from February.">
     <meta property="og:type" content="website">
     <meta property="fb:admins" content="729577430">
     <meta property="fb:profile_id" content="293907417664731">
     {% block extra_head_base %}
         {% block extra_head %}{% endblock %}
     {% endblock %}
   </head>
   <body class="{% block body_class %}{% endblock %}"
       style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage.jpg' %});">
     {% 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 %}
     {% block body_base %}
       <!--div style="height: 100px;" /-->
         <!--main role="main"-->
         {% block body %}
           {% block content %}
           {% endblock %}
         {% endblock %}
         <!--/main-->
       <!--/div-->
     {% endblock %}

static/src/pyconau2017/css/app.css

➞

Show inline comments

@@ ... / @@ -584,113 +584,99 @@ body { @@
   line-height: 1.4;
   color: #0c486c;
   font-size: 4vw;
+}
 @media (min-width: 25em) {
   body {
     font-size: 2.2vw;
+  }
+}
 @media (min-width: 64em) {
   body {
     font-size: 2vw;
+  }
+}
 @media (min-width: 80em) {
   body {
     font-size: 28px;
+  }
+}
 .lede {
   margin: 30px 0;
   margin: 1.875rem 0;
   font-size: 4.2vw;
+}
 @media (min-width: 25em) {
   .lede {
     font-size: 3vw;
+  }
+}
 @media (min-width: 64em) {
   .lede {
     font-size: 2vw;
     margin: 3.375rem 0;
+  }
+}
 @media (min-width: 80em) {
   .lede {
     font-size: 28px;
+  }
+}
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
   font-family: "Titillium Web", sans-serif;
   font-weight: 900;
   text-transform: uppercase;
   margin: 0;
   line-height: 0.9;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+}
 a {
-  color: inherit;
+  color: #337ab7;
   text-decoration: none;
   border-bottom: 1px solid #3ab1c9;
   transition: color 300ms;
+}
 a:hover, a:focus, a:active {
   color: #3ab1c9;
+}
 ul,
 ol {
   padding: 0;
   /* margin: 0; */
+}
 ul > li,
 ol > li {
   list-style-position: outside;
   margin-left: 1em;
+}
 blockquote {
   margin-left: 0;
   padding-left: 20px;
   padding-left: 1.25rem;
   font-style: italic;
   border-left: 1px solid #3ab1c9;
+}
 table th {
   font-family: "Titillium Web", sans-serif;
   font-weight: 900;
   text-transform: uppercase;
+}
 .track-name {
   margin-top: 0;
   margin-bottom: 0;
   font-weight: bold;
   text-transform: none;
+}
 table th, table td {
   padding: 10px;
   padding: 0.625rem;
   text-align: left;
+}

static/src/pyconau2017/images/favicon.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

static/src/pyconau2017/special-events-2017.pdf

➞

Show inline comments

		new file 100644
		binary diff not shown

0 comments (0 inline, 0 general)