gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3035 from hellcp/fontawesome6

Browse source 
Migrate to fontawesome 6
This commit is contained in:
Henne Vogelsang 2022-05-20 14:25:56 +02:00 • committed by GitHub
commit c052f59b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 153 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/conferences/_code_of_conduct.haml
View file

@ -10,7 +10,7 @@
.modal-content
.modal-header
%button.close{ data: { dismiss: 'modal' } }
%i.fa.fa-close
%i.fa-solid.fa-xmark
%h3.modal-title Code of Conduct
.modal-body
= markdown organization.code_of_conduct

2
app/views/conferences/_footer.haml
View file

@ -1,6 +1,6 @@
.scroll-top-wrapper
= link_to "#banner", class: "smoothscroll" do
%i.fa.fa-2x.fa-arrow-circle-up
%i.fa-solid.fa-2x.fa-circle-arrow-up
:javascript
$(function(){

4
app/views/conferences/_gallery.html.haml
View file

@ -9,9 +9,9 @@
<!-- Controls -->
%a{ class: "left carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "prev" }
%span.fa.fa-chevron-left
%span.fa-solid.fa-chevron-left
%a{ class: "right carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "next" }
%span.fa.fa-chevron-right
%span.fa-solid.fa-chevron-right
:javascript

4
app/views/conferences/_lodging.haml
View file

@ -31,9 +31,9 @@
%p.text-center
- if lodging.website_link.present?
= link_to(lodging.website_link, class: 'thumbnail') do
%i.fa.fa-home.fa-5x
%i.fa-solid.fa-house.fa-5x
- else
%i.fa.fa-home.fa-5x
%i.fa-solid.fa-house.fa-5x
.caption
%h3.text-center
= lodging.name

2
app/views/conferences/_modal_description.haml
View file

@ -5,7 +5,7 @@
.modal-content
.modal-header
%button.close{ data: { dismiss: 'modal' } }
%i.fa.fa-close
%i.fa-solid.fa-xmark
%h3.modal-title
= object.try(:title) || object.try(:name)
.modal-body

16
app/views/conferences/_social_media.haml
View file

@ -5,25 +5,25 @@
.col-md-12.text-center
- if contact.blog?
= link_to "#{ contact.blog }" do
%i.fa.fa-rss-square.fa-4x
%i.fa-solid.fa-square-rss.fa-4x
- if contact.facebook?
= link_to "#{ contact.facebook }" do
%i.fa.fa-facebook-square.fa-4x
%i.fa-brand.fa-facebook.fa-4x
- if contact.twitter?
= link_to "#{ contact.twitter }" do
%i.fa.fa-twitter.fa-4x
%i.fa-brand.fa-twitter.fa-4x
- if contact.instagram?
= link_to "#{ contact.instagram }" do
%i.fa.fa-instagram.fa-4x
%i.fa-brand.fa-instagram.fa-4x
- if contact.googleplus?
= link_to "#{ contact.googleplus }" do
%i.fa.fa-google-plus-square.fa-4x
%i.fa-brand.fa-google-plus.fa-4x
- if contact.mastodon?
= link_to "#{ contact.mastodon }" do
%i.fa.icon-mastodon.fa-4x
%i.fa-brand.fa-mastodon.fa-4x
- if contact.youtube?
= link_to "#{ contact.youtube }" do
%i.fa.fa-youtube.fa-4x
%i.fa-brand.fa-youtube.fa-4x
- if contact.email?
= mail_to "#{ contact.email }" do
%i.fa.fa-envelope-o.fa-4x
%i.fa-solid.fa-envelope.fa-4x

2
app/views/conferences/_tickets.haml
View file

@ -21,5 +21,5 @@
.word_break
= markdown(ticket.description)
%button.btn-block.btn.btn-lg.btn-success
%i.fa.fa-ticket.fa-fw
%i.fa-solid.fa-ticket.fa-fw
= humanized_money_with_symbol(ticket.price)

2
app/views/conferences/_venue.haml
View file

@ -20,7 +20,7 @@
title: venue.name, class: "img-responsive"
- else
%p.text-center
%span.fa.fa-university.fa-5x
%span.fa-solid.fa-building-columns.fa-5x
.caption
%h3.text-center
= venue.name

4
app/views/conferences/index.html.haml
View file

@ -13,8 +13,8 @@
Older conferences
%span.notranslate
= "(#{@antiquated.count})"
%i.fa.fa-chevron-right
%i.fa.fa-chevron-down{ style: 'display: none' }
%i.fa-solid.fa-chevron-right
%i.fa-solid.fa-chevron-down{ style: 'display: none' }
#antiquated.collapse
- @antiquated.each do |conference|
= render '/conferences/conference_details', conference: conference