spina-conferences-primer_theme 0.1.15 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053a0eb11e7ced4282502df407443f30da98f6efd1499a9800aa3aeff8ca6b13
-  data.tar.gz: '08d5f2ccb2616cb2d58b153b2bbb00af4e5ee1e7ce45e4c44e04661c72241c8e'
+  metadata.gz: 936083c4293cbc611194be98f61919d3ebafb7fba30657fe953a03b0168b95ef
+  data.tar.gz: c278c8c41ec3a012cc6a4e5c6b66c233459b0e3fe3e4a11841f2f2f72e916f1b
 SHA512:
-  metadata.gz: 319dac2e50330a0cdfd3faa9f897341f02eee1651825d45a5f917837c7da88d4b0ef223018fe1a23fab54d55fd02d71a7a8f5acf4f4fa0d2b5d0c3bcfe7cd462
-  data.tar.gz: 35e652f094562c9032877ce59782870fd5211e62cf4b2655f67eac1a4c47873f23480fef0fda1c202b32d693fe0ceb632544d88a6550d3fc253139a037d49d07
+  metadata.gz: f3bb1a5ffa62d39071a3afc7d871781e4be937a73e6e860dfed3bd09bd1c63fe776aa705b09b7b83adeeca5bc6865470571ccc9826550891465054ca454e9114
+  data.tar.gz: 10a589d62195e08be32b6300842f92ff39dea79ec27d18015c1e2d9bc0bf41f06ef67256c8ab5015d80be0be8de91b1530522a4d931d90296e47c33199fec72f

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -4,6 +4,5 @@
 
 //= link @github/details-dialog-element/dist/index.js
 //= link @github/include-fragment-element/dist/index.js
-//= link @github/tab-container-element/dist/index.js
 //= link @github/filter-input-element/dist/index.js
 //= link @github/details-menu-element/dist/index.js

data/app/assets/stylesheets/spina/conferences/primer_theme/application.sass

@@ -1,13 +1,17 @@
+@import "@github/details-dialog-element/dist"
+
 @import spina/conferences/primer_theme/custom
+@import "@primer/css"
+@import "@primer/octicons"
+@import spina/conferences/primer_theme/custom_variables
+
+.admin
+  @import "spina/admin_editing"
+  #admin_bar
+    font-family: 'Metropolis', sans-serif
 
-@import primer
-@import github
-@import turbolinks
-@import admin
+.turbo-progress-bar
+  background-color: white
 
-img
-  max-width: 100%
-  object-fit: cover
-  object-position: center
 address
   font-style: normal

data/app/controllers/spina/conferences/primer_theme/conferences_controller.rb

@@ -25,6 +25,7 @@ module Spina
                                                                 presentation_types: [:translations],
                                                                 presentations: [session: [:room], presenters: [:institution]])
                                                       .find(params[:id])
+          @conference.view_context = view_context
         rescue ActiveRecord::RecordNotFound
           send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
         end
@@ -42,7 +43,11 @@ module Spina
         end
 
         def set_presentations
-          @presentations = @presentation_type.present? ? @presentation_type.presentations : @conference.presentations
+          @presentations = if @presentation_type.present?
+                             @presentation_type.presentations.page(params[:page]).per(15)
+                           else
+                             @conference.presentations.page(params[:page]).per(15)
+                           end
         end
 
         def set_breadcrumb

data/app/helpers/spina/conferences/primer_theme/application_helper.rb

@@ -7,8 +7,9 @@ module Spina
       module ApplicationHelper
         include Spina::PagesHelper
 
-        def latest_conference
-          Spina::Admin::Conferences::Conference.sorted.first
+        # Because the upper bound is exclusive a conference is current the day after it ends
+        def current_conference
+          Spina::Admin::Conferences::Conference.order(dates: :asc).find_by('upper(dates) >= ?', Date.today)
         end
 
         def ancestors
@@ -22,18 +23,6 @@ module Spina
           end
         end
 
-        def partable_for(*part_names, parent: current_page)
-          association = case parent
-                        when Spina::Page then :page_partable
-                        when Spina::StructureItem then :structure_partable
-                        when Spina::Account then :layout_partable
-                        else :partable
-                        end
-          parts = parent.parts.where(name: part_names)
-          partables = parts.collect { |part| part.try(association) }
-          [*parts, *partables]
-        end
-
         def calendar(name:, &block)
           # noinspection SpellCheckingInspection
           block ||= proc { '' }

data/app/views/conferences_primer_theme/pages/about.html.haml

@@ -1,22 +1,92 @@
 - cache current_page do
-  %h1= current_page.title
+  = render(Primer::HeadingComponent.new) { current_page.title }
+
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+  - if content(:contact).present?
+    = render Primer::SubheadComponent.new(mt: 4) do |component|
+      = component.heading { t :'.contact.title' }
+    = render(Primer::MarkdownComponent.new) { content.html(:contact) }
 
-  - cache partable_for(:text) do
-    - if has_content? :text
-      .mt-4= render partial: 'text', object: content(:text)
-  - cache partable_for(:contact) do
-    - if has_content? :contact
-      .mt-4= render partial: 'contact', object: content(:contact)
   .clearfix.gutter
-    - cache partable_for(:constitution) do
-      .mt-4.col-12.col-md-6.float-md-left= render partial: 'constitution', object: content(:constitution)
-    - cache [partable_for(:minutes), content(:minutes)&.structure_items,
-             content(:minutes)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
-      .mt-4.col-12.col-md-6.float-md-left= render partial: 'minutes', object: content(:minutes)
-    - cache [partable_for(:documents), content(:documents)&.structure_items,
-             content(:documents)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
-      .mt-4.col-12.col-md-12.float-md-left= render partial: 'documents', object: content(:documents)
-  - cache [partable_for(:partner_societies), content(:partner_societies)&.structure_items,
-           content(:partner_societies)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
-    - if has_content?(:partner_societies) && content(:partner_societies).structure_items.any?
-      .mt-4= render partial: 'partner_societies', object: content(:partner_societies)
+    = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
+      = render Primer::SubheadComponent.new do |component|
+        = component.heading { t :'.constitution.title' }
+      - if content(:constitution).present?
+        = render Primer::FlexComponent.new(align_items: :center, py: 1) do
+          = render Primer::FlexItemComponent.new(flex_auto: true, pr: 1) do
+            = t :'.constitution.uploaded',
+                date: l(Spina::Attachment.find(content(:constitution).attachment_id).created_at.to_date, format: :long)
+          = render Primer::ButtonComponent.new(tag: :a, href: content.attachment_url(:constitution), ml: 2, download: '') do
+            = render Primer::OcticonComponent.new('desktop-download')
+            = t :'.constitution.download'
+      - else
+        = render Primer::BlankslateComponent.new(title: t(:'.constitution.no_constitution'), icon: 'law')
+
+    = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
+      = render Primer::SubheadComponent.new do |component|
+        = component.heading { t :'.minutes.title' }
+      - if content(:minutes).present?
+        %ul
+          - repeater :minutes do |minutes_entry|
+            %li.list-style-none.py-1.d-flex.flex-items-center
+              = render Primer::FlexItemComponent.new(flex_auto: true) do
+                - if minutes_entry.content(:date).present?
+                  = t(:'.minutes.minutes_for_html', date: time_tag(minutes_entry.content(:date)))
+                - else
+                  = t(:'.minutes.no_date')
+              - if minutes_entry.content(:attachment).present?
+                = render Primer::ButtonComponent.new(tag: :a, ml: 2, href: minutes_entry.content.attachment_url(:attachment),
+                                                     download: '') do
+                  = render Primer::OcticonComponent.new('desktop-download')
+                  = t(:'.minutes.download')
+              - else
+                = render(Primer::TextComponent.new(color: :text_secondary, font_size: 6)) { t :'.minutes.no_file' }
+      - else
+        = render Primer::BlankslateComponent.new(title: t(:'.minutes.no_minutes'), icon: 'file')
+
+    = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
+      - if content(:documents).present?
+        = render Primer::SubheadComponent.new do |component|
+          = component.heading { t :'.documents.title' }
+        %ul
+          - repeater :documents do |document|
+            %li.list-style-none.py-1.d-flex.flex-items-center
+              = render(Primer::TextComponent.new(tag: :div, flex: :auto)) { document.content(:name).presence ||  t(:'.documents.no_name') }
+              - if document.content(:attachment).present?
+                = render Primer::ButtonComponent.new(tag: :a, ml: 2, href: document.content.attachment_url(:attachment), download: '') do
+                  = render Primer::OcticonComponent.new('desktop-download')
+                  = t :'.documents.download'
+              - else
+                = render(Primer::TextComponent.new(tag: :div, font_size: 6, color: :text_secondary)) { t :'.documents.no_file' }
+
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
+    = component.heading { t :'.partner_societies.title' }
+  - if content(:partner_societies).present?
+    %ul
+      - repeater :partner_societies do |partner_society|
+        %li.list-style-none.py-4.border-bottom
+          = render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :start) do
+            = render Primer::BaseComponent.new(tag: :div, flex: :auto) do
+              = render Primer::HeadingComponent.new(tag: :h3, mb: 1) do
+                = render Primer::FlexComponent.new(flex_wrap: true, justify_content: :space_between) do
+                  - if partner_society.content(:name).present?
+                    = render(Primer::TextComponent.new(tag: :div)) { partner_society.content(:name) }
+                  = render Primer::ButtonGroupComponent.new(aria: { label: t(:'.partner_societies.contact_buttons') }) do |component|
+                    - if partner_society.content(:website).present?
+                      = component.button(tag: :a, href: partner_society.content(:website)) do
+                        = render Primer::OcticonComponent.new('browser')
+                        = t(:'.partner_societies.website')
+                    - if partner_society.content(:email_address).present?
+                      = component.button(tag: :a, href: "mailto:#{partner_society.content(:email_address)}") do
+                        = render Primer::OcticonComponent.new('mail')
+                        = t(:'.partner_societies.email')
+              - if partner_society.content(:description).present?
+                = render Primer::MarkdownComponent.new(color: :text_secondary) do
+                  = partner_society.content(:description).try(:html_safe)
+            - if partner_society.content(:logo).present?
+              = partner_society.content.image_tag(:logo, { resize_to_limit: [200, 150] }, size: nil, draggable: false,
+                                                  srcset: srcset(partner_society.content(:logo), variant: { resize_to_limit: [200, 150] }),
+                                                  class: %w[mt-4 mt-md-0 mr-md-4])
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.partner_societies.no_societies'), icon: 'organization')

data/app/views/conferences_primer_theme/pages/committee.html.haml

@@ -1,10 +1,42 @@
 - cache current_page do
-  %h1= current_page.title
-  
-  - cache partable_for(:text) do
-    - if has_content? :text
-      .mt-4= render partial: 'text', object: content(:text)
-  - cache [partable_for(:committee_bios), content(:committee_bios)&.structure_items,
-           content(:committee_bios)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
-    - if has_content?(:committee_bios) && content(:committee_bios).structure_items.any?
-      .mt-4= render partial: 'committee_bios', object: content(:committee_bios)
+  = render(Primer::HeadingComponent.new) { current_page.title }
+
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+
+  - if content(:committee_bios).present?
+    %ul.mt-4
+      - repeater(:committee_bios) do |committee_bio|
+        %li.list-style-none.py-4.border-bottom
+          = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
+            - if committee_bio.content(:profile_picture).present?
+              = render Primer::AvatarComponent.new(src: committee_bio.content.image_url(:profile_picture, resize_to_fill: [150, 150]),
+                                                   srcset: srcset_string(committee_bio.content(:profile_picture),
+                                                                         variant: { resize_to_fill: [150, 150] }),
+                                                   draggable: false, alt: committee_bio.content(:profile_picture).alt, size: 150,
+                                                   mr: [nil, nil, 3, nil], mb: [3, nil, 0, nil], flex_shrink: 0)
+            = render Primer::FlexItemComponent.new(flex_auto: true) do
+              = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], mb: 1) do
+                = render Primer::BoxComponent.new do
+                  - if committee_bio.content(:name).present?
+                    = render(Primer::HeadingComponent.new(tag: :h3)) do
+                      - if committee_bio.content(:role).present?
+                        = t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
+                      - else
+                        = committee_bio.content(:name)
+                  - if committee_bio.content(:institution).present?
+                    = render(Primer::HeadingComponent.new(tag: :h4)) { committee_bio.content(:institution) }
+                = render Primer::ButtonGroupComponent.new(mt: [1, nil, 0, nil], ml: [nil, nil, 1, nil],
+                                                          aria: { label: t(:'.contact_buttons') }) do |component|
+                  - if committee_bio.content(:twitter_profile).present?
+                    = component.button(tag: :a, href: committee_bio.content(:twitter_profile)) do
+                      = render Primer::OcticonComponent.new('link-external')
+                      = t(:'.twitter')
+                  - if committee_bio.content(:facebook_profile).present?
+                    = component.button(tag: :a, href: committee_bio.content(:facebook_profile)) do
+                      = render Primer::OcticonComponent.new('link-external')
+                      = t(:'.facebook')
+              - if committee_bio.content(:bio).present?
+                = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { committee_bio.content.html(:bio) }
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_bios'), icon: 'file')

data/app/views/conferences_primer_theme/pages/events.html.haml

@@ -1,12 +1,59 @@
 - cache current_page do
-  %h1= current_page.title
+  = render(Primer::HeadingComponent.new) { current_page.title }
 
-  - cache partable_for(:text) do
-    - if has_content? :text
-      .mt-4= render partial: 'text', object: content(:text)
-  - cache [partable_for(:events_list), content(:events_list)&.structure_items, 
-           content(:events_list)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
-    - if has_content?(:events_list) && content(:events_list).structure_items.any?
-      .mt-2= render partial: 'events_list', object: content(:events_list)
-    - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+
+  - if content(:events_list).present?
+    = render Primer::SubheadComponent.new(mt: 4) do |component|
+      = component.heading { t :'.upcoming' }
+    - content(:events_list).filter { |event| event.content(:start_time).blank? || event.content(:start_time) >= Time.now }.then do |events|
+      - if events.any?
+        %ul
+          - repeater(events) do |event|
+            %li.list-style-none.py-4.border-bottom
+              = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
+                - if event.content(:name).present?
+                  = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
+                = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
+                  - if event.content(:start_time).present?
+                    = t(:'.time_and_place_html',
+                        time: time_tag(event.content(:start_time), format: :ordinal_datetime_with_year),
+                        place: event.content(:location).presence || t('.location_tbc'))
+                  - else
+                    = t(:'.time_and_place_html', time: t('.time_tbc'), place: event.content(:location).presence || t('.location_tbc'))
+                - if event.content(:description).present?
+                  = render(Primer::TextComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
+                - if event.content(:url).present?
+                  = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
+                    = render Primer::OcticonComponent.new('link-external')
+                    = t :'.more_info'
+      - else
+        = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+    = render Primer::SubheadComponent.new(mt: 4) do |component|
+      = component.heading { t :'.past' }
+    - content(:events_list).filter { |event| event.content(:start_time).present? && event.content(:start_time) < Time.now }.then do |events|
+      - if events.any?
+        %ul
+          - repeater(events) do |event|
+            %li.list-style-none.py-4.border-bottom
+              = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
+                - if event.content(:name).present?
+                  = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
+                = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
+                  - if event.content(:start_time).present?
+                    = t(:'.time_and_place_html',
+                        time: time_tag(event.content(:start_time), format: :ordinal_datetime_with_year),
+                        place: event.content(:location).presence || t('.location_tbc'))
+                  - else
+                    = t(:'.time_and_place_html', time: t('.time_tbc'), place: event.content(:location).presence || t('.location_tbc'))
+                - if event.content(:description).present?
+                  = render(Primer::TextComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
+                - if event.content(:url).present?
+                  = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
+                    = render Primer::OcticonComponent.new('link-external')
+                    = t :'.more_info'
+      - else
+        = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')

data/app/views/conferences_primer_theme/pages/homepage.html.haml

@@ -1,5 +1,31 @@
 - content_for :hero do
-  - cache [current_page, partable_for(:gallery), latest_conference] do
-    = render partial: 'homepage_content',
-             layout: has_content?(:gallery) && content(:gallery).images.any? ? 'image_collection' : 'jumbotron',
-             locals: { conference: latest_conference, advance: true, image_collection: content(:gallery) }
+  - cache [current_page, current_conference] do
+    = render Primer::BoxComponent.new(position: :relative, style: 'height: 639px') do
+      = render Primer::BoxComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false,
+                                        style: 'background-color: var(--color-scale-blue-9)')
+      - if content(:gallery).present?
+        = render Primer::FlexComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false, style: 'z-index: 1',
+                                           flex_direction: :column, justify_content: :center, align_items: :center,
+                                           data: { controller: :slideshow, slideshow_incrementer: 0, slideshow_advance: true }) do
+          - content(:gallery).each_with_index do |image, index|
+            = content.image_tag(image, { resize_to_limit: [1680, 1680] }, draggable: false, hidden: index != 0,
+                                srcset: srcset(image, variant: { resize_to_limit: [1680, 1680] }),
+                                style: 'object-fit: cover; max-width: max-content; max-height: max-content',
+                                data: { slideshow_target: 'slide' }, class: %w[width-full height-full])
+      .container-lg.p-responsive.position-relative.color-text-white.height-full{ style: 'z-index: 2' }
+        = render Primer::BoxComponent.new(py: [3, nil, nil, 6]) do
+          %div{ style: 'text-shadow: 0 1px 1px #01040940, 0 1px 25px #010409bf;' }
+            - if current_conference.present?
+              = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) { current_conference.name }
+              = render Primer::TextComponent.new(tag: :address, classes: 'f2-light') do
+                = current_conference.institutions.collect(&:name).to_sentence
+              = render(Primer::TextComponent.new(tag: :time, classes: 'f2-light')) do
+                = t :'.dates_html', start_date: time_tag(current_conference.start_date, format: :day_and_month),
+                                    finish_date: time_tag(current_conference.finish_date, format: :day_and_month)
+            - else
+              = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) { Spina::Account.first.name }
+          - if current_conference.present? && current_conference.finish_date >= Date.today
+            = link_to t('.more_info'), frontend_conference_path(current_conference),
+                      class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3 mt-4]
+          %div{ style: 'text-shadow: 0 1px 1px rgba(var(--color-scale-black), 0.25), 0 1px 25px rgba(var(--color-scale-black), 0.75);' }
+            = render(Primer::MarkdownComponent.new(my: 4)) { content(:text).try(:html_safe) }

data/app/views/conferences_primer_theme/pages/information.html.haml

@@ -1,6 +1,5 @@
 - cache current_page do
-  %h1= current_page.title
-  
-  - cache partable_for(:text) do
-    - if has_content? :text
-      .mt-4= render partial: 'text', object: content(:text)
+  = render(Primer::HeadingComponent.new) { current_page.title }
+
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }

data/app/views/conferences_primer_theme/pages/show.html.haml

@@ -1,2 +1,2 @@
 - cache current_page do
-  %h1= current_page.title
+  = render(Primer::HeadingComponent.new) { current_page.title }

data/app/views/layouts/spina/conferences/primer_theme/application.html.haml

@@ -1,5 +1,5 @@
 !!!
-%html.height-full{ lang: I18n.locale }
+%html{ lang: I18n.locale, data: { color_mode: 'auto', light_theme: 'light', dark_theme: 'dark' } }
   %head
     %meta{ charset: 'utf-8' }
     %meta{ name: 'author', content: author }
@@ -18,21 +18,22 @@
     = javascript_include_tag 'turbo', type: 'module'
     %script{ type: 'module', src: asset_path('@github/details-dialog-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/include-fragment-element/dist/index.js') }
-    %script{ type: 'module', src: asset_path('@github/tab-container-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/filter-input-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/details-menu-element/dist/index.js') }
     = yield :head
   %body
-    .admin= render 'spina/shared/admin_bar'
+    - if current_spina_user.present?
+      .admin= render 'spina/shared/admin_bar'
     %header= render 'navigation'
     = render 'current_conference_alert'
+    - if content_for? :flash
+      .flash-messages= yield :flash
     %main
-      - if content_for? :flash
-        .flash-messages= yield :flash
       = yield :hero
       - if content_for? :breadcrumbs
         .container-lg.p-responsive.mt-4= yield :breadcrumbs
       = yield :header
       .container-lg.p-responsive.mt-4= yield
-    %footer.container-lg.p-responsive.py-4= render 'footer'
+    %footer
+      .container-lg.p-responsive.py-4= render 'footer'
     = render 'spina/shared/social'

data/app/views/spina/application/_cookies.html.haml

@@ -2,6 +2,6 @@
   - component.header do
     = button_tag(data: { 'close-dialog': true }, aria: { label: t(:'spina.close') }, type: 'button',
                  class: %w[Box-btn-octicon btn-octicon float-right]) do
-      = render Primer::OcticonComponent.new(icon: 'x')
+      = render Primer::OcticonComponent.new('x')
     .Box-title= t(:'.title')
   = component.body { }

data/app/views/spina/application/_current_conference_alert.html.haml

@@ -1,4 +1,4 @@
 - content_for :flash do
-  - cache partable_for(:current_conference_alert, parent: current_account) do
+  - cache current_account do
     - if current_account.has_content? :current_conference_alert
       = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert).html_safe }

data/app/views/spina/application/_footer.html.haml

@@ -9,7 +9,7 @@
     - if current_account.has_content? :github_url
       = render Primer::ButtonComponent.new(tag: :a, href: current_account.content(:github_url), button_type: :outline, variant: :small,
                                            display: :inline_block) do
-        = render Primer::OcticonComponent.new(icon: 'mark-github')
+        = render Primer::OcticonComponent.new('mark-github')
         = t :'.find_on_github'
-  = render(Primer::TextComponent.new(tag: :small, color: :gray, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
+  = render(Primer::TextComponent.new(tag: :small, color: :text_secondary, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
     = t :'.copyright', name: Spina::Account.first.name, year: Date.today.year