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

@@ ... / @@ -8,3 +8,3 @@ @@
             "end_date": "2040-01-04",
-            "title": "PyconAU 2017"
+            "title": "PyCon AU 2017"
+        }

pinaxcon/templates/site_base.html

➞

Show inline comments

...		@@ -29,3 +29,3 @@

		<link rel="icon" href="{% static '~~pycon2017~~/images/favicon.~~ico~~' %}"
		<link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"

static/src/pyconau2017/css/app.css

➞

Show inline comments

@@ ... / @@ -631,19 +631,5 @@ body { @@
 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;

static/src/pyconau2017/images/favicon.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

0 comments (0 inline, 0 general)