spina-conferences-primer_theme 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9332dab27a0db7ba980280a95c67f5277362a85b5786bd552a4ff9337b5a6f
-  data.tar.gz: 6cb511d37aecdd415ffc56576562d92a65c4d4c848e4e60dfba8eb94449dd2c9
+  metadata.gz: 44982318279af43da48830b7b35b8560608f21e5b55a6032e7b33e79bfb30cde
+  data.tar.gz: 965ac7a1dc323d5bf0edc8f4e3a2055629c7493382e30ffd63f81056170d9ded
 SHA512:
-  metadata.gz: e3fa1e8800cf378145d9a136919fa22c780231717f9af981eb73e7c741176158cab2e0975b719f94535a70fff986bf80aa83f71c37f64c0ca828528e0dbb6983
-  data.tar.gz: 1ed5d9d97805e85b5a9580b7b26ebdf65c7406ba3756bbf59b9631810f5e5ceac5091c5b601a5e486ba0f6629a530a706a53fd352746113fea758700dcfa0812
+  metadata.gz: 9589f32bcfa583311c9dd6f74c2803f5f8097467b9ff10ae383e853d8d93c5c9d3763dd476b4c9a32555be6a2a842de81521f72fd1aedaa2c194ea16faa3492e
+  data.tar.gz: 3c87d3ccab22659858b55597e29d1b16352bc0fdfb8f862ff3dc5e54477aa7896550ea71bbbbb88e207a7b1d41ee4128f2f6facb4e29bef972ded0120db46292

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

@@ -5,6 +5,28 @@
 @import "@primer/octicons"
 @import spina/conferences/primer_theme/custom_variables
 
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-normal
+  src: local("Inter"), local("Inter-Regular"), asset-url("@primer/css/fonts/Inter-Regular.woff") format("woff")
+  font-display: swap
+
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-semibold
+  src: local("Inter Medium"), local("Inter-Medium"), asset-url("@primer/css/fonts/Inter-Medium.woff") format("woff")
+  font-display: swap
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-bold
+  src: local("Inter Bold"), local("Inter-Bold"), asset-url("@primer/css/fonts/Inter-Bold.woff") format("woff")
+  font-display: swap
+
 .admin
   @import "spina/admin_editing"
   #admin_bar
@@ -15,3 +37,8 @@
 
 address
   font-style: normal
+
+#form_frame
+  border: none
+  width: 100%
+  height: 70vh

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

@@ -0,0 +1,9 @@
+- cache current_page do
+  = render(Primer::HeadingComponent.new) { current_page.title }
+
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+
+  - if content(:embed_url).present?
+    = render Primer::BoxComponent.new(mt: 4, col: 12) do
+      %iframe#form_frame{ src: content(:embed_url), allowfullscreen: true }

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

@@ -27,5 +27,8 @@
           - 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]
+          - else
+            = link_to t('.more_info'), Spina::Page.find_by(name: 'about').materialized_path,
+                      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/layouts/spina/conferences/primer_theme/presentations.html.haml

@@ -2,5 +2,5 @@
   = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
 = render template: 'layouts/spina/conferences/primer_theme/application',
-         locals: { author: current_account.name, description: @presentation.abstract.to_plain_text, title: @presentation.name,
+         locals: { author: current_account.name, description: @presentation.abstract.try(:to_plain_text), title: @presentation.name,
                    seo_title: @presentation.name }

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

@@ -1,9 +1,8 @@
 .Header.px-3.px-md-4.px-lg-5.flex-wrap.flex-lg-nowrap
   .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
   %details.details-reset.d-lg-none{ style: 'display: contents' }
-    %summary.Header-item
-      %button.Header-link.btn-link{ type: 'button' }
-        = render Primer::OcticonComponent.new('three-bars', height: 24)
+    %summary.Header-item.Header-link.btn-link
+      = render Primer::OcticonComponent.new('three-bars', height: 24)
     .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
       = render partial: 'mobile_navigation_items'
   = render partial: 'navigation_item', collection: main_navigation_items, cached: true

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

@@ -1,11 +1,11 @@
 .Header-item.position-relative.d-none.d-lg-flex
-  - if navigation_item.has_children?
+  - if navigation_item.has_children? && navigation_item.children.regular_pages.in_menu.live.sorted.any?
     %details.details-reset.details-overlay
       %summary.Header-link{ role: 'button', aria: { haspopup: 'menu' } }
         = navigation_item.menu_title
         = render Primer::OcticonComponent.new('chevron-down')
       %ul.dropdown-menu.dropdown-menu-sw
-        - navigation_item.children.each do |child|
+        - navigation_item.children.regular_pages.in_menu.live.sorted.each do |child|
           %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
   - elsif navigation_item.is_root?
     = link_to navigation_item.menu_title, navigation_item.materialized_path, class: %w[Header-link]

data/config/initializers/themes/conferences_primer_theme.rb

@@ -75,7 +75,7 @@
     name: 'committee_bios',
     title: 'Committee bios',
     part_type: 'Spina::Parts::Repeater',
-    parts: %w[name role bio profile_picture]
+    parts: %w[name institution role bio profile_picture]
   }, {
     name: 'sponsors',
     title: 'Sponsors',
@@ -158,6 +158,10 @@
     name: 'url',
     title: 'Link',
     part_type: 'Spina::Parts::Admin::Conferences::Url'
+  }, {
+    name: 'embed_url',
+    title: 'Form embed URL',
+    part_type: 'Spina::Parts::Admin::Conferences::Url'
   }]
 
   theme.view_templates = [{
@@ -184,6 +188,11 @@
     title: 'Events',
     description: 'Contains details of past and upcoming events',
     parts: %w[text events_list]
+  }, {
+    name: 'embedded_form',
+    title: 'Embedded form',
+    description: 'Contains an embedded form',
+    parts: %w[text embed_url]
   }, {
     name: 'show',
     title: 'Blank',

data/lib/spina/conferences/primer_theme/version.rb

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.35
+        version: 0.0.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.35
+        version: 0.0.37
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,7 @@ files:
 - app/helpers/spina/conferences/primer_theme/navigations_helper.rb
 - app/views/conferences_primer_theme/pages/about.html.haml
 - app/views/conferences_primer_theme/pages/committee.html.haml
+- app/views/conferences_primer_theme/pages/embedded_form.html.haml
 - app/views/conferences_primer_theme/pages/events.html.haml
 - app/views/conferences_primer_theme/pages/homepage.html.haml
 - app/views/conferences_primer_theme/pages/information.html.haml