symposion_app Changeset - 448aa7255869

Changeset - 448aa7255869

Parent rev.

Child rev.

[Not reviewed]

0 4 2

Nick Seidenman (N6) - 8 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 %}
     {% block footer_base %}
       <!-- https://gist.github.com/geedmo/5682742-->
       <!-- footer class="l-footer l-footer__alt" -->
         {% block footer %}
         {% endblock %}
       </footer>
     {% endblock %}
     {% block scripts %}
       {% block extra_script %}
       {% endblock %}
     {% endblock %}
     {% block extra_body_base %}
       {% block analytics %}
 	     {% include "analytics.html" %}
       {% endblock %}
       {% block extra_body %}
       {% endblock %}
     {% endblock %}
   </body>
 </html>

static/src/pyconau2017/css/app.css

➞

Show inline comments

@@ ... / @@ -248,785 +248,771 @@ a:hover { @@
 h1 {
   font-size: 2em;
   margin: 0.67em 0;
+}
 /**
  * Address styling not present in IE 8/9, Safari 5, and Chrome.
  */
 abbr[title] {
   border-bottom: 1px dotted;
+}
 /**
  * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
  */
 b,
 strong {
   font-weight: bold;
+}
 /**
  * Address styling not present in Safari 5 and Chrome.
  */
 dfn {
   font-style: italic;
+}
 /**
  * Address differences between Firefox and other browsers.
  */
 hr {
   box-sizing: content-box;
   height: 0;
+}
 /**
  * Address styling not present in IE 8/9.
  */
 mark {
   background: #ff0;
   color: #000;
+}
 /**
  * Correct font family set oddly in Safari 5 and Chrome.
  */
 code,
 kbd,
 pre,
 samp {
   font-family: monospace, serif;
   font-size: 1em;
+}
 /**
  * Improve readability of pre-formatted text in all browsers.
  */
 pre {
   white-space: pre-wrap;
+}
 /**
  * Set consistent quote types.
  */
 q {
   quotes: "\201C" "\201D" "\2018" "\2019";
+}
 /**
  * Address inconsistent and variable font size in all browsers.
  */
 small {
   font-size: 80%;
+}
 /**
  * Prevent `sub` and `sup` affecting `line-height` in all browsers.
  */
 sub,
 sup {
   font-size: 75%;
   line-height: 0;
   position: relative;
   vertical-align: baseline;
+}
 sup {
   top: -0.5em;
+}
 sub {
   bottom: -0.25em;
+}
 /* ==========================================================================
    Embedded content
    ========================================================================== */
 /**
  * Remove border when inside `a` element in IE 8/9.
  */
 img {
   border: 0;
+}
 /**
  * Correct overflow displayed oddly in IE 9.
  */
 svg:not(:root) {
   overflow: hidden;
+}
 /* ==========================================================================
    Figures
    ========================================================================== */
 /**
  * Address margin not present in IE 8/9 and Safari 5.
  */
 figure {
   margin: 0;
+}
 /* ==========================================================================
    Forms
    ========================================================================== */
 /**
  * Define consistent border, margin, and padding.
  */
 fieldset {
   border: 1px solid #c0c0c0;
   margin: 0 2px;
   padding: 0.35em 0.625em 0.75em;
+}
 /**
  * 1. Correct `color` not being inherited in IE 8/9.
  * 2. Remove padding so people aren't caught out if they zero out fieldsets.
  */
 legend {
   border: 0;
   /* 1 */
   padding: 0;
   /* 2 */
+}
 /**
  * 1. Correct font family not being inherited in all browsers.
  * 2. Correct font size not being inherited in all browsers.
  * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
  */
 button,
 input,
 select,
 textarea {
   font-family: inherit;
   /* 1 */
   font-size: 100%;
   /* 2 */
   margin: 0;
   /* 3 */
+}
 /**
  * Address Firefox 4+ setting `line-height` on `input` using `!important` in
  * the UA stylesheet.
  */
 button,
 input {
   line-height: normal;
+}
 /**
  * Address inconsistent `text-transform` inheritance for `button` and `select`.
  * All other form control elements do not inherit `text-transform` values.
  * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
  * Correct `select` style inheritance in Firefox 4+ and Opera.
  */
 button,
 select {
   text-transform: none;
+}
 /**
  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
  *    and `video` controls.
  * 2. Correct inability to style clickable `input` types in iOS.
  * 3. Improve usability and consistency of cursor style between image-type
  *    `input` and others.
  */
 button,
 html input[type="button"],
 input[type="reset"],
 input[type="submit"] {
   -webkit-appearance: button;
   /* 2 */
   cursor: pointer;
   /* 3 */
+}
 /**
  * Re-set default cursor for disabled elements.
  */
 button[disabled],
 html input[disabled] {
   cursor: default;
+}
 /**
  * 1. Address box sizing set to `content-box` in IE 8/9.
  * 2. Remove excess padding in IE 8/9.
  */
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   /* 1 */
   padding: 0;
   /* 2 */
+}
 /**
  * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
  * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
  *    (include `-moz` to future-proof).
  */
 input[type="search"] {
   -webkit-appearance: textfield;
   /* 1 */
   /* 2 */
   box-sizing: content-box;
+}
 /**
  * Remove inner padding and search cancel button in Safari 5 and Chrome
  * on OS X.
  */
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
+}
 /**
  * Remove inner padding and border in Firefox 4+.
  */
 button::-moz-focus-inner,
 input::-moz-focus-inner {
   border: 0;
   padding: 0;
+}
 /**
  * 1. Remove default vertical scrollbar in IE 8/9.
  * 2. Improve readability and alignment in all browsers.
  */
 textarea {
   overflow: auto;
   /* 1 */
   vertical-align: top;
   /* 2 */
+}
 /* ==========================================================================
    Tables
    ========================================================================== */
 /**
  * Remove most spacing between table cells.
  */
 table {
   border-collapse: collapse;
   border-spacing: 0;
   margin-top: 1em;
   margin-bottom: 1em;
+}
 /* ==========================================================================
    Custom Defaults
    ========================================================================== */
 *,
 *:before,
 *:after {
   box-sizing: border-box;
+}
 .form-field {
   border: 1px solid #3ab1c9;
+}
 .form-field input[type='text'], .form-field input[type='tel'], .form-field input[type='number'], .form-field input[type='password'], .form-field input[type='email'], textarea {
   color: #0c486c;
   padding: 10px;
   width: 100%;
   border: 0;
+}
 .form-field input[type='text']:focus::-webkit-input-placeholder, .form-field input[type='tel']:focus::-webkit-input-placeholder, .form-field input[type='number']:focus::-webkit-input-placeholder, .form-field input[type='password']:focus::-webkit-input-placeholder, .form-field input[type='email']:focus::-webkit-input-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus::-moz-placeholder, .form-field input[type='tel']:focus::-moz-placeholder, .form-field input[type='number']:focus::-moz-placeholder, .form-field input[type='password']:focus::-moz-placeholder, .form-field input[type='email']:focus::-moz-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus:-ms-input-placeholder, .form-field input[type='tel']:focus:-ms-input-placeholder, .form-field input[type='number']:focus:-ms-input-placeholder, .form-field input[type='password']:focus:-ms-input-placeholder, .form-field input[type='email']:focus:-ms-input-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus::placeholder, .form-field input[type='tel']:focus::placeholder, .form-field input[type='number']:focus::placeholder, .form-field input[type='password']:focus::placeholder, .form-field input[type='email']:focus::placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']::-webkit-input-placeholder, .form-field input[type='tel']::-webkit-input-placeholder, .form-field input[type='number']::-webkit-input-placeholder, .form-field input[type='password']::-webkit-input-placeholder, .form-field input[type='email']::-webkit-input-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']::-moz-placeholder, .form-field input[type='tel']::-moz-placeholder, .form-field input[type='number']::-moz-placeholder, .form-field input[type='password']::-moz-placeholder, .form-field input[type='email']::-moz-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']:-ms-input-placeholder, .form-field input[type='tel']:-ms-input-placeholder, .form-field input[type='number']:-ms-input-placeholder, .form-field input[type='password']:-ms-input-placeholder, .form-field input[type='email']:-ms-input-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']::placeholder, .form-field input[type='tel']::placeholder, .form-field input[type='number']::placeholder, .form-field input[type='password']::placeholder, .form-field input[type='email']::placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field + .form-field {
   margin-top: 20px;
   margin-top: 1.25rem;
+}
 body {
   font-size: 16px;
   font-family: "Roboto", sans-serif;
   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;
+}
 table th:not(:first-of-type), table td:not(:first-of-type) {
   border-left: 1px solid #0c486c;
+}
 table tr:not(:last-of-type) {
   border-bottom: 1px solid #0c486c;
+}
 table.alt th {
   font-family: "Titillium Web", sans-serif;
   font-weight: 900;
   text-transform: uppercase;
+}
 table.alt th, table.alt td {
   padding: 10px;
   padding: 0.625rem;
   text-align: left;
+}
 table.alt th:not(:first-of-type), table.alt td:not(:first-of-type) {
   border-left: 1px solid #3ab1c9;
+}
 table.alt tr:not(:last-of-type) {
   border-bottom: 1px solid #3ab1c9;
+}
 /*
 * Hide only visually, but have it available for screen readers: h5bp.com/v
 */
 .visuallyhidden {
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
   margin: -1px;
   overflow: hidden;
   padding: 0 !important;
   position: absolute !important;
   width: 1px;
+}
 .visuallyhidden.focusable:active, .visuallyhidden.focusable:focus {
   clip: auto;
   height: auto;
   margin: 0;
   overflow: visible;
   position: static;
   width: auto;
+}
 .btn {
   display: inline-block;
   background: transparent;
   color: #0c486c;
   text-decoration: none;
   border: 1px solid #3ab1c9;
   padding: 10px 20px;
   padding: 0.625rem 1.25rem;
   border-radius: 0.625rem;
   transition: all 300ms ease-in-out;
   line-height: normal;
+}
 .btn:hover, .btn:focus, .btn:active {
   color: #3ab1c9;
   border-color: #3ab1c9;
   cursor: pointer;
+}
 .btn__white {
   color: white;
   border-color: white;
+}
 .btn__white:hover {
   background-color: white;
   border-color: white;
   color: #0c486c;
+}
 @media (min-width: 48em) {
   .btn {
     border: 3px solid #0c486c;
+  }
   .btn__white {
     border-color: white;
+  }
+}
 @media (min-width: 64em) {
   .btn {
     padding: 0.625rem 2.5rem;
+  }
+}
 .btn__compact {
   padding: 0.625rem 1.25rem;
   border: 1px solid #3ab1c9;
+}
 .btn__active {
   border: solid #3ab1c9;
+}
 .btn-group {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-align: center;
   align-items: center;
+}
 .btn-group > .btn,
 .btn-group > .btn-svg {
   display: inline-block;
   margin-right: 20px;
   margin-right: 1.25rem;
+}
 .btn-svg {
   width: 2em;
   height: 2em;
   position: relative;
   border-bottom: 0;
   display: block;
+}
 .btn-svg > svg {
   position: absolute;
   left: 0;
   top: 0;
   height: 100%;
   width: 100%;
+}
 .btn-svg__alt {
   color: #3ab1c9;
+}
 .btn-svg__alt:hover {
   color: #0c486c;
+}
 .select {
   position: relative;
+}
 .select select {
   outline: 0;
   border: 0;
   width: 100%;
   background-color: white;
   color: #0c486c;
   padding: 10px;
   padding-right: 35px;
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
+}
 .select select:active {
   background-color: whitesmoke;
+}
 .select select::-ms-expand {
   display: none;
+}
 .select:after {
   content: ' ';
   display: block;
   position: absolute;
   border-right: 1px solid #3ab1c9;
   border-bottom: 1px solid #3ab1c9;
   right: 15px;
   top: 9px;
   width: 15px;
   height: 15px;
   transform: rotate(45deg);
+}
 .boolean-group {
   border: 0;
   list-style: none;
   margin-bottom: 0;
+}
 .boolean-group--row {
   display: block;
+}
 .boolean-group--row + .boolean-group--row {
   margin-top: 6.666px;
   margin-top: 0.41667rem;
+}
 .boolean-group--row > label {
   position: relative;
   padding-left: 17px;
   display: block;
   vertical-align: top;
+}
 .boolean-group--row > label:before {
   content: '';
   width: 12px;
   height: 12px;
   display: block;
   position: absolute;
   border: 1px solid #3ab1c9;
   top: calc(50% - 12px / 2);
   left: 0;
+}
 .boolean-group--row > label:after {
   transition: all 300ms ease-in-out;
   background-color: #0c486c;
   content: '';
   display: block;
   position: absolute;
   width: 0;
   height: 0;
   left: 6px;
   top: calc(50% - 12px / 2 + 4px * 1.5);
+}
 .boolean-group--row > input {
   display: none;
+}
 .boolean-group--row > input:checked ~ label:after {
   width: calc(12px - 4px);
   height: calc(12px - 4px);
   left: 2px;
   top: calc(50% - 12px / 2 + (4px / 2));
+}
 .boolean-group--row > input[type="radio"] ~ label:before, .boolean-group--row > input[type="radio"] ~ label:after {
   border-radius: 100%;
+}
 .panel {
   padding: 40px 0;
   padding: 2.5rem 0;
   /*
 	*	Tabbed panel styles
 	*/
+}
 .panel--content {
   position: relative;
   z-index: 1;
+}
 .panel--section-title {
   margin: 4px 0;
   margin: 0.25rem 0;
+}
 .panel--1-2 {
   margin: 20px 0;
   margin: 1.25rem 0;
   width: 100%;
+}
 .panel__bg {
   background-color: #0c486c;
   color: white;
   position: relative;
+}
 .panel--bg {
   position: absolute;
   opacity: 0.3;
   background-position: center;
   background-size: cover;
   background-blend-mode: multiply;
   width: 100%;
   height: 100%;
   top: 0;
   left: 0;
+}
 .panel--tabs {
   display: block;
+}
 .panel--tab-title {
   margin: 20px 0;
   margin: 1.25rem 0;
+}
 .panel--tab-content {
   display: none;
   -ms-flex-item-align: start;
   align-self: flex-start;
+}
 .panel--tab-content > *:first-child {
   margin-top: 0;
+}
 .panel--tab-content.is-active {
   display: block;
+}
 .panel--tab-controls {
   margin-bottom: 20px;
   margin-bottom: 1.25rem;
   display: block;
   width: 100%;
+}
 .panel--tab-controls-title {
   margin-top: 0;
+}
 .panel--tab-switch {
   margin-right: 20px;
   margin-right: 1.25rem;
   border-bottom: 0;
+}
 .panel--tab-switch:hover, .panel--tab-switch.is-active {
   cursor: pointer;
   border-bottom: 1px solid #3ab1c9;
+}
 .panel__compact {
   padding-top: 10px 0;
   padding-top: 0.625rem 0;
+}
 .panel__compact.panel__first {
   padding-top: 0 0;

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)