assets_shared

@@ -1 +1 @@
-Subproject commit acd238dcfa43a379b02411dde2db07c994066b43
+Subproject commit 8fc7eb32ce9b0c9ecbaa07ff3232cc8c6cdebe21

conference_main/static/conference_main/styles/_attendee.sass

@@ -20,7 +20,7 @@
 
 .attendee
   align-items: center
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
   display: flex
   flex-direction: column
   justify-content: space-between
@@ -58,7 +58,7 @@
   +margin(1, y)
 
 .attendee-company
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
   font-size: var(--fs-sm)
   line-height: 1
 
@@ -85,7 +85,9 @@
       --attendee-portrait-size: 110px
       --fs-lg: clamp(1.2rem, 1.5vw + 1rem, 18px)
 
-  &.size-lg
+  // Class '-large' is immutable
+  &.size-lg,
+  &.size-large
     --attendee-portrait-size: 15.0rem
 
     +media-sm

conference_main/static/conference_main/styles/_event.sass

@@ -39,7 +39,7 @@
 		+padding(3)
 
 	summary
-		color: var(--text-color-secondary)
+		color: var(--color-text-secondary)
 		+fw-normal
 		padding-right: 0
 

conference_main/static/conference_main/styles/_footer.sass

@@ -6,7 +6,7 @@ footer
 
 .navbar-footer
 	align-items: center
-	color: var(--text-color-secondary)
+	color: var(--color-text-secondary)
 	display: flex
 	flex-direction: column
 	justify-content: space-between
@@ -44,13 +44,13 @@ footer
 		flex: 1
 
 	.btn
-		color: var(--text-color-secondary)
+		color: var(--color-text-secondary)
 		+fw-normal
 
 .footer-logo
 	margin-top: -.2rem
 
 	svg
-		fill: var(--text-color-tertiary)
+		fill: var(--color-text-tertiary)
 		height: auto
 		max-width: var(--spacer-5)

conference_main/static/conference_main/styles/_schedule.sass

@@ -12,6 +12,11 @@ $col-time-width: 8%
   @extend .container-fluid
   background-color: var(--color-bg-primary)
 
+  .btn-toggle
+    &.is-active
+      @extend .btn
+      @extend .btn-primary
+
   +media-xs
     +padding(0, y)
 
@@ -31,7 +36,7 @@ $col-time-width: 8%
       border-radius: var(--border-radius)
 
 .schedule-filter-title
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
   font-size: var(--fs-sm)
 
 .schedule-filters
@@ -546,7 +551,7 @@ body.is-scrolled
   width: 100%
 
 .event-header
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
   display: flex
   flex-wrap: wrap
   font-size: var(--fs-sm)
@@ -588,10 +593,10 @@ body.is-scrolled
     width: 1.2rem
 
 .event-speakers
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
 
 .event-tags
-  color: var(--text-color-secondary)
+  color: var(--color-text-secondary)
   gap: var(--spacer)
 
 .event-category

conference_main/static/conference_main/styles/_sponsors.sass

@@ -10,7 +10,7 @@
   text-align: center
 
   p
-    color: var(--text-color-secondary)
+    color: var(--color-text-secondary)
     max-width: 500px
     +margin(auto, x)
     +margin(4, bottom)

conference_main/static/conference_main/styles/main.sass

@@ -156,7 +156,7 @@ button.going-star
 	// needed because CSS only has a preceded by selector whereas we need a
 	// succeeded by selector to show shadow for all preceding stars.
 	display: inline-flex
-	color: #f5cc27 !important
+	color: var(--color-text-secondary) !important
 
 	@for $i from 1 through 5
 		.vote-star[data-rating="#{$i}"]

conference_main/templates/conference_main/base.pug

@@ -23,6 +23,7 @@
 			.hero-subtitle.mx-auto.text-center {{ edition.location }}
 			{% endif %}
 
+	{% if edition.header %}
 	.hero-bg(style="background-image: url({{ edition.header.url }}); background-position-y: 50%")
 	// TODO: @back-end make '.hero-overlay' optional
 	// .hero-overlay

conference_main/templates/conference_main/presentations/review.pug

@@ -68,32 +68,31 @@ meta(name='twitter:image', content='{{request.scheme}}://{{request.META.HTTP_HOS
         | {% endif %}
 
         .row
-          | {% if object.picture and not object.recording %}
+            | {% if object.picture and not object.recording %}
-          .col-md-3
+            .col-md-3
-            | {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
+              | {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
-            a(href="{{ picture.url }}")
+              a(href="{{ picture.url }}")
-              img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
+                img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
-            | {% endthumbnail %}
+              | {% endthumbnail %}
-          | {% endif %}
+            | {% endif %}
 
-              div(class="col-md-{% if object.picture and not object.recording %}9{% else %}12{% endif %}")
+            div(class="col-md-{% if object.picture and not object.recording %}9{% else %}12{% endif %}")
+              h3.mb-3 {{ object.name }}
 
-            h3.mb-3 {{ object.name }}
+              | {% if object.description %}
+              div {{ object.description | urlizetrunc:40 | linebreaks }}
+              | {% endif %}
 
-                | {% if object.description %}
+              .event-tags
-                div {{ object.description | urlizetrunc:40 | linebreaks }}
+                | {% if event.tags.all %}
+                | {% for tag in event.tags.all %}
+                .badge.badge-secondary.badge-sm(title="{{ tag.name }}")
+                  | {{ tag.name }}
+                | {% endfor %}
+                | {% else %}
+                small No tags set yet.
                 | {% endif %}
 
-                .event-tags
-                  | {% if event.tags.all %}
-                  | {% for tag in event.tags.all %}
-                  .badge.badge-secondary.badge-sm(title="{{ tag.name }}")
-                    | {{ tag.name }}
-                  | {% endfor %}
-                  | {% else %}
-                  small No tags set yet.
-                  | {% endif %}
-
       | {% if object.proposal %}
       .row.mb-4
         .col-md-12
@@ -129,7 +128,7 @@ meta(name='twitter:image', content='{{request.scheme}}://{{request.META.HTTP_HOS
                   | {% endif %}
                   | {% endif %}
 
-                .row
+                .ps-0.row
                   .col-md-12
                     | {% include 'conference_main/components/attendee.pug' with profile=speaker size="medium" show_links=True show_admin=True is_landscape=True %}
 
@@ -146,7 +145,7 @@ meta(name='twitter:image', content='{{request.scheme}}://{{request.META.HTTP_HOS
 
                 | {% if request.user.is_superuser %}
                 | {% if speaker.other_events %}
-                h5.pt-4.mb-0.text-muted SESSIONS
+                h5.ps-0.pt-4.mb-0.text-muted SESSIONS
 
                 table.mb-2
                   tbody

conference_main/templates/conference_main/profile/detail.pug

@@ -13,7 +13,7 @@
 
       .col-sm-9
         | {% if profile.bio %}
-        .lead.pt-3 {{ profile.bio|linebreaks|urlizetrunc:80 }}
+        .pt-3 {{ profile.bio|linebreaks|urlizetrunc:80 }}
 
         | {% elif request.user.id == profile.id %}
         .lead.text-muted