Merge pull request #3040 from hellcp/fix-issues

Minor fixes to the previous pr

.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/*

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";

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

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)

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

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

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}"}