From 9fb26f880dc2eaaa0e62d2221223b6864cf0292f Mon Sep 17 00:00:00 2001
From: Sasi Olin <hel@lcp.world>
Date: Fri, 20 May 2022 16:09:31 +0200
Subject: [PATCH 1/3] Minor fixes

---
 .gitignore                                          |  2 ++
 app/assets/stylesheets/strap-on.scss                |  1 +
 app/views/conferences/_conference_details.html.haml |  4 ++--
 app/views/conferences/_social_media.haml            | 12 ++++++------
 app/views/devise/shared/_openid_links.html.haml     |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 924bac87..3d1ffb4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 config/application.rb
 config/config.yml
 config/secrets.yml
+config/master.key
+config/credentials.yml.enc
 /vendor/cache
 /vendor/cache-old
 /storage/*
diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss
index 2dc305e5..571161e6 100644
--- a/app/assets/stylesheets/strap-on.scss
+++ b/app/assets/stylesheets/strap-on.scss
@@ -18,6 +18,7 @@ $navbar-default-link-hover-color: #000000;
 // Reset and dependencies
 @import "bootstrap/normalize";
 @import "bootstrap/print";
+@import "bootstrap/glyphicons";
 
 // Core CSS
 @import "bootstrap/scaffolding";
diff --git a/app/views/conferences/_conference_details.html.haml b/app/views/conferences/_conference_details.html.haml
index 80bb268b..a79d31e1 100644
--- a/app/views/conferences/_conference_details.html.haml
+++ b/app/views/conferences/_conference_details.html.haml
@@ -12,10 +12,10 @@
               = date_string(conference.start_date, conference.end_date)
           - if conference.venue
             %p
-              >= conference.city
+              %span>= conference.city
               - if conference.city and conference.country_name
                 \/
-              >= conference.country_name
+              %span>= conference.country_name
           - unless conference.description.blank?
             %p
               = markdown(conference.description)
diff --git a/app/views/conferences/_social_media.haml b/app/views/conferences/_social_media.haml
index 474d8814..672a19cd 100644
--- a/app/views/conferences/_social_media.haml
+++ b/app/views/conferences/_social_media.haml
@@ -8,22 +8,22 @@
               %i.fa-solid.fa-square-rss.fa-4x
           - if contact.facebook?
             = link_to "#{ contact.facebook }" do
-              %i.fa-brand.fa-facebook.fa-4x
+              %i.fa-brands.fa-facebook.fa-4x
           - if contact.twitter?
             = link_to "#{ contact.twitter }" do
-              %i.fa-brand.fa-twitter.fa-4x
+              %i.fa-brands.fa-twitter.fa-4x
           - if contact.instagram?
             = link_to "#{ contact.instagram }" do
-              %i.fa-brand.fa-instagram.fa-4x
+              %i.fa-brands.fa-instagram.fa-4x
           - if contact.googleplus?
             = link_to "#{ contact.googleplus }" do
-              %i.fa-brand.fa-google-plus.fa-4x
+              %i.fa-brands.fa-google-plus.fa-4x
           - if contact.mastodon?
             = link_to "#{ contact.mastodon }" do
-              %i.fa-brand.fa-mastodon.fa-4x
+              %i.fa-brands.fa-mastodon.fa-4x
           - if contact.youtube?
             = link_to "#{ contact.youtube }" do
-              %i.fa-brand.fa-youtube.fa-4x
+              %i.fa-brands.fa-youtube.fa-4x
           - if contact.email?
             = mail_to "#{ contact.email }" do
               %i.fa-solid.fa-envelope.fa-4x
diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml
index 9dcd51a6..2b3ba8dc 100644
--- a/app/views/devise/shared/_openid_links.html.haml
+++ b/app/views/devise/shared/_openid_links.html.haml
@@ -5,4 +5,4 @@
                                                         id: "omniauth-#{provider}",
                                                         title: "Your #{provider} login",
                                                         method: :post do
-        %i{class: "fa-brand fa-#{provider}"}
+        %i{class: "fa-brands fa-#{provider}"}

From f28f1fd9b316ab26e58d22b7a6327f5623a80881 Mon Sep 17 00:00:00 2001
From: Sasi Olin <hel@lcp.world>
Date: Fri, 20 May 2022 16:25:38 +0200
Subject: [PATCH 2/3] Fix venue information city/country display

---
 app/views/conferences/_venue.haml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/conferences/_venue.haml b/app/views/conferences/_venue.haml
index b280b741..f25851c1 100644
--- a/app/views/conferences/_venue.haml
+++ b/app/views/conferences/_venue.haml
@@ -28,9 +28,10 @@
                   = markdown(venue.description)
           .col-md-6
             %h2
-              = venue.city
-              \/
-              = venue.country_name
+              %span>= venue.city
+              - if conference.city and conference.country_name
+                \/
+              %span>= venue.country_name
             %address
               = venue.street
               %br

From 45c57eb76e4c0f014c1ced2a3ad47a6c6e7268e3 Mon Sep 17 00:00:00 2001
From: Sasi Olin <hel@lcp.world>
Date: Sun, 22 May 2022 00:50:49 +0200
Subject: [PATCH 3/3] Fix missing fa-stacked-icon function

---
 app/views/conference_registrations/show.html.haml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/conference_registrations/show.html.haml b/app/views/conference_registrations/show.html.haml
index 57ccb5d7..c419d535 100644
--- a/app/views/conference_registrations/show.html.haml
+++ b/app/views/conference_registrations/show.html.haml
@@ -17,7 +17,11 @@
   - unless @conference.code_of_conduct.blank?
     .row
       .col-md-12
-        %h4= fa_stacked_icon 'handshake-o', base: 'square-dashed', text: 'Code of Conduct'
+        %h4
+          .fa-stack
+            .fa-solid.fa-square-dashed
+            .fa-solid.fa-handshake
+          Code of Conduct
         %ul.fa-ul
           - if @registration.accepted_code_of_conduct
             %li.text-info