symposion_app Changeset - 5f7e5ee1bd82

Changeset - 5f7e5ee1bd82

Parent rev.

Child rev.

[Not reviewed]

Merge

0 7 1

Nick Seidenman (N6) - 7 years ago 2017-01-17 01:03:16
n6151h@gmail.com

Merge branch 'master' into prod

Conflicts:
fixtures/conference.json
fixtures/sites.json

4 files changed with 3 insertions and 17 deletions:

fixtures/conference.json

pinaxcon/templates/site_base.html

static/src/pyconau2017/css/app.css

static/src/pyconau2017/images/favicon.png

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": "PyconAU 2017"
+            "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"
+        }
+    }
+]

pinaxcon/templates/site_base.html

➞

Show inline comments

@@ ... / @@ -6,49 +6,49 @@ @@
 <!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>

static/src/pyconau2017/css/app.css

➞

Show inline comments

@@ ... / @@ -608,65 +608,51 @@ body { @@
   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;

static/src/pyconau2017/images/favicon.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

0 comments (0 inline, 0 general)