From 76c4029e3f8c70d7f722231a8653639c667e4fe8 2018-06-29 22:18:01 From: Christopher Neugebauer Date: 2018-06-29 22:18:01 Subject: [PATCH] Initial 2018ification --- diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 73ebf60264603a45958bcf976373cc511bb71f6e..be02d2ce8d2db2422e57ae5413f05bbb42703d0e 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -9,10 +9,11 @@
-

© 2017 North Bay Python, member project of Software Freedom Conservancy, a 501(c)(3) charity.

+

© 2018 North Bay Python, member project of Software Freedom Conservancy, a 501(c)(3) charity.

{% sponsors "platinum" as platinum %} + {% comment %}

We acknowledge the support of our Platinum sponsor{{ platinum|length|pluralize}}, {% for sponsor in platinum %} {% if forloop.last and not forloop.first %} @@ -21,6 +22,8 @@ {{ sponsor }}{% if forloop.last %}.{% endif %} {% endfor %} + {% endcomment %} +

Facebook | Twitter diff --git a/pinaxcon/templates/_homepage_speakers_snippet.html b/pinaxcon/templates/_homepage_speakers_snippet.html new file mode 100644 index 0000000000000000000000000000000000000000..320e1e2bd9a1278634a4a9acd11aca1fe1a2488d --- /dev/null +++ b/pinaxcon/templates/_homepage_speakers_snippet.html @@ -0,0 +1,66 @@ +

Speakers

+ +
+ +
+
+
+
+
+
+

Brandon Rhodes

+ Keynote Speaker +
+ +
+
+
+
+
+
+

Carina C. Zona

+ Keynote Speaker +
+ + {% speakers as speakers %} + {% for speaker in speakers %} +
+
+
+ {% if speaker.photo %} +
+ {% else %} +
+ {% endif %} +
+
+ {% for presentation in speaker.presentations.all %} + +

{{ speaker.conferencespeaker.name }}

+ {{ presentation.title }} + + {% endfor %} +
+ {% endfor %} + +
+
+
+
+
+
+

VM Brasseur

+ Speaker Training +
+ +
+
+ +
+
+
+
+ See the schedule +
+
+
diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index d957d4225c6b53eb49cd10d340567fad62432214..ffc66baaa55f13c422406ab7e5c8247092ef06fd 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -19,7 +19,7 @@

North Bay Python

-

A Python conference north of the Golden Gate

+

A one-track Python conference in a live music venue, north of the Golden Gate

@@ -30,8 +30,8 @@

- December 2 & 3, 2017
- Tickets on sale from $50 + November 3 & 4, 2018
+ Call for Proposals closes August 15th

-
-
-

Speakers

- -
- -
-
-
-
-
-
-

Brandon Rhodes

- Keynote Speaker -
- -
-
-
-
-
-
-

Carina C. Zona

- Keynote Speaker -
- - {% speakers as speakers %} - {% for speaker in speakers %} -
-
-
- {% if speaker.photo %} -
- {% else %} -
- {% endif %} -
-
- {% for presentation in speaker.presentations.all %} - -

{{ speaker.conferencespeaker.name }}

- {{ presentation.title }} - - {% endfor %} -
- {% endfor %} - -
-
-
-
-
-
-

VM Brasseur

- Speaker Training -
- -
-
- -
-
-
-
- See the schedule -
-
-
-
-
- -
@@ -156,10 +84,10 @@
  • An historic venue with countless restaurants and coffee shops in walking distance
  • World-famous craft food and drink producers on your doorstep
    • -
  • Charming small-town hotels, as close as one block away
    • +
  • Charming small-town hotels, as close as one block away
-

… and it's only an hour away from San Francisco (on a good day).

+

… and it's only an hour away from San Francisco (on a good day).

@@ -167,8 +95,6 @@
Learn More - Hotels - Travel
diff --git a/static/images/hills-footer.svg b/static/images/hills-footer.svg index c7e9348a14c12580cb4ec0c94239c26243ad83e2..4fb6aed4ffb85246f393acdda3679e66d07e687f 100644 --- a/static/images/hills-footer.svg +++ b/static/images/hills-footer.svg @@ -16,7 +16,7 @@ id="svg4324" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="hills-footer.svg"> + sodipodi:docname="hills-to-ground.svg"> - - diff --git a/static/images/hills.svg b/static/images/hills.svg index 8e10c7d4774f0be0a7b875c578b534b521ef7385..4fb6aed4ffb85246f393acdda3679e66d07e687f 100644 --- a/static/images/hills.svg +++ b/static/images/hills.svg @@ -201,7 +201,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.755" - inkscape:cx="123.1931" + inkscape:cx="24.902502" inkscape:cy="65.534418" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -212,7 +212,7 @@ fit-margin-bottom="0" borderlayer="true" inkscape:window-width="1440" - inkscape:window-height="803" + inkscape:window-height="806" inkscape:window-x="0" inkscape:window-y="1" inkscape:window-maximized="1" @@ -225,7 +225,7 @@ image/svg+xml - + @@ -236,7 +236,7 @@ transform="translate(224.79828,58.616302)"> @@ -314,7 +314,7 @@ image/svg+xml - + diff --git a/static/scss/variables.scss b/static/scss/variables.scss index 32635c391ad993340cc91d1ec135d699af29e5d5..641e1acea1ed4de2cc6c80e782a6ea14997fb6ea 100644 --- a/static/scss/variables.scss +++ b/static/scss/variables.scss @@ -10,6 +10,7 @@ $font-family-serif: Georgia, "Times New Roman", Times, serif; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; $font-size-base: 16px; $headings-line-height: 1.0; +$text-color: #000; // Navbar