From 9e95836e8c53f17fa78ef6eafb140a97bd82759a Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 20 Mar 2019 12:03:18 -0400 Subject: [PATCH 01/17] Adds base recap page --- _pages/recap.html | 45 ++++++++++++++++++++++++++++++++++++++ _scss/layout/_recap.scss | 3 +++ _scss/styles.scss | 2 +- static/img/sunrise-sky.svg | 24 ++++++++++++++++++++ static/main.css | 4 ++++ static/main.js | 2 +- 6 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 _pages/recap.html create mode 100644 _scss/layout/_recap.scss create mode 100644 static/img/sunrise-sky.svg diff --git a/_pages/recap.html b/_pages/recap.html new file mode 100644 index 00000000..38288ff7 --- /dev/null +++ b/_pages/recap.html @@ -0,0 +1,45 @@ +--- +layout: base +title: 2019 DjangoCon US Recap +heading: 2019 Recap +permalink: /recap/ +--- + +
+

{{ page.heading }}

+
+ +
+ +
+
+

+ More than 300 Django enthusiasts attended this year, marking our largest conference since 201X. +

+
+ +
+
+ The crowd of DjangoCon 2018 attendees +
+ +
+

+ These enthusiasts descended upon the San Diego Marriot from Sept XX to Sept YY, and shared their insights into using our beloved framework. +

+ +

Mauris id nunc augue. Aliquam dignissim diam vitae ex commodo, ac porta sapien auctor. Nunc maximus dolor ac neque mollis aliquet. Quisque porta ipsum et augue ornare pellentesque. Vivamus lacinia sagittis mauris cursus maximus.

+ +

Pellentesque ullamcorper consequat lacus, a iaculis orci placerat at. Phasellus id arcu sollicitudin dolor iaculis vehicula. Etiam molestie eu neque eu tincidunt. Duis at euismod eros.

+
+
+
+ + +{% include sponsor-footer.html %} + + + +
diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss new file mode 100644 index 00000000..d72e339a --- /dev/null +++ b/_scss/layout/_recap.scss @@ -0,0 +1,3 @@ +.recap-heading { + text-align: center; +} diff --git a/_scss/styles.scss b/_scss/styles.scss index c3533b16..39f8dafb 100644 --- a/_scss/styles.scss +++ b/_scss/styles.scss @@ -70,10 +70,10 @@ @import 'layout/subpage-masthead'; @import 'layout/footer'; @import 'layout/layouts'; +@import 'layout/recap'; @import 'layout/styleguide'; - @import 'module/attraction'; @import 'module/event-info'; @import 'module/event-links'; diff --git a/static/img/sunrise-sky.svg b/static/img/sunrise-sky.svg new file mode 100644 index 00000000..1f0c9ed7 --- /dev/null +++ b/static/img/sunrise-sky.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/static/main.css b/static/main.css index 593ee3ef..8288dc39 100644 --- a/static/main.css +++ b/static/main.css @@ -8599,6 +8599,10 @@ blockquote cite { margin-top: 2rem; } +.recap-heading { + text-align: center; +} + /* This styles code blocks used for examples. */ .highlight { background: #F7F8F9; diff --git a/static/main.js b/static/main.js index d05cbb92..03c80d65 100644 --- a/static/main.js +++ b/static/main.js @@ -23566,7 +23566,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "50189" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "51109" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From 50747d27856289c0ec0d6d885e4679a92b5e1c09 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Tue, 26 Mar 2019 21:54:39 -0400 Subject: [PATCH 02/17] Language adjustment --- _pages/recap.html | 2 +- static/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_pages/recap.html b/_pages/recap.html index 38288ff7..686460b4 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -27,7 +27,7 @@

- These enthusiasts descended upon the San Diego Marriot from Sept XX to Sept YY, and shared their insights into using our beloved framework. + Our community descended upon the San Diego Marriot from Sept XX to Sept YY, and shared their insights into using our beloved framework.

Mauris id nunc augue. Aliquam dignissim diam vitae ex commodo, ac porta sapien auctor. Nunc maximus dolor ac neque mollis aliquet. Quisque porta ipsum et augue ornare pellentesque. Vivamus lacinia sagittis mauris cursus maximus.

diff --git a/static/main.js b/static/main.js index 0e046f78..92d1f1cb 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "56923" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "65503" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From 3d891bcae2412e85461d466067024660e67df7f7 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 10:12:48 -0400 Subject: [PATCH 03/17] Removes and shuffles some items on recap --- _pages/recap.html | 66 ++++++++++++++++++++++++++++++--- _scss/layout/_recap.scss | 28 ++++++++++++++ static/main.css | 26 +++++++++++++ static/main.js | 2 +- static/sunrise-sky.477fe0a2.svg | 24 ++++++++++++ 5 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 static/sunrise-sky.477fe0a2.svg diff --git a/_pages/recap.html b/_pages/recap.html index 686460b4..3f4f678e 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -5,7 +5,7 @@ permalink: /recap/ --- -
+

{{ page.heading }}

@@ -13,33 +13,87 @@

{{ page.heading }}

-

+

More than 300 Django enthusiasts attended this year, marking our largest conference since 201X.

-
+
The crowd of DjangoCon 2018 attendees
-
+

Our community descended upon the San Diego Marriot from Sept XX to Sept YY, and shared their insights into using our beloved framework.

Mauris id nunc augue. Aliquam dignissim diam vitae ex commodo, ac porta sapien auctor. Nunc maximus dolor ac neque mollis aliquet. Quisque porta ipsum et augue ornare pellentesque. Vivamus lacinia sagittis mauris cursus maximus.

-

Pellentesque ullamcorper consequat lacus, a iaculis orci placerat at. Phasellus id arcu sollicitudin dolor iaculis vehicula. Etiam molestie eu neque eu tincidunt. Duis at euismod eros.

+

Pellentesque ullamcorper consequat lacus, a iaculis orci placerat at. Nunc maximus dolor ac.

- {% include sponsor-footer.html %} +
+
+

+ There is no "I" in DjangoCon US. Thank you to all our volunteers who make DjangoCon US happen! +

+
+ {% for organizer in site.organizers %} + {% unless organizer.hidden %} +
+
+ Photo of {{ organizer.name }} +
+

+ {{ organizer.name }} + {% if organizer.pronouns != blank %} + ({{ organizer.pronouns }}) + {% endif %} +

+ {{ organizer.role }} +
+ +
+
+ {% endunless %} + {% endfor %} +
+
+
diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index d72e339a..ea78b2d4 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -1,3 +1,31 @@ +.recap-header { + padding-top: 3rem; + background-image: url('/static/img/sunrise-sky.svg'); + background-position: bottom center; + background-repeat: no-repeat; + background-size: cover; + + h1 { + margin-bottom: 0; + } + + h1:after { + display: none; + } + + @include breakpoint(medium) { + padding-top: 4rem; + padding-bottom: 4rem; + } +} + + .recap-heading { + margin: 0 auto 2rem; + padding: .75rem; + max-width: 46rem; + background: $brand-color2; + font-size: 2rem; text-align: center; + color: #FFF; } diff --git a/static/main.css b/static/main.css index 6b1b22a2..a6f1cd65 100644 --- a/static/main.css +++ b/static/main.css @@ -8594,8 +8594,34 @@ blockquote cite { margin-top: 2rem; } +.recap-header { + padding-top: 3rem; + background-image: url("sunrise-sky.477fe0a2.svg"); + background-position: bottom center; + background-repeat: no-repeat; + background-size: cover; +} +.recap-header h1 { + margin-bottom: 0; +} +.recap-header h1:after { + display: none; +} +@media print, screen and (min-width: 55.625em) { + .recap-header { + padding-top: 4rem; + padding-bottom: 4rem; + } +} + .recap-heading { + margin: 0 auto 2rem; + padding: 0.75rem; + max-width: 46rem; + background: #703D76; + font-size: 2rem; text-align: center; + color: #FFF; } /* This styles code blocks used for examples. */ diff --git a/static/main.js b/static/main.js index 92d1f1cb..b529069e 100644 --- a/static/main.js +++ b/static/main.js @@ -176,7 +176,7 @@ var reloadCSS = require('_css_loader'); module.hot.dispose(reloadCSS); module.hot.accept(reloadCSS); -},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { +},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise-sky.svg":[["sunrise-sky.477fe0a2.svg","static/img/sunrise-sky.svg"],"static/img/sunrise-sky.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { // shim for using process in browser var process = module.exports = {}; // cached from whatever global is present so that test runners that stub it diff --git a/static/sunrise-sky.477fe0a2.svg b/static/sunrise-sky.477fe0a2.svg new file mode 100644 index 00000000..1f0c9ed7 --- /dev/null +++ b/static/sunrise-sky.477fe0a2.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + From 0c9e1015d517bca5a97f2b196455f70eff9165a7 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 21:25:05 -0400 Subject: [PATCH 04/17] Updates to recap page --- _pages/recap.html | 168 ++++++++++++++++++++++++++++---- _scss/layout/_recap.scss | 67 +++++++++++-- _scss/module/_social-icons.scss | 4 + static/main.css | 66 +++++++++++-- static/main.js | 2 +- 5 files changed, 269 insertions(+), 38 deletions(-) diff --git a/_pages/recap.html b/_pages/recap.html index 3f4f678e..9a5dce63 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -11,41 +11,175 @@

{{ page.heading }}

-
+

- More than 300 Django enthusiasts attended this year, marking our largest conference since 201X. + 2 lines (on desktop) that stress how important the conference is. Or just a fun headline.

-
+
The crowd of DjangoCon 2018 attendees
-
+

- Our community descended upon the San Diego Marriot from Sept XX to Sept YY, and shared their insights into using our beloved framework. + Mention the conference location and dates in one or two lines. Speak to the audience type, e.g. "Django Fans".

-

Mauris id nunc augue. Aliquam dignissim diam vitae ex commodo, ac porta sapien auctor. Nunc maximus dolor ac neque mollis aliquet. Quisque porta ipsum et augue ornare pellentesque. Vivamus lacinia sagittis mauris cursus maximus.

+

Supportive copy speaking to the line up or topics discussed, generally setting the mood for a successful event. Basically the primary takeaway.

-

Pellentesque ullamcorper consequat lacus, a iaculis orci placerat at. Nunc maximus dolor ac.

+

Fond memory from 2019? Share it with us:

+ +
-
+
+ + +
+
+
+

This is a text+icon section, of sorts. It's a way to break up lengthy copy with either an image or icon to the right.

+ +

At this point on the page you should be outlining major points or features about the conference and really getting into the meat of the storytelling. Live, laugh, love, all that. Since this page shouldn't feature a ton of copy, this is really your chance to set things up.

+ +

This area can be quite long. No more than 3 paragraphs though, all about 3-5 sentences. Everything else after this is catered to a specific audience type. That could be:

+ +
    +
  • People who want pictures.
    • +
  • Folks getting a feel for conference topics.
    • +
  • Sponsors looking for themselves, competitors, or to get a feel for the caliber of sponsor.
    • +
+ +

But generally you don't want to end on a list.

+
+ +
+ {% comment %} + Main graphic/icon for the year. e.g. for 2018, the crab. 2019, the boat. + {% endcomment %} + A little boat +
+
+
+ +
+ {% comment %} + TODO: This could be not-bad. + + NOTE: Limit applied for staging purposes only. + + Uses an alternative grid to mix things up a bit. + {% endcomment %} +
+
+

Awesome Talks and Tutorials

+

We featured over 60 talks & tutorials this year. Here's some crowd favorites!

+ See the full schedule +
+ {% for post in site.schedule | limit:20 %} + {% if post.permalink && post.room != 'filler' %} + + {% endif %} + {% endfor %} +
+
+ +
+
+
+

All Sessions Performed by Amazing People

+
+ +
+ Photo of Chloe Condon +
+
+
{% include sponsor-footer.html %} -
-
-

- There is no "I" in DjangoCon US. Thank you to all our volunteers who make DjangoCon US happen! -

-
+
+
+
+

DjangoCon 2019 is possible through lots of :heart:

+

Sed convallis laoreet elit quis rutrum. Sed fringilla posuere posuere. Curabitur placerat et enim nec commodo. In vehicula nulla vitae odio mattis aliquet.

+
+
+
{% for organizer in site.organizers %} {% unless organizer.hidden %}
{% endunless %} {% endfor %} - -
diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index ea78b2d4..3b2b3867 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -1,7 +1,8 @@ .recap-header { - padding-top: 3rem; + padding-top: 8rem; + padding-bottom: 5rem; background-image: url('/static/img/sunrise-sky.svg'); - background-position: bottom center; + background-position: top center; background-repeat: no-repeat; background-size: cover; @@ -12,20 +13,68 @@ h1:after { display: none; } - - @include breakpoint(medium) { - padding-top: 4rem; - padding-bottom: 4rem; - } } .recap-heading { - margin: 0 auto 2rem; + margin: 0 auto $global-margin; padding: .75rem; max-width: 46rem; background: $brand-color2; - font-size: 2rem; text-align: center; color: #FFF; + + .emoji { + width: 38px; + height: 38px; + } + + @include breakpoint(medium) { + margin-bottom: 3rem; + font-size: 2rem; + } +} + +.recap-intro .social-icons { + margin-top: .5rem; +} + +.recap-intro img { + margin-bottom: $global-margin; +} + +.organizer-block .profile .social-icons a { + color: $brand-color7; +} + + +.highlight-events .events { + flex-flow: row wrap; + justify-content: center; + margin: 0 auto; + max-width: $global-width; +} + +.highlight-events .event { + margin: 0 .5rem 1rem; +} + +.highlight-events-header { + margin-bottom: $global-margin; + width: 100%; + text-align: center; +} + +.highlight-events { + // Override from elsewhere + @include breakpoint(medium) { + .events { + .event, + .event:first-child, + .event:last-child { + width: calc(100% * 1/3 - 1rem); + flex-grow: 0; + } + } + } } diff --git a/_scss/module/_social-icons.scss b/_scss/module/_social-icons.scss index 00beeadb..10b91cbe 100644 --- a/_scss/module/_social-icons.scss +++ b/_scss/module/_social-icons.scss @@ -49,3 +49,7 @@ fill: $color-github; } } + +.social-icons.highlight svg { + fill: $brand-color5; +} diff --git a/static/main.css b/static/main.css index a6f1cd65..3dcf47ee 100644 --- a/static/main.css +++ b/static/main.css @@ -8595,9 +8595,10 @@ blockquote cite { } .recap-header { - padding-top: 3rem; + padding-top: 8rem; + padding-bottom: 5rem; background-image: url("sunrise-sky.477fe0a2.svg"); - background-position: bottom center; + background-position: top center; background-repeat: no-repeat; background-size: cover; } @@ -8607,22 +8608,63 @@ blockquote cite { .recap-header h1:after { display: none; } -@media print, screen and (min-width: 55.625em) { - .recap-header { - padding-top: 4rem; - padding-bottom: 4rem; - } -} .recap-heading { - margin: 0 auto 2rem; + margin: 0 auto 1rem; padding: 0.75rem; max-width: 46rem; background: #703D76; - font-size: 2rem; text-align: center; color: #FFF; } +.recap-heading .emoji { + width: 38px; + height: 38px; +} +@media print, screen and (min-width: 55.625em) { + .recap-heading { + margin-bottom: 3rem; + font-size: 2rem; + } +} + +.recap-intro .social-icons { + margin-top: 0.5rem; +} + +.recap-intro img { + margin-bottom: 1rem; +} + +.organizer-block .profile .social-icons a { + color: #FBAECD; +} + +.highlight-events .events { + flex-flow: row wrap; + justify-content: center; + margin: 0 auto; + max-width: 57.6923076923rem; +} + +.highlight-events .event { + margin: 0 0.5rem 1rem; +} + +.highlight-events-header { + margin-bottom: 1rem; + width: 100%; + text-align: center; +} + +@media print, screen and (min-width: 55.625em) { + .highlight-events .events .event, +.highlight-events .events .event:first-child, +.highlight-events .events .event:last-child { + width: calc(100% * 1/3 - 1rem); + flex-grow: 0; + } +} /* This styles code blocks used for examples. */ .highlight { @@ -9673,4 +9715,8 @@ body.sunset .footer { } .social-icons a.github:hover svg { fill: #4078c0; +} + +.social-icons.highlight svg { + fill: #A257AA; } \ No newline at end of file diff --git a/static/main.js b/static/main.js index b529069e..5e86ea69 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "65503" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "51313" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From 0fde0c8961479a3494b4f32dce5f40462a9c7fa1 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 21:58:40 -0400 Subject: [PATCH 05/17] Adds speakers to recap page --- _includes/schedule-session-full.html | 4 +-- _includes/schedule-session.html | 4 +-- _layouts/session-details.html | 2 +- _pages/recap.html | 42 ++++++++++++++++++++++------ _pages/why-djangocon-us.html | 10 +++---- _scss/layout/_recap.scss | 18 ++++++++++++ _scss/module/_schedule.scss | 21 +++++++------- static/img/sail-circle.svg | 1 + static/main.css | 35 ++++++++++++++++------- 9 files changed, 99 insertions(+), 38 deletions(-) create mode 100644 static/img/sail-circle.svg diff --git a/_includes/schedule-session-full.html b/_includes/schedule-session-full.html index de9d71de..8c6b426d 100644 --- a/_includes/schedule-session-full.html +++ b/_includes/schedule-session-full.html @@ -17,12 +17,12 @@

{{ post.title }}

{% if post.presenters %} {% for presenter in post.presenters %} -

+

{% if presenter.photo_url != blank %} Photo of {{ presenter.presenters }} + alt="Photo of {{ presenter.name }}" /> {% endif %} {{ presenter.name }} {% if presenter.pronouns != blank %} diff --git a/_includes/schedule-session.html b/_includes/schedule-session.html index 6b341f89..f5e3371f 100644 --- a/_includes/schedule-session.html +++ b/_includes/schedule-session.html @@ -31,12 +31,12 @@

{{ post.title }}

{% endif %} {% if post.presenters %} {% for presenter in post.presenters %} -

+

{% if presenter.photo_url != blank %} Photo of {{ presenter.presenters }} + alt="Photo of {{ presenter.name }}" /> {% endif %} {{ presenter.name }} {% if presenter.pronouns != blank %} diff --git a/_layouts/session-details.html b/_layouts/session-details.html index 6b353920..a4dbdbb1 100644 --- a/_layouts/session-details.html +++ b/_layouts/session-details.html @@ -66,7 +66,7 @@

About This {{ page.category | capitalize Photo of {{ presenter.presenters }} + alt="Photo of {{ presenter.name }}" /> {% endif %} diff --git a/_pages/recap.html b/_pages/recap.html index 9a5dce63..feaef781 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -88,7 +88,7 @@

Main graphic/icon for the year. e.g. for 2018, the crab. 2019, the boat. {% endcomment %} A little boat @@ -133,12 +133,12 @@

{{ post.title }}

{% if post.presenters %} {% for presenter in post.presenters %} -

+

{% if presenter.photo_url != blank %} Photo of {{ presenter.presenters }} + alt="Photo of {{ presenter.name }}" /> {% endif %} {{ presenter.name }} {% if presenter.pronouns != blank %} @@ -158,16 +158,42 @@

{{ post.title }}

-
+{% comment %} + SPEAKERS +{% endcomment %} +

All Sessions Performed by Amazing People

- -
- Photo of Chloe Condon -
+ +
+
+ {% for post in site.schedule %} + {% if post.presenters %} + {% for presenter in post.presenters %} + {% if presenter.name %} + + {% if presenter.photo_url != blank %} + Photo of {{ presenter.name }} + {% endif %} + {{ presenter.name }} + {% if presenter.pronouns != blank %} + ({{ presenter.pronouns }}) + {% endif %} + + {% endif %} + {% endfor %} + {% endif %} + {% endfor %} +
+
{% include sponsor-footer.html %} diff --git a/_pages/why-djangocon-us.html b/_pages/why-djangocon-us.html index bf21ca92..255d4d57 100644 --- a/_pages/why-djangocon-us.html +++ b/_pages/why-djangocon-us.html @@ -163,7 +163,7 @@

A sampling of popular sessions from past years

Using Django, Docker, and Scikit-learn to Bootstrap Your Machine Learning Project

Talk Intermediate -

+

By Lorena Mesa

@@ -175,7 +175,7 @@

Using Django, Docker, and Scikit-learn to Bootstrap Your

From 0 to 100 in Django

Tutorial Beginner -

+

By Jeremy Spencer

@@ -196,7 +196,7 @@

Build a GraphQL API Using Django

Tutorial Intermediate -

+

By Murange James

@@ -208,7 +208,7 @@

Build a GraphQL API Using

Write an API for Almost Anything (or The Amazing Power and Flexibility of Django Rest Framework

Talk All Levels -

+

By Charlotte Mays

@@ -220,7 +220,7 @@

Write an API for Almost Anything (or The Amazing Power a

Files in Django

Talk Beginner -

+

By Josh Schneier

diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index 3b2b3867..a079fdd4 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -78,3 +78,21 @@ } } } + +div.presenter-list-block { + .presenter-byline { + display: inline-flex; + margin: 0 1.5rem 2rem; + } + + .avatar { + max-width: 80px; + } +} + + +.presenter-list { + display: flex; + flex-flow: row wrap; + justify-content: center; +} diff --git a/_scss/module/_schedule.scss b/_scss/module/_schedule.scss index b6e164be..db847c67 100644 --- a/_scss/module/_schedule.scss +++ b/_scss/module/_schedule.scss @@ -52,7 +52,7 @@ color: $secondary-color; } - a:hover .event-byline { + a:hover .byline { color: $body-font-color; } @@ -68,13 +68,6 @@ font-size: .75rem; } - .avatar { - margin: 0 .5em 0 0; - max-width: 60px; - border-radius: 50%; - vertical-align: middle; - } - .location { position: absolute; top:6px; @@ -97,7 +90,7 @@ display: block; } - .event-byline { + .byline { margin-top: $global-margin; padding-top: 0; } @@ -140,7 +133,7 @@ padding: ($global-margin * 1.75) $global-margin $global-margin; } -.event-byline { +.presenter-byline { display: flex; align-items: center; @@ -148,10 +141,18 @@ margin-bottom: 0; line-height: 1.2; + text-decoration: none; & + & { margin-top: $global-margin / 2; } + + .avatar { + margin: 0 .5em 0 0; + max-width: 60px; + border-radius: 50%; + vertical-align: middle; + } } @include breakpoint(medium) { diff --git a/static/img/sail-circle.svg b/static/img/sail-circle.svg new file mode 100644 index 00000000..c77a2796 --- /dev/null +++ b/static/img/sail-circle.svg @@ -0,0 +1 @@ +sail-circle \ No newline at end of file diff --git a/static/main.css b/static/main.css index 3dcf47ee..f6da9e77 100644 --- a/static/main.css +++ b/static/main.css @@ -8666,6 +8666,20 @@ blockquote cite { } } +div.presenter-list-block .presenter-byline { + display: inline-flex; + margin: 0 1.5rem 2rem; +} +div.presenter-list-block .avatar { + max-width: 80px; +} + +.presenter-list { + display: flex; + flex-flow: row wrap; + justify-content: center; +} + /* This styles code blocks used for examples. */ .highlight { background: #F7F8F9; @@ -9316,7 +9330,7 @@ body.sunset .footer { .event a:hover .event-title { color: #703D76; } -.event a:hover .event-byline { +.event a:hover .byline { color: #1E1E1E; } .event .event-content { @@ -9331,12 +9345,6 @@ body.sunset .footer { align-self: flex-start; font-size: 0.75rem; } -.event .avatar { - margin: 0 0.5em 0 0; - max-width: 60px; - border-radius: 50%; - vertical-align: middle; -} .event .location { position: absolute; top: 6px; @@ -9355,7 +9363,7 @@ body.sunset .footer { .event.boxed .event-content { display: block; } -.event.boxed .event-byline { +.event.boxed .byline { margin-top: 1rem; padding-top: 0; } @@ -9392,16 +9400,23 @@ body.sunset .footer { padding: 1.75rem 1rem 1rem; } -.event-byline { +.presenter-byline { display: flex; align-items: center; margin-top: 30px; margin-bottom: 0; line-height: 1.2; + text-decoration: none; } -.event-byline + .event-byline { +.presenter-byline + .presenter-byline { margin-top: 0.5rem; } +.presenter-byline .avatar { + margin: 0 0.5em 0 0; + max-width: 60px; + border-radius: 50%; + vertical-align: middle; +} @media print, screen and (min-width: 55.625em) { .hour-row { From 25a20a1f4a3b47b2a293bec6f804cc7195f426cb Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 23:48:02 -0400 Subject: [PATCH 06/17] Updates with stat blocks --- _pages/recap.html | 213 +++++++++++++++++++++++++++++++++------ _scss/_settings.scss | 4 +- _scss/layout/_recap.scss | 73 ++++++++++++-- static/main.css | 78 ++++++++++---- 4 files changed, 310 insertions(+), 58 deletions(-) diff --git a/_pages/recap.html b/_pages/recap.html index feaef781..0705eec2 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -162,43 +162,196 @@

{{ post.title }}

SPEAKERS {% endcomment %}
+

All Sessions Performed by Amazing People

+
+ {% for post in site.schedule %} + {% if post.presenters %} + {% for presenter in post.presenters %} + {% if presenter.name %} + + {% if presenter.photo_url != blank %} + Photo of {{ presenter.name }} + {% endif %} + {{ presenter.name }} + {% if presenter.pronouns != blank %} + ({{ presenter.pronouns }}) + {% endif %} + + {% endif %} + {% endfor %} + {% endif %} + {% endfor %} +
+
+ +{% include sponsor-footer.html %} + +
-
-

All Sessions Performed by Amazing People

+
+

Stat Block

+

It is very likely that we will want to feature some sort of table or data element. Perhaps this is survey results, or a pie chart of swag selection, etc.

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
T-Shirts EatenOMG What?
SmallSeriously
MediumPeople
LargeAte...
X-LargeThe shirts?
+

You could also put an image here, no problem!

+
-
-
- {% for post in site.schedule %} - {% if post.presenters %} - {% for presenter in post.presenters %} - {% if presenter.name %} - - {% if presenter.photo_url != blank %} - Photo of {{ presenter.name }} - {% endif %} - {{ presenter.name }} - {% if presenter.pronouns != blank %} - ({{ presenter.pronouns }}) - {% endif %} - - {% endif %} - {% endfor %} - {% endif %} - {% endfor %} +
+
+

And remember...

+

Under the hood it's all just a grid system. So you can just add a new row if you want to associate more text with this block. Easy peasy, lemon squeezy.

-
+
-{% include sponsor-footer.html %} +
+
+

Lots of Photos

+

We took a total over 300 photos this year. Here are some of our favorites. What were some of your favorite moments this year?

+ View all photos +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+

Stat Block

+

It is very likely that we will want to feature some sort of table or data element. Perhaps this is survey results, or a pie chart of swag selection, etc.

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
T-Shirts EatenOMG What?
SmallSeriously
MediumPeople
LargeAte...
X-LargeThe shirts?
+

You could also put an image here, no problem!

+
+
+
-
+
+
+

And remember...

+

Under the hood it's all just a grid system. So you can just add a new row if you want to associate more text with this block. Easy peasy, lemon squeezy.

+
+
+
+ +

DjangoCon 2019 is possible through lots of :heart:

@@ -252,6 +405,6 @@

{% endunless %} {% endfor %}

- +
diff --git a/_scss/_settings.scss b/_scss/_settings.scss index d66ce858..e5e09aca 100644 --- a/_scss/_settings.scss +++ b/_scss/_settings.scss @@ -606,8 +606,8 @@ $switch-paddle-transition: all 0.25s ease-out; // 32. Table // --------- -$table-background: darken($light-gray, 5%); -$table-color-scale: 5%; +$table-background: #FFF; +$table-color-scale: 8%; $table-border: 1px solid smart-scale($table-background, $table-color-scale); $table-padding: rem-calc(8 10 10); $table-hover-scale: 2%; diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index a079fdd4..c246c88c 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -79,20 +79,75 @@ } } -div.presenter-list-block { - .presenter-byline { - display: inline-flex; - margin: 0 1.5rem 2rem; +.presenter-list { + display: flex; + flex-flow: row wrap; + justify-content: center; + // A little more padding than usual + padding-right: 30px; + padding-left: 30px; +} + +.presenter-list-block { + // TODO: Hacked padding + padding-right: 0.4807692308rem; + padding-left: 0.4807692308rem; + + .presenter-list { + .presenter-byline { + display: inline-flex; + margin: 0 1rem 2rem; + } + + .avatar { + max-width: 60px; + } } - .avatar { - max-width: 80px; + @include breakpoint(medium) { + .presenter-byline { + margin: 0 1.5rem 2rem; + } + + .avatar { + max-width: 80px; + } } } - -.presenter-list { +.photos-block { display: flex; flex-flow: row wrap; - justify-content: center; + background: $brand-color6; + + &-header { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 1rem 2rem; + width: 100%; + } + + .photo { + flex: 1 0 auto; + } + + @include breakpoint(medium) { + .photo { + flex: 1 0 33.33%; + } + } + + @include breakpoint(large) { + &-header, + &-header + .photo, + &-header + .photo + .photo { + width: 33.33%; + } + + .photo { + flex: 1 0 25%; + } + } } diff --git a/static/main.css b/static/main.css index f6da9e77..9da0ef13 100644 --- a/static/main.css +++ b/static/main.css @@ -6128,8 +6128,8 @@ table { thead, tbody, tfoot { - border: 1px solid #dbdfe4; - background-color: #e8ebee; + border: 1px solid #ebebeb; + background-color: #FFF; } caption { @@ -6138,12 +6138,12 @@ caption { } thead { - background: #e2e5e9; + background: whitesmoke; color: #1E1E1E; } tfoot { - background: #dbdfe4; + background: #ebebeb; color: #1E1E1E; } @@ -6167,16 +6167,16 @@ tbody td { tbody tr:nth-child(even) { border-bottom: 0; - background-color: #dbdfe4; + background-color: #ebebeb; } table.unstriped tbody { - background-color: #e8ebee; + background-color: #FFF; } table.unstriped tbody tr { border-bottom: 0; - border-bottom: 1px solid #dbdfe4; - background-color: #e8ebee; + border-bottom: 1px solid #ebebeb; + background-color: #FFF; } @media screen and (max-width: 63.99875em) { @@ -6203,16 +6203,16 @@ table.scroll { } table.hover thead tr:hover { - background-color: #dce0e5; + background-color: #f0f0f0; } table.hover tfoot tr:hover { - background-color: #d5dae0; + background-color: #e6e6e6; } table.hover tbody tr:hover { - background-color: #e3e6ea; + background-color: #fafafa; } table.hover:not(.unstriped) tr:nth-of-type(even):hover { - background-color: #d4d9df; + background-color: #e6e6e6; } .table-scroll { @@ -8666,18 +8666,62 @@ blockquote cite { } } -div.presenter-list-block .presenter-byline { +.presenter-list { + display: flex; + flex-flow: row wrap; + justify-content: center; + padding-right: 30px; + padding-left: 30px; +} + +.presenter-list-block { + padding-right: 0.4807692308rem; + padding-left: 0.4807692308rem; +} +.presenter-list-block .presenter-list .presenter-byline { display: inline-flex; - margin: 0 1.5rem 2rem; + margin: 0 1rem 2rem; } -div.presenter-list-block .avatar { - max-width: 80px; +.presenter-list-block .presenter-list .avatar { + max-width: 60px; +} +@media print, screen and (min-width: 55.625em) { + .presenter-list-block .presenter-byline { + margin: 0 1.5rem 2rem; + } + .presenter-list-block .avatar { + max-width: 80px; + } } -.presenter-list { +.photos-block { display: flex; flex-flow: row wrap; + background: #D19FDD; +} +.photos-block-header { + display: flex; + flex-direction: column; justify-content: center; + align-items: center; + padding: 1rem 2rem; + width: 100%; +} +.photos-block .photo { + flex: 1 0 auto; +} +@media print, screen and (min-width: 55.625em) { + .photos-block .photo { + flex: 1 0 33.33%; + } +} +@media print, screen and (min-width: 64em) { + .photos-block-header, .photos-block-header + .photo, .photos-block-header + .photo + .photo { + width: 33.33%; + } + .photos-block .photo { + flex: 1 0 25%; + } } /* This styles code blocks used for examples. */ From ac6b37907aebbcccfcd867618fe0a488b8a29ca3 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 23:49:01 -0400 Subject: [PATCH 07/17] Updates static files --- static/main.css | 154 ++++-------------------------------------------- static/main.js | 2 +- 2 files changed, 13 insertions(+), 143 deletions(-) diff --git a/static/main.css b/static/main.css index 9da0ef13..059788ff 100644 --- a/static/main.css +++ b/static/main.css @@ -6128,8 +6128,8 @@ table { thead, tbody, tfoot { - border: 1px solid #ebebeb; - background-color: #FFF; + border: 1px solid #dbdfe4; + background-color: #e8ebee; } caption { @@ -6138,12 +6138,12 @@ caption { } thead { - background: whitesmoke; + background: #e2e5e9; color: #1E1E1E; } tfoot { - background: #ebebeb; + background: #dbdfe4; color: #1E1E1E; } @@ -6167,16 +6167,16 @@ tbody td { tbody tr:nth-child(even) { border-bottom: 0; - background-color: #ebebeb; + background-color: #dbdfe4; } table.unstriped tbody { - background-color: #FFF; + background-color: #e8ebee; } table.unstriped tbody tr { border-bottom: 0; - border-bottom: 1px solid #ebebeb; - background-color: #FFF; + border-bottom: 1px solid #dbdfe4; + background-color: #e8ebee; } @media screen and (max-width: 63.99875em) { @@ -6203,16 +6203,16 @@ table.scroll { } table.hover thead tr:hover { - background-color: #f0f0f0; + background-color: #dce0e5; } table.hover tfoot tr:hover { - background-color: #e6e6e6; + background-color: #d5dae0; } table.hover tbody tr:hover { - background-color: #fafafa; + background-color: #e3e6ea; } table.hover:not(.unstriped) tr:nth-of-type(even):hover { - background-color: #e6e6e6; + background-color: #d4d9df; } .table-scroll { @@ -8594,136 +8594,6 @@ blockquote cite { margin-top: 2rem; } -.recap-header { - padding-top: 8rem; - padding-bottom: 5rem; - background-image: url("sunrise-sky.477fe0a2.svg"); - background-position: top center; - background-repeat: no-repeat; - background-size: cover; -} -.recap-header h1 { - margin-bottom: 0; -} -.recap-header h1:after { - display: none; -} - -.recap-heading { - margin: 0 auto 1rem; - padding: 0.75rem; - max-width: 46rem; - background: #703D76; - text-align: center; - color: #FFF; -} -.recap-heading .emoji { - width: 38px; - height: 38px; -} -@media print, screen and (min-width: 55.625em) { - .recap-heading { - margin-bottom: 3rem; - font-size: 2rem; - } -} - -.recap-intro .social-icons { - margin-top: 0.5rem; -} - -.recap-intro img { - margin-bottom: 1rem; -} - -.organizer-block .profile .social-icons a { - color: #FBAECD; -} - -.highlight-events .events { - flex-flow: row wrap; - justify-content: center; - margin: 0 auto; - max-width: 57.6923076923rem; -} - -.highlight-events .event { - margin: 0 0.5rem 1rem; -} - -.highlight-events-header { - margin-bottom: 1rem; - width: 100%; - text-align: center; -} - -@media print, screen and (min-width: 55.625em) { - .highlight-events .events .event, -.highlight-events .events .event:first-child, -.highlight-events .events .event:last-child { - width: calc(100% * 1/3 - 1rem); - flex-grow: 0; - } -} - -.presenter-list { - display: flex; - flex-flow: row wrap; - justify-content: center; - padding-right: 30px; - padding-left: 30px; -} - -.presenter-list-block { - padding-right: 0.4807692308rem; - padding-left: 0.4807692308rem; -} -.presenter-list-block .presenter-list .presenter-byline { - display: inline-flex; - margin: 0 1rem 2rem; -} -.presenter-list-block .presenter-list .avatar { - max-width: 60px; -} -@media print, screen and (min-width: 55.625em) { - .presenter-list-block .presenter-byline { - margin: 0 1.5rem 2rem; - } - .presenter-list-block .avatar { - max-width: 80px; - } -} - -.photos-block { - display: flex; - flex-flow: row wrap; - background: #D19FDD; -} -.photos-block-header { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding: 1rem 2rem; - width: 100%; -} -.photos-block .photo { - flex: 1 0 auto; -} -@media print, screen and (min-width: 55.625em) { - .photos-block .photo { - flex: 1 0 33.33%; - } -} -@media print, screen and (min-width: 64em) { - .photos-block-header, .photos-block-header + .photo, .photos-block-header + .photo + .photo { - width: 33.33%; - } - .photos-block .photo { - flex: 1 0 25%; - } -} - /* This styles code blocks used for examples. */ .highlight { background: #F7F8F9; diff --git a/static/main.js b/static/main.js index 5e86ea69..f15947ab 100644 --- a/static/main.js +++ b/static/main.js @@ -176,7 +176,7 @@ var reloadCSS = require('_css_loader'); module.hot.dispose(reloadCSS); module.hot.accept(reloadCSS); -},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise-sky.svg":[["sunrise-sky.477fe0a2.svg","static/img/sunrise-sky.svg"],"static/img/sunrise-sky.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { +},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { // shim for using process in browser var process = module.exports = {}; // cached from whatever global is present so that test runners that stub it From f2b629eab4b72539c47757be97a380e089b03e5a Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 23:53:19 -0400 Subject: [PATCH 08/17] Fixes recap page error --- _pages/recap.html | 4 ++-- static/main.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_pages/recap.html b/_pages/recap.html index 0705eec2..f50b9fbd 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -109,8 +109,8 @@

Awesome Talks and Tutorials

We featured over 60 talks & tutorials this year. Here's some crowd favorites!

See the full schedule - {% for post in site.schedule | limit:20 %} - {% if post.permalink && post.room != 'filler' %} + {% for post in site.schedule %} + {% if post.permalink and post.room != 'filler' %}
Date: Wed, 27 Mar 2019 23:55:32 -0400 Subject: [PATCH 09/17] Whacks the cache on static files --- static/main.css | 154 ++++++++++++++++++++++++++++++++++++++++++++---- static/main.js | 4 +- 2 files changed, 144 insertions(+), 14 deletions(-) diff --git a/static/main.css b/static/main.css index 059788ff..9da0ef13 100644 --- a/static/main.css +++ b/static/main.css @@ -6128,8 +6128,8 @@ table { thead, tbody, tfoot { - border: 1px solid #dbdfe4; - background-color: #e8ebee; + border: 1px solid #ebebeb; + background-color: #FFF; } caption { @@ -6138,12 +6138,12 @@ caption { } thead { - background: #e2e5e9; + background: whitesmoke; color: #1E1E1E; } tfoot { - background: #dbdfe4; + background: #ebebeb; color: #1E1E1E; } @@ -6167,16 +6167,16 @@ tbody td { tbody tr:nth-child(even) { border-bottom: 0; - background-color: #dbdfe4; + background-color: #ebebeb; } table.unstriped tbody { - background-color: #e8ebee; + background-color: #FFF; } table.unstriped tbody tr { border-bottom: 0; - border-bottom: 1px solid #dbdfe4; - background-color: #e8ebee; + border-bottom: 1px solid #ebebeb; + background-color: #FFF; } @media screen and (max-width: 63.99875em) { @@ -6203,16 +6203,16 @@ table.scroll { } table.hover thead tr:hover { - background-color: #dce0e5; + background-color: #f0f0f0; } table.hover tfoot tr:hover { - background-color: #d5dae0; + background-color: #e6e6e6; } table.hover tbody tr:hover { - background-color: #e3e6ea; + background-color: #fafafa; } table.hover:not(.unstriped) tr:nth-of-type(even):hover { - background-color: #d4d9df; + background-color: #e6e6e6; } .table-scroll { @@ -8594,6 +8594,136 @@ blockquote cite { margin-top: 2rem; } +.recap-header { + padding-top: 8rem; + padding-bottom: 5rem; + background-image: url("sunrise-sky.477fe0a2.svg"); + background-position: top center; + background-repeat: no-repeat; + background-size: cover; +} +.recap-header h1 { + margin-bottom: 0; +} +.recap-header h1:after { + display: none; +} + +.recap-heading { + margin: 0 auto 1rem; + padding: 0.75rem; + max-width: 46rem; + background: #703D76; + text-align: center; + color: #FFF; +} +.recap-heading .emoji { + width: 38px; + height: 38px; +} +@media print, screen and (min-width: 55.625em) { + .recap-heading { + margin-bottom: 3rem; + font-size: 2rem; + } +} + +.recap-intro .social-icons { + margin-top: 0.5rem; +} + +.recap-intro img { + margin-bottom: 1rem; +} + +.organizer-block .profile .social-icons a { + color: #FBAECD; +} + +.highlight-events .events { + flex-flow: row wrap; + justify-content: center; + margin: 0 auto; + max-width: 57.6923076923rem; +} + +.highlight-events .event { + margin: 0 0.5rem 1rem; +} + +.highlight-events-header { + margin-bottom: 1rem; + width: 100%; + text-align: center; +} + +@media print, screen and (min-width: 55.625em) { + .highlight-events .events .event, +.highlight-events .events .event:first-child, +.highlight-events .events .event:last-child { + width: calc(100% * 1/3 - 1rem); + flex-grow: 0; + } +} + +.presenter-list { + display: flex; + flex-flow: row wrap; + justify-content: center; + padding-right: 30px; + padding-left: 30px; +} + +.presenter-list-block { + padding-right: 0.4807692308rem; + padding-left: 0.4807692308rem; +} +.presenter-list-block .presenter-list .presenter-byline { + display: inline-flex; + margin: 0 1rem 2rem; +} +.presenter-list-block .presenter-list .avatar { + max-width: 60px; +} +@media print, screen and (min-width: 55.625em) { + .presenter-list-block .presenter-byline { + margin: 0 1.5rem 2rem; + } + .presenter-list-block .avatar { + max-width: 80px; + } +} + +.photos-block { + display: flex; + flex-flow: row wrap; + background: #D19FDD; +} +.photos-block-header { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 1rem 2rem; + width: 100%; +} +.photos-block .photo { + flex: 1 0 auto; +} +@media print, screen and (min-width: 55.625em) { + .photos-block .photo { + flex: 1 0 33.33%; + } +} +@media print, screen and (min-width: 64em) { + .photos-block-header, .photos-block-header + .photo, .photos-block-header + .photo + .photo { + width: 33.33%; + } + .photos-block .photo { + flex: 1 0 25%; + } +} + /* This styles code blocks used for examples. */ .highlight { background: #F7F8F9; diff --git a/static/main.js b/static/main.js index 8720c934..34e75e97 100644 --- a/static/main.js +++ b/static/main.js @@ -176,7 +176,7 @@ var reloadCSS = require('_css_loader'); module.hot.dispose(reloadCSS); module.hot.accept(reloadCSS); -},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { +},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise-sky.svg":[["sunrise-sky.477fe0a2.svg","static/img/sunrise-sky.svg"],"static/img/sunrise-sky.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { // shim for using process in browser var process = module.exports = {}; // cached from whatever global is present so that test runners that stub it @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "65336" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "49805" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From b561bb937cdbd2238e65f382625450af5a5711c7 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 27 Mar 2019 23:58:37 -0400 Subject: [PATCH 10/17] Properly limit the amount of talks shown for recap --- _pages/recap.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_pages/recap.html b/_pages/recap.html index f50b9fbd..857fa2ba 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -109,7 +109,7 @@

Awesome Talks and Tutorials

We featured over 60 talks & tutorials this year. Here's some crowd favorites!

See the full schedule - {% for post in site.schedule %} + {% for post in site.schedule limit:20 %} {% if post.permalink and post.room != 'filler' %}
All Sessions Performed by Amazing People

Stat Block

It is very likely that we will want to feature some sort of table or data element. Perhaps this is survey results, or a pie chart of swag selection, etc.

+

On mobile this will stack. You will want two paragraphs here, even if the second one is sort of short. The lead class is optional, too.

@@ -245,62 +246,16 @@

Lots of Photos

We took a total over 300 photos this year. Here are some of our favorites. What were some of your favorite moments this year?

View all photos -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ + {% for i in (1..8) %} +
+ +
+ {% endfor %}
@@ -308,6 +263,7 @@

Lots of Photos

Stat Block

It is very likely that we will want to feature some sort of table or data element. Perhaps this is survey results, or a pie chart of swag selection, etc.

+

On mobile this will stack. You will want two paragraphs here, even if the second one is sort of short. The lead class is optional, too.

diff --git a/_scss/_settings.scss b/_scss/_settings.scss index e5e09aca..d7b471c8 100644 --- a/_scss/_settings.scss +++ b/_scss/_settings.scss @@ -616,11 +616,11 @@ $table-row-stripe-hover: darken($table-background, $table-color-scale + $table-h $table-is-striped: true; $table-striped-background: smart-scale($table-background, $table-color-scale); $table-stripe: even; -$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-background: $brand-color1; $table-head-row-hover: darken($table-head-background, $table-hover-scale); $table-foot-background: smart-scale($table-background, $table-color-scale); $table-foot-row-hover: darken($table-foot-background, $table-hover-scale); -$table-head-font-color: $body-font-color; +$table-head-font-color: $white; $table-foot-font-color: $body-font-color; $show-header-for-stacked: false; diff --git a/_scss/base/_global.scss b/_scss/base/_global.scss index 9781cfc1..e0d41e69 100644 --- a/_scss/base/_global.scss +++ b/_scss/base/_global.scss @@ -14,7 +14,6 @@ li { } .lead { - margin-bottom: 2.5rem; font-weight: $global-weight-normal; @include breakpoint(medium) { diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index c246c88c..9c4d18d9 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -1,7 +1,12 @@ .recap-header { - padding-top: 8rem; - padding-bottom: 5rem; - background-image: url('/static/img/sunrise-sky.svg'); + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + min-height: 10rem; + + background-image: url('/static/img/sunrise-post-event.svg'); background-position: top center; background-repeat: no-repeat; background-size: cover; @@ -13,6 +18,10 @@ h1:after { display: none; } + + @include breakpoint(medium) { + min-height: 14rem; + } } @@ -82,10 +91,13 @@ .presenter-list { display: flex; flex-flow: row wrap; - justify-content: center; // A little more padding than usual padding-right: 30px; padding-left: 30px; + + @include breakpoint(medium) { + justify-content: center; + } } .presenter-list-block { @@ -118,6 +130,7 @@ .photos-block { display: flex; flex-flow: row wrap; + justify-content: center; background: $brand-color6; &-header { @@ -131,6 +144,13 @@ .photo { flex: 1 0 auto; + background-position: center center; + background-repeat: no-repeat; + background-size: cover; + } + + .photo img { + visibility: hidden; } @include breakpoint(medium) { diff --git a/static/img/sunrise-post-event.svg b/static/img/sunrise-post-event.svg new file mode 100644 index 00000000..d95e6b53 --- /dev/null +++ b/static/img/sunrise-post-event.svg @@ -0,0 +1 @@ +sunrise-post-event \ No newline at end of file diff --git a/static/main.css b/static/main.css index 9da0ef13..7dc8efd4 100644 --- a/static/main.css +++ b/static/main.css @@ -6138,8 +6138,8 @@ caption { } thead { - background: whitesmoke; - color: #1E1E1E; + background: #0A51A4; + color: #FFFFFF; } tfoot { @@ -6203,7 +6203,7 @@ table.scroll { } table.hover thead tr:hover { - background-color: #f0f0f0; + background-color: #094c9a; } table.hover tfoot tr:hover { background-color: #e6e6e6; @@ -7958,7 +7958,6 @@ li { } .lead { - margin-bottom: 2.5rem; font-weight: 400; } @media print, screen and (min-width: 55.625em) { @@ -8595,9 +8594,12 @@ blockquote cite { } .recap-header { - padding-top: 8rem; - padding-bottom: 5rem; - background-image: url("sunrise-sky.477fe0a2.svg"); + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + min-height: 10rem; + background-image: url("sunrise-post-event.57537c5a.svg"); background-position: top center; background-repeat: no-repeat; background-size: cover; @@ -8608,6 +8610,11 @@ blockquote cite { .recap-header h1:after { display: none; } +@media print, screen and (min-width: 55.625em) { + .recap-header { + min-height: 14rem; + } +} .recap-heading { margin: 0 auto 1rem; @@ -8669,10 +8676,14 @@ blockquote cite { .presenter-list { display: flex; flex-flow: row wrap; - justify-content: center; padding-right: 30px; padding-left: 30px; } +@media print, screen and (min-width: 55.625em) { + .presenter-list { + justify-content: center; + } +} .presenter-list-block { padding-right: 0.4807692308rem; @@ -8697,6 +8708,7 @@ blockquote cite { .photos-block { display: flex; flex-flow: row wrap; + justify-content: center; background: #D19FDD; } .photos-block-header { @@ -8709,6 +8721,12 @@ blockquote cite { } .photos-block .photo { flex: 1 0 auto; + background-position: center center; + background-repeat: no-repeat; + background-size: cover; +} +.photos-block .photo img { + visibility: hidden; } @media print, screen and (min-width: 55.625em) { .photos-block .photo { diff --git a/static/main.js b/static/main.js index 34e75e97..4892c5d8 100644 --- a/static/main.js +++ b/static/main.js @@ -176,7 +176,7 @@ var reloadCSS = require('_css_loader'); module.hot.dispose(reloadCSS); module.hot.accept(reloadCSS); -},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise-sky.svg":[["sunrise-sky.477fe0a2.svg","static/img/sunrise-sky.svg"],"static/img/sunrise-sky.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { +},{"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise-post-event.svg":[["sunrise-post-event.57537c5a.svg","static/img/sunrise-post-event.svg"],"static/img/sunrise-post-event.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-top.svg":[["full-crowd-top.ea70905e.svg","static/img/full-crowd-top.svg"],"static/img/full-crowd-top.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/full-crowd-bottom.svg":[["full-crowd-bottom.fc721d0e.svg","static/img/full-crowd-bottom.svg"],"static/img/full-crowd-bottom.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunrise.svg":[["sunrise.67d25221.svg","static/img/sunrise.svg"],"static/img/sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/sunset.svg":[["sunset.1e862d79.svg","static/img/sunset.svg"],"static/img/sunset.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunrise.svg":[["birds-sunrise.85ed01c4.svg","static/img/birds-sunrise.svg"],"static/img/birds-sunrise.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/boat.svg":[["boat.9412c0d4.svg","static/img/boat.svg"],"static/img/boat.svg"],"/Users/mtrythall/Projects/YupGup/2019.djangocon.us/static/img/birds-sunset.svg":[["birds-sunset.5f7d0724.svg","static/img/birds-sunset.svg"],"static/img/birds-sunset.svg"],"_css_loader":"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/src/builtins/css-loader.js"}],"../../../.nvm/versions/node/v10.11.0/lib/node_modules/parcel-bundler/node_modules/process/browser.js":[function(require,module,exports) { // shim for using process in browser var process = module.exports = {}; // cached from whatever global is present so that test runners that stub it @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "49805" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "63701" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); diff --git a/static/sunrise-post-event.57537c5a.svg b/static/sunrise-post-event.57537c5a.svg new file mode 100644 index 00000000..d95e6b53 --- /dev/null +++ b/static/sunrise-post-event.57537c5a.svg @@ -0,0 +1 @@ +sunrise-post-event \ No newline at end of file From 2903f7f77f8a64c5fe75b4fba534466d4a3b04e3 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Fri, 29 Mar 2019 11:08:35 -0400 Subject: [PATCH 12/17] Updates to recap page, better staging of content. --- _pages/recap.html | 4 ++-- _scss/layout/_recap.scss | 10 ++++++---- static/main.css | 10 ++++++---- static/main.js | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_pages/recap.html b/_pages/recap.html index d9f5d805..ffe230dc 100644 --- a/_pages/recap.html +++ b/_pages/recap.html @@ -250,9 +250,9 @@

Lots of Photos

{% for i in (1..8) %}
+ style="background-image: url(https://placeimg.com/1280/720/animals/{{ i }})">
{% endfor %} diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index 9c4d18d9..7e2c8e12 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -130,15 +130,16 @@ .photos-block { display: flex; flex-flow: row wrap; - justify-content: center; - background: $brand-color6; + justify-content: flex-start; + align-items: stretch; + background: $brand-color4; &-header { display: flex; flex-direction: column; justify-content: center; align-items: center; - padding: 1rem 2rem; + padding: 2rem; width: 100%; } @@ -146,7 +147,8 @@ flex: 1 0 auto; background-position: center center; background-repeat: no-repeat; - background-size: cover; + background-size: 101% 101%; + font-size: 0; } .photo img { diff --git a/static/main.css b/static/main.css index 7dc8efd4..43f6ba7f 100644 --- a/static/main.css +++ b/static/main.css @@ -8708,22 +8708,24 @@ blockquote cite { .photos-block { display: flex; flex-flow: row wrap; - justify-content: center; - background: #D19FDD; + justify-content: flex-start; + align-items: stretch; + background: #171D2F; } .photos-block-header { display: flex; flex-direction: column; justify-content: center; align-items: center; - padding: 1rem 2rem; + padding: 2rem; width: 100%; } .photos-block .photo { flex: 1 0 auto; background-position: center center; background-repeat: no-repeat; - background-size: cover; + background-size: 101% 101%; + font-size: 0; } .photos-block .photo img { visibility: hidden; diff --git a/static/main.js b/static/main.js index 4892c5d8..e17d2d14 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "63701" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "55905" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From 2f8b1ca7cb50bd6c321d96e607cf435d8adebe2d Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Fri, 29 Mar 2019 11:29:04 -0400 Subject: [PATCH 13/17] Reinstate lead gap --- _scss/base/_global.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/_scss/base/_global.scss b/_scss/base/_global.scss index e0d41e69..9781cfc1 100644 --- a/_scss/base/_global.scss +++ b/_scss/base/_global.scss @@ -14,6 +14,7 @@ li { } .lead { + margin-bottom: 2.5rem; font-weight: $global-weight-normal; @include breakpoint(medium) { From b860dc8b313c7504b82b7e0f9380e80384281f83 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Fri, 29 Mar 2019 11:33:34 -0400 Subject: [PATCH 14/17] Fixes photos on recap on mobile --- _scss/layout/_recap.scss | 1 + static/main.css | 2 ++ static/main.js | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index 7e2c8e12..3b56d2fd 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -145,6 +145,7 @@ .photo { flex: 1 0 auto; + max-width: 100%; background-position: center center; background-repeat: no-repeat; background-size: 101% 101%; diff --git a/static/main.css b/static/main.css index 43f6ba7f..70ff8b3c 100644 --- a/static/main.css +++ b/static/main.css @@ -7958,6 +7958,7 @@ li { } .lead { + margin-bottom: 2.5rem; font-weight: 400; } @media print, screen and (min-width: 55.625em) { @@ -8722,6 +8723,7 @@ blockquote cite { } .photos-block .photo { flex: 1 0 auto; + max-width: 100%; background-position: center center; background-repeat: no-repeat; background-size: 101% 101%; diff --git a/static/main.js b/static/main.js index e17d2d14..e504f8a9 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "55905" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "62692" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From d3d386a733227e6387fb29bd6f9289bda969be1f Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Fri, 29 Mar 2019 11:35:20 -0400 Subject: [PATCH 15/17] Photo block refinements --- _scss/layout/_recap.scss | 2 +- static/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index 3b56d2fd..7f9292d4 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -148,7 +148,7 @@ max-width: 100%; background-position: center center; background-repeat: no-repeat; - background-size: 101% 101%; + background-size: cover; font-size: 0; } diff --git a/static/main.css b/static/main.css index 70ff8b3c..200ed566 100644 --- a/static/main.css +++ b/static/main.css @@ -8726,7 +8726,7 @@ blockquote cite { max-width: 100%; background-position: center center; background-repeat: no-repeat; - background-size: 101% 101%; + background-size: cover; font-size: 0; } .photos-block .photo img { From 9f65f7f1931779674e1cc3fc64c11b5e433e8e39 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Wed, 3 Apr 2019 22:05:26 -0400 Subject: [PATCH 16/17] Updates with simple photo feature --- .../styleguide/photo-feature-example1.html | 10 ++++++++++ .../styleguide/photo-feature-example2.html | 9 +++++++++ _includes/styleguide/styleguide-nav.html | 3 +++ .../styleguide/styleguide-photo-feature.html | 20 +++++++++++++++++++ _pages/styleguide.html | 4 ++++ static/main.js | 2 +- 6 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 _includes/styleguide/photo-feature-example1.html create mode 100644 _includes/styleguide/photo-feature-example2.html create mode 100644 _includes/styleguide/styleguide-photo-feature.html diff --git a/_includes/styleguide/photo-feature-example1.html b/_includes/styleguide/photo-feature-example1.html new file mode 100644 index 00000000..35c33bd9 --- /dev/null +++ b/_includes/styleguide/photo-feature-example1.html @@ -0,0 +1,10 @@ +
+
+ +
+ +
+

Photo Feature Title

+

A few lines of text. If you just want to put a photo or some text side-by-side you can use this format. This uses the standard Foundation grid. On smaller displays, the photo will be on top. You can change this by changing the order of the two .column nodes.

+
+
diff --git a/_includes/styleguide/photo-feature-example2.html b/_includes/styleguide/photo-feature-example2.html new file mode 100644 index 00000000..e01dc63e --- /dev/null +++ b/_includes/styleguide/photo-feature-example2.html @@ -0,0 +1,9 @@ +
+
+ +
+ +
+ +
+
diff --git a/_includes/styleguide/styleguide-nav.html b/_includes/styleguide/styleguide-nav.html index 8abe48de..ca032935 100644 --- a/_includes/styleguide/styleguide-nav.html +++ b/_includes/styleguide/styleguide-nav.html @@ -25,6 +25,9 @@
  • Photo hero section
    • +
  • + Photo feature +
  • Profile card
    • diff --git a/_includes/styleguide/styleguide-photo-feature.html b/_includes/styleguide/styleguide-photo-feature.html new file mode 100644 index 00000000..02bbbd66 --- /dev/null +++ b/_includes/styleguide/styleguide-photo-feature.html @@ -0,0 +1,20 @@ +

    Photo Feature

    +

    This component is always two columns, relying on the default Foundation grid.

    + +{% highlight html %}{% include styleguide/photo-feature-example1.html %}{% endhighlight %} + +
    + {% include styleguide/photo-feature-example1.html %} +
    + +
    + +

    Collapsed, Two Images

    + +

    The collapsed version simply removes gutters between the two columns, which is ideal if you want two images of similar size to touch.

    + +{% highlight html %}{% include styleguide/photo-feature-example2.html %}{% endhighlight %} + +
    + {% include styleguide/photo-feature-example2.html %} +
    diff --git a/_pages/styleguide.html b/_pages/styleguide.html index 98ddd540..d5b0750e 100644 --- a/_pages/styleguide.html +++ b/_pages/styleguide.html @@ -48,6 +48,10 @@
    {% include styleguide/styleguide-profile.html %}
    + +
    + {% include styleguide/styleguide-photo-feature.html %} +
    diff --git a/static/main.js b/static/main.js index e504f8a9..7a4a8408 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "62692" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "62421" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data); From 192a807ac7e2d5e736f63a325f959e36276f47c4 Mon Sep 17 00:00:00 2001 From: Michael Trythall Date: Fri, 5 Apr 2019 17:36:39 -0400 Subject: [PATCH 17/17] Updates the styleguide to support more content around grid, dates, icons, etc --- _includes/schedule-session-full.html | 2 +- _includes/schedule-session.html | 2 +- _includes/styleguide/dates-example.html | 46 +++++++++++++ _includes/styleguide/icons-example1.html | 1 + _includes/styleguide/icons-example2.html | 24 +++++++ _includes/styleguide/icons-example3.html | 26 ++++++++ _includes/styleguide/icons-example4.html | 8 +++ _includes/styleguide/icons-example5.html | 8 +++ .../styleguide-building-blocks.html | 40 ++++++++++++ .../styleguide/styleguide-dates-section.html | 7 ++ _includes/styleguide/styleguide-icons.html | 52 +++++++++++++++ _includes/styleguide/styleguide-nav.html | 16 ++++- .../styleguide/styleguide-presenters.html | 27 ++++++++ .../styleguide/styleguide-typography.html | 9 +++ _includes/styleguide/typography-example.html | 24 +++++++ _layouts/post.html | 2 +- _pages/recap.html | 8 +-- _pages/styleguide.html | 20 +++++- _scss/layout/_recap.scss | 10 +-- _scss/module/_icons.scss | 39 +++++++++++ _scss/module/_schedule.scss | 6 +- _scss/styles.scss | 1 + static/main.css | 64 +++++++++++++++---- static/main.js | 2 +- 24 files changed, 411 insertions(+), 33 deletions(-) create mode 100644 _includes/styleguide/dates-example.html create mode 100644 _includes/styleguide/icons-example1.html create mode 100644 _includes/styleguide/icons-example2.html create mode 100644 _includes/styleguide/icons-example3.html create mode 100644 _includes/styleguide/icons-example4.html create mode 100644 _includes/styleguide/icons-example5.html create mode 100644 _includes/styleguide/styleguide-building-blocks.html create mode 100644 _includes/styleguide/styleguide-dates-section.html create mode 100644 _includes/styleguide/styleguide-presenters.html create mode 100644 _includes/styleguide/styleguide-typography.html create mode 100644 _includes/styleguide/typography-example.html create mode 100644 _scss/module/_icons.scss diff --git a/_includes/schedule-session-full.html b/_includes/schedule-session-full.html index 8c6b426d..527078a8 100644 --- a/_includes/schedule-session-full.html +++ b/_includes/schedule-session-full.html @@ -17,7 +17,7 @@

    {{ post.title }}

    {% if post.presenters %} {% for presenter in post.presenters %} -

    +

    {% if presenter.photo_url != blank %} {{ post.title }} {% endif %} {% if post.presenters %} {% for presenter in post.presenters %} -

    +

    {% if presenter.photo_url != blank %} +

    +
    +
    +
    +
    +
    Sept
    +
    22
    +
    +
    +
    +

    Tutorials

    +

    One day, numerous tutorials

    +
    +
    +
    +
    +
    +
    +
    +
    Sept
    +
    23-25
    +
    +
    +
    +

    Talks

    +

    Dozens of talks chosen by the community

    +
    +
    +
    +
    +
    +
    +
    +
    Sept
    +
    26-27
    +
    +
    +
    +

    Sprints

    +

    Team up to work on Django!

    +
    +
    +
    +
    + diff --git a/_includes/styleguide/icons-example1.html b/_includes/styleguide/icons-example1.html new file mode 100644 index 00000000..a1f78ca9 --- /dev/null +++ b/_includes/styleguide/icons-example1.html @@ -0,0 +1 @@ +A globe diff --git a/_includes/styleguide/icons-example2.html b/_includes/styleguide/icons-example2.html new file mode 100644 index 00000000..56248f57 --- /dev/null +++ b/_includes/styleguide/icons-example2.html @@ -0,0 +1,24 @@ +A dollar symbol + +A dollar symbol + +A dollar symbol + +A dollar symbol + +A dollar symbol diff --git a/_includes/styleguide/icons-example3.html b/_includes/styleguide/icons-example3.html new file mode 100644 index 00000000..1ea3fb3f --- /dev/null +++ b/_includes/styleguide/icons-example3.html @@ -0,0 +1,26 @@ +
    +
    + Hands +
    +
    + Heart +
    +
    + Program +
    +
    + People +
    +
    diff --git a/_includes/styleguide/icons-example4.html b/_includes/styleguide/icons-example4.html new file mode 100644 index 00000000..d6dd8746 --- /dev/null +++ b/_includes/styleguide/icons-example4.html @@ -0,0 +1,8 @@ +
    + Compass +

    DjangoCon US is a six-day international conference for the community by the community about the Django web framework, held each year in North America.

    +

    DjangoCon US has something for everyone, from the person who develops Django applications for a living to the person who just tinkers in their spare time. You'll discover details about a range of diverse applications that people from all over the world are building with Django, get a deeper understanding of concepts you’re already familiar with and discover new ways to use them, and have a lot of fun!

    +
    diff --git a/_includes/styleguide/icons-example5.html b/_includes/styleguide/icons-example5.html new file mode 100644 index 00000000..a5090a2d --- /dev/null +++ b/_includes/styleguide/icons-example5.html @@ -0,0 +1,8 @@ +
    + Megaphone +

    DjangoCon US is a six-day international conference for the community by the community about the Django web framework, held each year in North America.

    +

    DjangoCon US has something for everyone, from the person who develops Django applications for a living to the person who just tinkers in their spare time. You'll discover details about a range of diverse applications that people from all over the world are building with Django, get a deeper understanding of concepts you’re already familiar with and discover new ways to use them, and have a lot of fun!

    +
    diff --git a/_includes/styleguide/styleguide-building-blocks.html b/_includes/styleguide/styleguide-building-blocks.html new file mode 100644 index 00000000..47502f1b --- /dev/null +++ b/_includes/styleguide/styleguide-building-blocks.html @@ -0,0 +1,40 @@ +

    Building Blocks (Sections)

    + +

    Most sections of the site consist of block-like structures. These structures follow a similar format:

    + +{% highlight html %}
    +
    +
    + +
    +
    +
    {% endhighlight %} + +
    +
    +
    +
    + <!-- content here (but not really) --> +
    +
    +
    +
    + +

    By default, this doesn't do much except setup a full width grid and a single column. To learn more about the grid system, please see Foundation's docs on the Legacy Grid. However, there are a few helpful tips to keep in mind:

    + +
      +
    • The website uses a 12 column grid
      • +
    • The maximum width (as of 2019) is 1200px.
      • +
    • Always start the column class list with .column.
      • +
    • You'll generally want to focus on small, medium, and large sizes. You can determine a column's width by using .[size]-[column-width]. So for example, .medium-6 would create a 50% wide column on medium displays.
      • +
    • If you do not define a larger size, the previous size will be used. Example: .small-12 .medium-3 results in a column that is 1/4 wide (as 1/4 of 12 columns is 3)
      • +
    + +

    These building blocks can be themed using the classes outlined under Themed page sections. As these building blocks are meant to stack, you'll want to alternate between section themes.

    + +

    You can roll your own top and bottom padding by using the following classes:

    + +
      +
    • .v-pad-top - Handles top padding for small and large displays.
      • +
    • .v-pad-bottom - Handles bottom padding for small and large displays.
      • +
    diff --git a/_includes/styleguide/styleguide-dates-section.html b/_includes/styleguide/styleguide-dates-section.html new file mode 100644 index 00000000..71457aa9 --- /dev/null +++ b/_includes/styleguide/styleguide-dates-section.html @@ -0,0 +1,7 @@ +

    Dates Section

    + +{% highlight html %}{% include styleguide/dates-example.html %}{% endhighlight %} + +
    + {% include styleguide/dates-example.html %} +
    diff --git a/_includes/styleguide/styleguide-icons.html b/_includes/styleguide/styleguide-icons.html index e69de29b..611b208d 100644 --- a/_includes/styleguide/styleguide-icons.html +++ b/_includes/styleguide/styleguide-icons.html @@ -0,0 +1,52 @@ +

    Icons

    + +

    You can add icons in content by including them just like images. Because most icons are SVGs, they will likely expand to take up the full width available:

    + +{% highlight html %}{% include styleguide/icons-example1.html %}{% endhighlight %} + +
    + {% include styleguide/icons-example1.html %} +
    + +
    + +

    Sizing Icons

    + +

    Big, full width icons may not be preferred. There are two ways to size icons:

    + +
      +
    • Use the icon size classes: icon-small, icon-medium, icon-large, icon-xlarge, or icon-jumbo.
      • +
    • Put icons in the grid.
      • +
    + +{% highlight html %}{% include styleguide/icons-example2.html %}{% endhighlight %} + +
    + {% include styleguide/icons-example2.html %} +
    + +{% highlight html %}{% include styleguide/icons-example3.html %}{% endhighlight %} + +
    + {% include styleguide/icons-example3.html %} +
    + +
    + +

    Icons in Content

    + +

    You may wish to place an icon in or around content. Foundation provides some handy helpers for this: .float-left and .float-right. Because these use CSS floats, you'll need to wrap the float (or the container) in an element with the .clearfix class.

    + +

    NOTE: Blog posts have the .clearfix class added by default.

    + +{% highlight html %}{% include styleguide/icons-example4.html %}{% endhighlight %} + +
    + {% include styleguide/icons-example4.html %} +
    + +{% highlight html %}{% include styleguide/icons-example5.html %}{% endhighlight %} + +
    + {% include styleguide/icons-example5.html %} +
    diff --git a/_includes/styleguide/styleguide-nav.html b/_includes/styleguide/styleguide-nav.html index ca032935..0151263b 100644 --- a/_includes/styleguide/styleguide-nav.html +++ b/_includes/styleguide/styleguide-nav.html @@ -14,14 +14,18 @@
  • Logo files
    • - {% comment %}
  • - Icons + Typography +
    • +
  • + Building Blocks (Sections)
    • - {% endcomment %}
  • Themed page sections
    • +
  • + Icons +
  • Photo hero section
    • @@ -31,4 +35,10 @@
  • Profile card
    • +
  • + Presenters List +
    • +
  • + Dates Section +
    • diff --git a/_includes/styleguide/styleguide-presenters.html b/_includes/styleguide/styleguide-presenters.html new file mode 100644 index 00000000..f93e92b6 --- /dev/null +++ b/_includes/styleguide/styleguide-presenters.html @@ -0,0 +1,27 @@ +

    Presenters List

    + +

    The presenters list features a list of avatars and titles, meant for a list of speakers. Minimal information should be shown.

    + +{% highlight html %}
    +
    + + Presenter NameMajorly Cute Animal + + + +
    +
    {% endhighlight %} + +
    +
    + {% for i in (1..16) %} + {% assign adj = "Majorly Cute,Incredibly Cuddly,Awesomely Funny,Super Friendly" | split:"," %} + {% assign y = i | modulo: 4 %} + + Presenter Name + {{ adj[y] }} + Animal + + {% endfor %} +
    +
    diff --git a/_includes/styleguide/styleguide-typography.html b/_includes/styleguide/styleguide-typography.html new file mode 100644 index 00000000..42cd91f2 --- /dev/null +++ b/_includes/styleguide/styleguide-typography.html @@ -0,0 +1,9 @@ +

    Typography

    + +

    Foundation provides a series of typography helpers that may be useful when laying out content. These include helpers for alignment, sizing, and number formatting.

    + +{% highlight html %}{% include styleguide/typography-example.html %}{% endhighlight %} + +
    + {% include styleguide/typography-example.html %} +
    diff --git a/_includes/styleguide/typography-example.html b/_includes/styleguide/typography-example.html new file mode 100644 index 00000000..ba0b7c14 --- /dev/null +++ b/_includes/styleguide/typography-example.html @@ -0,0 +1,24 @@ +

    Heading Level 1

    +

    Heading Level 2

    +

    Heading Level 3

    +

    Heading Level 4

    +

    Heading Level 5

    +

    Heading Level 6

    + +

    DjangoCon US has something for everyone, from the person who develops Django applications for a living to the person who just tinkers in their spare time. You'll discover details about a range of diverse applications that people from all over the world are building with Django, get a deeper understanding of concepts you’re already familiar with and discover new ways to use them, and have a lot of fun!

    + +

    DjangoCon US has something for everyone, from the person who develops Django applications for a living to the person who just tinkers in their spare time. You'll discover details about a range of diverse applications that people from all over the world are building with Django, get a deeper understanding of concepts you’re already familiar with and discover new ways to use them, and have a lot of fun!

    + +
      +
    • Unordered List item 1
      • +
    • Unordered List item 2
      • +
    • Unordered List item 3
      • +
    • Unordered List item 4
      • +
    + +
      +
    1. Ordered List item 1
      2. +
    2. Ordered List item 2
      3. +
    3. Ordered List item 3
      4. +
    4. Ordered List item 4
      5. +
    diff --git a/_layouts/post.html b/_layouts/post.html index ea5d1b5d..64eea384 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -9,7 +9,7 @@

    {{ page.title }}

    -
    +
    {% if page.post_photo_url %} {{ post.title }} {% if post.presenters %} {% for presenter in post.presenters %} -

    +

    {% if presenter.photo_url != blank %} {{ post.title }} {% comment %} SPEAKERS {% endcomment %} -

    +

    All Sessions Performed by Amazing People

    -
    +
    {% for post in site.schedule %} {% if post.presenters %} {% for presenter in post.presenters %} {% if presenter.name %} + class="mini-profile-byline"> {% if presenter.photo_url != blank %} -
    - {% include styleguide/styleguide-icons.html %} +
    + {% include styleguide/styleguide-typography.html %} +
    + +
    + {% include styleguide/styleguide-building-blocks.html %}
    {% include styleguide/styleguide-themes.html %}
    +
    + {% include styleguide/styleguide-icons.html %} +
    +
    {% include styleguide/styleguide-hero.html %}
    @@ -52,6 +60,14 @@
    {% include styleguide/styleguide-photo-feature.html %}
    + +
    + {% include styleguide/styleguide-presenters.html %} +
    + +
    + {% include styleguide/styleguide-dates-section.html %} +
    diff --git a/_scss/layout/_recap.scss b/_scss/layout/_recap.scss index 7f9292d4..4a484353 100644 --- a/_scss/layout/_recap.scss +++ b/_scss/layout/_recap.scss @@ -88,7 +88,7 @@ } } -.presenter-list { +.mini-profile { display: flex; flex-flow: row wrap; // A little more padding than usual @@ -100,13 +100,13 @@ } } -.presenter-list-block { +.mini-profile-block { // TODO: Hacked padding padding-right: 0.4807692308rem; padding-left: 0.4807692308rem; - .presenter-list { - .presenter-byline { + .mini-profile-list { + .mini-profile-byline { display: inline-flex; margin: 0 1rem 2rem; } @@ -117,7 +117,7 @@ } @include breakpoint(medium) { - .presenter-byline { + .mini-profile-byline { margin: 0 1.5rem 2rem; } diff --git a/_scss/module/_icons.scss b/_scss/module/_icons.scss new file mode 100644 index 00000000..20a24d18 --- /dev/null +++ b/_scss/module/_icons.scss @@ -0,0 +1,39 @@ +.icon { + display: inline-block; + vertical-align: middle; +} + +.icon.float-left { + margin-right: 20px; + margin-bottom: 20px; +} + +.icon.float-right { + margin-bottom: 20px; + margin-left: 20px; +} + +.icon-small { + width: 24px; + height: 24; +} + +.icon-medium { + width: 48px; + height: 48px; +} + +.icon-large { + width: 64px; + height: 64px; +} + +.icon-xlarge { + width: 128px; + height: 128px; +} + +.icon-jumbo { + width: 256px; + height: 256px; +} diff --git a/_scss/module/_schedule.scss b/_scss/module/_schedule.scss index db847c67..e8683a22 100644 --- a/_scss/module/_schedule.scss +++ b/_scss/module/_schedule.scss @@ -52,7 +52,7 @@ color: $secondary-color; } - a:hover .byline { + a:hover .mini-profile-byline { color: $body-font-color; } @@ -90,7 +90,7 @@ display: block; } - .byline { + .mini-profile-byline { margin-top: $global-margin; padding-top: 0; } @@ -133,7 +133,7 @@ padding: ($global-margin * 1.75) $global-margin $global-margin; } -.presenter-byline { +.mini-profile-byline { display: flex; align-items: center; diff --git a/_scss/styles.scss b/_scss/styles.scss index 39f8dafb..8189dd9c 100644 --- a/_scss/styles.scss +++ b/_scss/styles.scss @@ -85,6 +85,7 @@ @import 'module/hamburger'; @import 'module/date-cards'; @import 'module/card-rows'; +@import 'module/icons'; @import 'module/presenters'; @import 'module/profile'; @import 'module/post-list'; diff --git a/static/main.css b/static/main.css index 200ed566..8e95d7de 100644 --- a/static/main.css +++ b/static/main.css @@ -8674,34 +8674,34 @@ blockquote cite { } } -.presenter-list { +.mini-profile { display: flex; flex-flow: row wrap; padding-right: 30px; padding-left: 30px; } @media print, screen and (min-width: 55.625em) { - .presenter-list { + .mini-profile { justify-content: center; } } -.presenter-list-block { +.mini-profile-block { padding-right: 0.4807692308rem; padding-left: 0.4807692308rem; } -.presenter-list-block .presenter-list .presenter-byline { +.mini-profile-block .mini-profile-list .mini-profile-byline { display: inline-flex; margin: 0 1rem 2rem; } -.presenter-list-block .presenter-list .avatar { +.mini-profile-block .mini-profile-list .avatar { max-width: 60px; } @media print, screen and (min-width: 55.625em) { - .presenter-list-block .presenter-byline { + .mini-profile-block .mini-profile-byline { margin: 0 1.5rem 2rem; } - .presenter-list-block .avatar { + .mini-profile-block .avatar { max-width: 80px; } } @@ -9278,6 +9278,46 @@ body.sunset .footer { text-align: center; } +.icon { + display: inline-block; + vertical-align: middle; +} + +.icon.float-left { + margin-right: 20px; + margin-bottom: 20px; +} + +.icon.float-right { + margin-bottom: 20px; + margin-left: 20px; +} + +.icon-small { + width: 24px; + height: 24; +} + +.icon-medium { + width: 48px; + height: 48px; +} + +.icon-large { + width: 64px; + height: 64px; +} + +.icon-xlarge { + width: 128px; + height: 128px; +} + +.icon-jumbo { + width: 256px; + height: 256px; +} + .presenters { margin-top: 2rem; } @@ -9396,7 +9436,7 @@ body.sunset .footer { .event a:hover .event-title { color: #703D76; } -.event a:hover .byline { +.event a:hover .mini-profile-byline { color: #1E1E1E; } .event .event-content { @@ -9429,7 +9469,7 @@ body.sunset .footer { .event.boxed .event-content { display: block; } -.event.boxed .byline { +.event.boxed .mini-profile-byline { margin-top: 1rem; padding-top: 0; } @@ -9466,7 +9506,7 @@ body.sunset .footer { padding: 1.75rem 1rem 1rem; } -.presenter-byline { +.mini-profile-byline { display: flex; align-items: center; margin-top: 30px; @@ -9474,10 +9514,10 @@ body.sunset .footer { line-height: 1.2; text-decoration: none; } -.presenter-byline + .presenter-byline { +.mini-profile-byline + .mini-profile-byline { margin-top: 0.5rem; } -.presenter-byline .avatar { +.mini-profile-byline .avatar { margin: 0 0.5em 0 0; max-width: 60px; border-radius: 50%; diff --git a/static/main.js b/static/main.js index 7a4a8408..20b9d80f 100644 --- a/static/main.js +++ b/static/main.js @@ -23562,7 +23562,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "62421" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "58539" + '/'); ws.onmessage = function (event) { var data = JSON.parse(event.data);