From d31233c0336ab3db6e0720ee6f28721e7b455d63 Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Wed, 18 May 2022 06:31:12 +0200 Subject: [PATCH] Migrate to fontawesome 6 --- Gemfile | 2 +- Gemfile.lock | 6 +-- app/assets/fonts/mastodon.eot | Bin 5796 -> 0 bytes app/assets/fonts/mastodon.otf | Bin 4068 -> 0 bytes app/assets/fonts/mastodon.svg | 14 ------ app/assets/fonts/mastodon.ttf | Bin 5628 -> 0 bytes app/assets/fonts/mastodon.woff | Bin 3204 -> 0 bytes app/assets/fonts/suse-icons.eot | Bin 1780 -> 0 bytes app/assets/fonts/suse-icons.svg | 11 ----- app/assets/fonts/suse-icons.ttf | Bin 1608 -> 0 bytes app/assets/fonts/suse-icons.woff | Bin 1192 -> 0 bytes app/assets/javascripts/osem-datatables.js | 2 +- app/assets/stylesheets/application.css | 2 - app/assets/stylesheets/mastodon.scss | 45 ----------------- app/assets/stylesheets/osem-dashboard.scss | 2 +- app/assets/stylesheets/osem-fonts.scss | 46 +----------------- app/assets/stylesheets/osem-splash.scss | 2 +- app/assets/stylesheets/strap-on.scss | 1 - app/helpers/format_helper.rb | 4 +- app/models/survey_question.rb | 2 +- app/views/admin/comments/index.html.haml | 6 +-- app/views/admin/conferences/index.html.haml | 12 ++--- app/views/admin/conferences/show.html.haml | 18 +++---- app/views/admin/events/_datatable_row.haml | 2 +- app/views/admin/events/index.html.haml | 2 +- .../admin/events/registrations.html.haml | 4 +- app/views/admin/lodgings/index.html.haml | 2 +- app/views/admin/organizations/index.html.haml | 2 +- app/views/admin/registrations/index.html.haml | 2 +- .../admin/sponsorship_levels/index.html.haml | 4 +- .../admin/survey_questions/_form.html.haml | 4 +- .../admin/surveys/_survey_question.html.haml | 2 +- .../surveys/_survey_question_title.html.haml | 6 +-- .../users/_event_registrations.html.haml | 4 +- app/views/application/_big_statistic.haml | 4 +- .../_registration_info.html.haml | 2 +- .../_tickets.html.haml | 2 +- .../conference_registrations/show.html.haml | 32 ++++++------ app/views/conferences/_code_of_conduct.haml | 2 +- app/views/conferences/_footer.haml | 2 +- app/views/conferences/_gallery.html.haml | 4 +- app/views/conferences/_lodging.haml | 4 +- app/views/conferences/_modal_description.haml | 2 +- app/views/conferences/_social_media.haml | 16 +++--- app/views/conferences/_tickets.haml | 2 +- app/views/conferences/_venue.haml | 2 +- app/views/conferences/index.html.haml | 4 +- .../_form_fields_openid.html.haml | 2 +- .../devise/shared/_openid_links.html.haml | 2 +- app/views/layouts/_admin_sidebar.html.haml | 34 ++++++------- .../layouts/_admin_sidebar_index.html.haml | 16 +++--- app/views/layouts/_navigation.html.haml | 6 +-- app/views/layouts/_user_menu.html.haml | 30 ++++++------ app/views/proposals/registrations.html.haml | 8 +-- app/views/proposals/show.html.haml | 2 +- app/views/schedules/_carousel.html.haml | 4 +- app/views/schedules/_event.html.haml | 6 +-- app/views/schedules/events.html.haml | 4 +- app/views/surveys/_list.html.haml | 4 +- app/views/surveys/show.html.haml | 2 +- app/views/tickets/index.html.haml | 2 +- app/views/tracks/index.html.haml | 8 +-- spec/features/surveys_spec.rb | 4 +- 63 files changed, 153 insertions(+), 268 deletions(-) delete mode 100755 app/assets/fonts/mastodon.eot delete mode 100755 app/assets/fonts/mastodon.otf delete mode 100755 app/assets/fonts/mastodon.svg delete mode 100755 app/assets/fonts/mastodon.ttf delete mode 100755 app/assets/fonts/mastodon.woff delete mode 100644 app/assets/fonts/suse-icons.eot delete mode 100644 app/assets/fonts/suse-icons.svg delete mode 100644 app/assets/fonts/suse-icons.ttf delete mode 100644 app/assets/fonts/suse-icons.woff delete mode 100755 app/assets/stylesheets/mastodon.scss diff --git a/Gemfile b/Gemfile index 6b63cfb8..30080b55 100644 --- a/Gemfile +++ b/Gemfile @@ -165,7 +165,7 @@ gem 'turbolinks' gem 'active_model_serializers' # as icon font -gem 'font-awesome-rails' +gem 'font-awesome-sass' # for markdown gem 'redcarpet' diff --git a/Gemfile.lock b/Gemfile.lock index 87fea156..5a945f18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,8 +227,8 @@ GEM fastimage (2.2.6) feature (1.4.0) ffi (1.15.5) - font-awesome-rails (4.7.0.8) - railties (>= 3.2, < 8.0) + font-awesome-sass (6.1.1) + sassc (~> 2.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) globalid (1.0.0) @@ -661,7 +661,7 @@ DEPENDENCIES factory_bot_rails faker feature - font-awesome-rails + font-awesome-sass geckodriver-helper gravtastic haml-rails diff --git a/app/assets/fonts/mastodon.eot b/app/assets/fonts/mastodon.eot deleted file mode 100755 index 59cd79abcb858d809fcb753eb4c4e1bffbd75b08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5796 zcmd^COKe-m6}|HwKN6{*W$P0$j)#7dY>AK5|6@m%8B&yN%Z{m!71Bv+K2y}kkwjIZ zQ#&b&qCgXabqhD^1}KUaXm>+71>B&EELyZF8lao(ilB=I@S@umD4Ik)_mR}kasmY1 z^-=H5nS0O7+`0G8M?Y^Q`mBLSkVgDy>-;iW-`x3@y@aT7hl@l17??WCOfqn=S>P%Pf=&6f$Kw?|x(yP|`z34xFh59e?ekc8UPP#t+;$K9Se}`T!tS_$S zfBYaxdnyZV%55{PTN&*uuGvX*R0jdhwqtHsQ(2X z|7bnCnLCrb9>(}Th5pR?MrQrf7XrT}YRIAfmOXb5oHI(=*!bmHs#&peYt%xp-hS9O zd$CwqUbLtJQq~CQSSuhAWpPqlZ6V@-|4-_YQB(d2gVk2U-o8t5MybCp*JZ&htuWXU~gm76F@H@219q-c4OcRoj7C1z|r9Ihk94f zSGSkX$3Oe@8AOPRC8G2gQNo^WuO(KXjlIuNk&iF0w7rkcn(}Kac<*PHPPgoRj8|nN zwd1fOTJ!Q*!%sbZveVZ9>cxI}mmVl#jofsugmuWrO4tE>xrCkMrP&g8L4KozJrux! zTkO+IN9i5jeI1n;=NA2N9r9oaJAluXu#+0al@fMAo-Sbz&56wt z_ENj}Fq&PzyRp2ul#{2U9kRE(XGq?>E3*(SuURY7x}96fZfwf1T*$8FGAk?DP&&K1 zYHjAS^VzlO%;N18YolB(mvfno&E@Qx>2=9ZIz_)1NKVzgLSviJ`Hxr_DT-Yv($y()8>b) z;)dCC~AytVT@=h5>&!eGPMv? znkna{`XH_x?bo+X3r{qbj!nOu@Ed+#J|R^+p75)1(kIn0qv2#y7K$WmUY&-hRFkTk z_1(<;AfAvgB5z6Mi6>H!NY;564Kf-``BKSb(x*fqnKTr|6PaW(sB}}tq;j-bFvuB= zCzR8OD3=j|`AH>GLFF(F*d^x+&YKa*n&RO6g+7*6dZ!=qsLabe`Yv=k+c2%EL@MsH zrjrRH32k^L0hNy@RT?>{oThR|16v54?HU)VM#O-NjfkbRn+r;$(Z6zb29?{CY@|1u ze&nE=puo&M{C-0yr(u@@152~o^AC1ZKR;y~D*A|HEG zNgs?XTdDLm!x}3N;eAST)rwYVyfd}EjjA|jjL4SPqsJ0{pW#n-`h%+4ENEIx&0AwZ zRbyfTQmU%xC7u_65lO0Qu1%v>japFEqMJI~B@!M;!)#R(P04&psv0;gsOrqg*+juH zKbCA&)fwYXP#rNRrxKGhMWN3R`B7V5Zx*OFdM#0?twsE-h^h^6k|K2@g)073?`WI338vcNz7yd_D`e`#C@T9N&pK)M-8|*s%Uge z2w`W#QIiU!#by(#)`-ZM@**ic7&sM?DGdMXx;lY>>mreSs!;C=sEvT{B;0fib2}Oc zss^(lxNL-w$AfrKGk`e6u{Ct(Pe1`Oe{6^3xx21B@Phap^^f+1X}& z`+|dJp;R55Q~^_U22>}Oi-}B~KuR6DUJPs4;JxZg8OWEQ3hu-}G%B-GiH2_5%b~qq z*{|v{<$!HxH#j2paHv@K{RHA77! zLDlzFRAg8h^nQeb8rx(@PVmZv3oqvL6UGE~f&}(#?0HzOeL^%G!}tT(LK>0%__Hah zG8)L_Lxz+idGs~7tCpc+AIgC~!ICP)i#a@%c&JHT`W|ZSdP_3G8(ampN{ojQjd3h3 zL~;K*!J-y{;!dtbQ}c$>qt-n37%gh~fKy2<%!6$#n1o%|7`KLf21XdiyinMqpua-~ zfg!vTI3LHP2J*-uPL@2D;}ZiTEFl%Z_+i^!oPcHTa&j416(KB=qKz+Lv%m(uld0wTeswBN z9F`bgC;QlMyswNH!#@9>c>9wj8zbzDvQwixe?NPkO)Sl0XUb!kazk-(;wZ;DJQ`9x zSc|cz$j7nQiepDrFE|sX>PK;by%vLCcrnd;0A^);^8)D;^sb=5{pT{G3$9cq>gMVi diff --git a/app/assets/fonts/mastodon.otf b/app/assets/fonts/mastodon.otf deleted file mode 100755 index 2d415249aba8713392bcbc0b37aca624f5f63afa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4068 zcmd^CeT-Dq6+ds@eC;m#A?vb87I-U^!kX^F#@5u>2F2ZND+WT}eNq3>ad-BM`B-NL zgo0rWR!CNYxYlN48(SpS+!<IEC+qBJDnJ!>SI453f~6Zb^XaiPtDre z%P=PMztj&!Y=NyHpTNDeKV8@oo1|v=dl~)8bYja8+3O)%^U*{ziF9)5ldtYWA2C7` zL)muSr0~mKilDql3v9-6>Uh^SU*%Q#v`2Ke#p8ss-LHmfk0o^!-M2ib^>w%FPe*8LPg{BMQC>wW&ydXrXJunJK`tj=?-@9pTJ)e|&fnOL^~ zgJexG``280{Y>wRlnP`EIG+mS5XI>CfowznULc1lj@Z7Z2vu220yzr(wSinoS6KT4 zxr*wokFXjmT!GM7cOY9-NBaXgL^X6ckZtJ4133)&cpyh;o>djdQL3}r0=ber>l=Yw zMa!(`X$@s*h_+IW2B?qvsXz`bhjs;??WmzubQPrAVd22iw;G@fC6EUP?Iz6VHzRrU zSL5zQF9U577AeTB)QvVxv?e>WH8;@LUvQSMS>d#=Ty>Rm`&K6l)j%eZauS;g{n=dJ zS?%;@GlgU-m2K_LVpoKi#lyCF)9MlDR}7*(1ryZ|-X^6ndTBTsG}=25EAJa@oOTcLBz- ze+Brsn%eODmpjp4C=6ZQ)^={5eHIBvnu2P)Mk>Yh!$6J00zdR8EM~OCJl_f|$%@V< z3~c{Dukr~~X_ha!JLj?}j0{><#hDT|r^A)g3u$_hHN7}A?by=|;rr%T-o5HE=A>BiQts2qYk=}R4Ut-mHXC2s(@0xD6*Ad zm7f4_?Xq^0EwMuOFDt5RPIXP~ZP>@;Xw4MXrJpd_%4KR(9#cp^&eSZDrAt3Xk?0cB zQmx}ZkBu-b*QI-zKBwHf5AI}Ih*^9>rY?XLAJ?TvcQDnfo9<$|M7i6TYK?`ss1yrh zTcO+?qw(#dk%5PqUr_FMnV;6BQRd%@T})>DTDg0>OzimXXcsg4N^h4KY36BhhDke_ z|G>P1`8B1s#kcQ_?11KkQp_KjaJtC+p#TB4$M0hPn=ZlleHlBhbzW>e=698gX>aS& z-2?YBzoJVc%zsjDJQ_Y$fqSX7AJ{ByqCq1CAzl-c}VL! z_cFf;&&=;>{g9+bV@t#@&6U+miroU4i!e-=i|({|iHc5ALzT)K8H+#m?FiF6iD?WQ zwcf=vUyME$^UFoT$idxyY57hT3;xrRq-I$%>EaUx)uWP*VUpB%Pf3Alzh(M-OX(p~ zeNtWszC@7LiHC*5^axX<_-RxMscV!nZWN=M7GG&f-5;J=KJ`EYs`*M7@!!Qsi(r38 zraQWn#xhX_NX3iF9brC-wmZnT*zilb6u;xPJAR5yct_T^Lb=^cm&(vl24o00ULu|3BrfE`htxD0dWPdxp2nhXfqXjSF!18Rda;FDUhIxoene z_$%o{@qRiE-)uOHtji_}tx*xEG%!SYd%hf0vf*!)IDb|b$2!b@{1bnfR_fv)(^qiR zFs+x(J|>%A<}%aQq#HH`t=v7R%5(YrLsQF-oaOPZi{Wvy%wY)z4oh8n;PG3^3wXTs zKjAPo?hJpK;yB;`s~i^gmuB%8Zw@JBaCx@0Y?#33rBW`RiO-+Jr*05F*UJ{3Y(b1V zNes$mtlWMuOb^J(uTcc=>mpic?lFwSdjY&ed$I*}@qr<5*$}RxM-DktXFCT2M;g+iKsEtn8HW3tov+Z24Lbtj!*5IcNRQy5rB6McxlVv<;CP9D}(n8 zcxh$X=L3(71mOLQ_&EG!%m(lI;6ajezynTzyDUY=<G1iZNGG+VPuZ{*OPyGHMr$#SUxr7f3dXq0>@J>^I!1DA6v(y TgYRDX);3T1vc=s@ONjmf)Ll4R diff --git a/app/assets/fonts/mastodon.svg b/app/assets/fonts/mastodon.svg deleted file mode 100755 index 8ea5bf6e..00000000 --- a/app/assets/fonts/mastodon.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - -Copyright (C) 2017 by original authors @ fontello.com - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/mastodon.ttf b/app/assets/fonts/mastodon.ttf deleted file mode 100755 index 60c8ad301a75b01a6e6e32dca987434abea9989f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5628 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 Ch}UEQ diff --git a/app/assets/fonts/mastodon.woff b/app/assets/fonts/mastodon.woff deleted file mode 100755 index 733653731186078c6fbc05d6c5c2e1d58e150c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3204 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 - - -Generated by Fontastic.me - - - - - - - diff --git a/app/assets/fonts/suse-icons.ttf b/app/assets/fonts/suse-icons.ttf deleted file mode 100644 index ef1de507623b002a83b416a9cab53e96b4b25b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1608 zcmdT^O>7fa5dLQW?ARM(BYW4V7A&T6C}2C;klhMZkhZ~*fCwb2sFi486`UW5*ijrL zdZ}8e;zq-%haQkx^-%THd)1#qRkd8W^w0wbxFR7qmqJ*2bMhzp?o)y_5{9dp^p$A8 zy0)=>gNt!3`HptsT5mbRXGGA|`niqh#wO0;3jMFs_PWtVr!{`(0AL&^_w{D4zm2nM zee+NHk3j8>a_jq>H!n}T@eFy51aNQg(Zd(ohAjgb(9R-p$8%z)nGnP()9zu!jDh#n z>2Rn(iMcsta)<`G4HH>8Co8lUQvD43@Tr<$j>U0t>iL{Xp1a7*-sprzDCa7 z+<(QY&i}_ych2J3CO0F)o8e#qi?~F-WYy}&13wc6?taNw8EdjBVUTfV{4fZEQxePu zbw#(NDU*)tgu!e`ROfT3Y?bSiR=MP!)ckU(HtTW@!zXK;P;y)u?A+bix%=hfUdQ!B zD->O&-l`VQv<_r7Lv+p14!u@e5*gPn&eV^ZqV3CB*{RzibN1mk%_FyJwQMnOi&HG* z^O{qTj>@<5{Oy8B&2=Y=njCa1-x}rdjF#2MOwG_8k)xt{dT1E?b&);oT-K~sH!JX7=JLuI{)~Y6dR2BCdDRK{XNAN`N!zvI;F!3*0GEpy0p;0-tRQl zmwR2}U3AK{bQ4 z-rq~p@cl;E@TaC3_p+q_sB?*RY%y#-uFhk2RS}jtTmAK3*PCwA_}3((Mv?q+$@fWc r@>U&Mb%puZ6m|wSEaE*Bc54o0$6ts2W7HAiJoi5M^|=bz-ADfdMESoq diff --git a/app/assets/fonts/suse-icons.woff b/app/assets/fonts/suse-icons.woff deleted file mode 100644 index 4ebb0dc1a24edad86e2666b825c9606ab6508448..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1192 zcmZXSdoWyA9LLW-?6O`! zCdiH&8^cV*YrUF8Td`}{(?5DOoe0m#3AFh+wH5D>ZA)6D+aVpoL-Xb zrgq=yq-1f%%k{0tBdc##Yp+!Wvo3m_6fPU+318Fpj?8B{Pp~+hDXH()LeR)Mk0|M4+DAu2H?K| zj)!~vNJN67gJ}11Pia4jF6dNuIruoV(CKtWW1<5JEOGkkK1qRG0pi2+;idnvkI6P$ zytV%wa>2;mR*lNT1ASj@_$R*afuD&O6IcYY0HZYOPB$QEQ-=w6jEze(>w5S1yRA{x zz8YtPi4OEJwGejv@N|!&Da+V9>$jenDcK zlAC!Lam`I6xwy1Axy1{Sy7$!|*)=47$j$M)H(a-;$-XK2~>GDUgI*3Wrzx8z&NW?0Y1?t>9@ab9|gZG-zrqcD0pq4fLhr>!-9 zGggzid+EdS@M4qOeAVvUI?DHNswgiXSL6w5pVcSljTEW&3k_fSFdx64ACquhD+UJ6 H2WtNS$^Y3~ diff --git a/app/assets/javascripts/osem-datatables.js b/app/assets/javascripts/osem-datatables.js index f9bdb008..f5cfdd47 100644 --- a/app/assets/javascripts/osem-datatables.js +++ b/app/assets/javascripts/osem-datatables.js @@ -41,7 +41,7 @@ function truncatify(selector) { function iconize(selector, value, icon, title) { $(selector).each(function(){ if ($(this).text() == value) { - $(this).html(""); + $(this).html(""); } }); } diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3594e187..576997ae 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -7,7 +7,6 @@ *= require osem-schedule-print *= require osem-dashboard *= require osem-splash - *= require font-awesome *= require osem-fonts *= require bootstrap-markdown *= require bootstrap-datetimepicker @@ -17,7 +16,6 @@ *= require osem-navbar *= require selectize *= require selectize.bootstrap3 - *= require mastodon *= require bootstrap-select *= require conferences */ diff --git a/app/assets/stylesheets/mastodon.scss b/app/assets/stylesheets/mastodon.scss deleted file mode 100755 index ddb481d1..00000000 --- a/app/assets/stylesheets/mastodon.scss +++ /dev/null @@ -1,45 +0,0 @@ -@font-face { - font-family: 'mastodon'; - src: font-url('mastodon.eot'); - src: local('☺'), - font-url('mastodon.otf') format('opentype'), - font-url('mastodon.woff') format('woff'), - font-url('mastodon.ttf') format('truetype'), - font-url('mastodon.svg') format('svg'); - font-weight: normal; - font-style: normal; -} - - [class^="icon-"]:before, [class*=" icon-"]:before { - font-family: "mastodon"; - font-style: normal; - font-weight: normal; - speak: none; - - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - /* opacity: .8; */ - - /* For safety - reset parent styles, that can break glyph codes*/ - font-variant: normal; - text-transform: none; - - /* fix buttons height, for twitter bootstrap */ - line-height: 1em; - - /* you can be more comfortable with increased icons size */ - /* font-size: 120%; */ - - /* Font smoothing. That was taken from TWBS */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - /* Uncomment for 3D effect */ - /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ -} - -.icon-mastodon:before { content: '\e800'; } /* '' */ -.icon-mastodon_alt:before { content: '\e801'; } /* '' */ diff --git a/app/assets/stylesheets/osem-dashboard.scss b/app/assets/stylesheets/osem-dashboard.scss index 3b5685ad..9e336c1a 100644 --- a/app/assets/stylesheets/osem-dashboard.scss +++ b/app/assets/stylesheets/osem-dashboard.scss @@ -1,6 +1,6 @@ @import "breakpoints.scss"; -.dashbox span.fa { +.dashbox span.fa-solid { line-height: 1.1em; @include breakpoint(sm) { font-size: 3em; diff --git a/app/assets/stylesheets/osem-fonts.scss b/app/assets/stylesheets/osem-fonts.scss index c2ea6493..3141837b 100644 --- a/app/assets/stylesheets/osem-fonts.scss +++ b/app/assets/stylesheets/osem-fonts.scss @@ -1,45 +1 @@ -/* Generated with http://fontastic.me/ and app/assets/images/suse.svg */ -@charset "UTF-8"; - -@font-face { - font-family: "suse-icons"; - src:font-url("suse-icons.eot"); - src:font-url("suse-icons.eot?#iefix") format("embedded-opentype"), - font-url("suse-icons.woff") format("woff"), - font-url("suse-icons.ttf") format("truetype"), - font-url("suse-icons.svg#suse-icons") format("svg"); - font-weight: normal; - font-style: normal; - -} - -[data-icon]:before { - font-family: "suse-icons" !important; - content: attr(data-icon); - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - font-smoothing: antialiased; -} - -/* We have to repeat this for every symbol that extends font awesome. So if - you add fa-rutzelfuz you need to copy and paste these two... -*/ -[class^="fa-suse"]:before, -[class*=" fa-suse"]:before { - font-family: "suse-icons" !important; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - font-smoothing: antialiased; -} - -.fa-suse:before { - content: "a"; -} \ No newline at end of file +@import "font-awesome"; diff --git a/app/assets/stylesheets/osem-splash.scss b/app/assets/stylesheets/osem-splash.scss index ce0418d6..35a27dca 100644 --- a/app/assets/stylesheets/osem-splash.scss +++ b/app/assets/stylesheets/osem-splash.scss @@ -161,7 +161,7 @@ -ms-transition: all 0.5s ease-in-out; -o-transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out; - i.fa { + i.fa-solid { line-height: inherit; } &.show { diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index 571161e6..2dc305e5 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -18,7 +18,6 @@ $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/helpers/format_helper.rb b/app/helpers/format_helper.rb index 07a982ab..26014f89 100644 --- a/app/helpers/format_helper.rb +++ b/app/helpers/format_helper.rb @@ -100,9 +100,9 @@ module FormatHelper def icon_for_todo(bool) if bool - 'fa fa-check' + 'fa-solid fa-check' else - 'fa fa-times' + 'fa-solid fa-xmark' end end diff --git a/app/models/survey_question.rb b/app/models/survey_question.rb index 2936977a..748f70dd 100644 --- a/app/models/survey_question.rb +++ b/app/models/survey_question.rb @@ -7,7 +7,7 @@ class SurveyQuestion < ActiveRecord::Base # Order of this list should not be changed without proper action! enum kind: [:boolean, :choice, :string, :text, :datetime, :numeric] - ICONS = { boolean: 'dot-circle-o', choice: 'check-square-o', string: 'edit', text: 'align-left', datetime: 'clock-o', numeric: 'slack' }.freeze + ICONS = { boolean: 'circle-dot', choice: 'square-check', string: 'pen-to-square', text: 'align-left', datetime: 'clock', numeric: 'hashtag' }.freeze validates :title, presence: true validates :possible_answers, :max_choices, :min_choices, presence: true, if: :choice? diff --git a/app/views/admin/comments/index.html.haml b/app/views/admin/comments/index.html.haml index d7dccd14..6e3b8cfd 100644 --- a/app/views/admin/comments/index.html.haml +++ b/app/views/admin/comments/index.html.haml @@ -8,15 +8,15 @@ %ul.nav.nav-tabs#commentsTable %li.active %a{ href: '#unread_comments', 'data-toggle' => 'tab' } - %span.fa.fa-comment + %span.fa-solid.fa-comment Unread %li %a{ href: '#posted_comments', 'data-toggle' => 'tab' } - %span.fa.fa-pencil + %span.fa-solid.fa-pencil Posted %li %a{ href: '#all_comments', 'data-toggle' => 'tab' } - %span.fa.fa-comments-o + %span.fa-solid.fa-comments All .tab-content .tab-pane.active#unread_comments diff --git a/app/views/admin/conferences/index.html.haml b/app/views/admin/conferences/index.html.haml index 800e612e..912c3ea7 100644 --- a/app/views/admin/conferences/index.html.haml +++ b/app/views/admin/conferences/index.html.haml @@ -4,13 +4,13 @@ icon: "user", subtitle: "User", value: @total_user, delta: @new_user .col-sm-3.col-xs-3 = render "big_statistic", - icon: "check-square", subtitle: "Registration", value: @total_reg, delta: @new_reg + icon: "square-check", subtitle: "Registration", value: @total_reg, delta: @new_reg .col-sm-3.col-xs-3 = render "big_statistic", - icon: "file-text", subtitle: "Submission", value: @total_submissions, delta: @new_submissions + icon: "file-lines", subtitle: "Submission", value: @total_submissions, delta: @new_submissions .col-sm-3.col-xs-3 = render "big_statistic", - icon: "archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn, reverse: true + icon: "box-archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn, reverse: true .row#registrations .col-md-8 @@ -33,15 +33,15 @@ %ul.nav.nav-tabs#recentTable %li.active %a{ href: '#recent_user', 'data-toggle' => 'tab' } - %span.fa.fa-user + %span.fa-solid.fa-user Recent Users %li %a{ href: '#recent_reg', 'data-toggle' => 'tab' } - %span.fa.fa-check-square + %span.fa-solid.fa-square-check Recent Registrations %li %a{ href: '#recent_submissions', 'data-toggle' => 'tab' } - %span.fa.fa-file-text + %span.fa-solid.fa-file-lines Recent Submissions .tab-content .tab-pane.active#recent_user diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml index 89daeff5..094a56e1 100644 --- a/app/views/admin/conferences/show.html.haml +++ b/app/views/admin/conferences/show.html.haml @@ -1,5 +1,5 @@ %h1 - %span.fa.fa-tachometer + %span.fa-solid.fa-gauge-high Dashboard for #{@conference.title} %hr .row @@ -8,13 +8,13 @@ icon: "user", subtitle: "Registration", value: @total_reg, delta: @new_reg .col-sm-3.col-xs-3 = render "big_statistic", - icon: "check-square", subtitle: "Submission", value: @total_submissions, delta: @new_submissions + icon: "square-check", subtitle: "Submission", value: @total_submissions, delta: @new_submissions .col-sm-3.col-xs-3 = render "big_statistic", - icon: "file-text", subtitle: "Hour", value: @program_length, delta: @new_program_length + icon: "file-lines", subtitle: "Hour", value: @program_length, delta: @new_program_length .col-sm-3.col-xs-3 = render "big_statistic", - icon: "archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn + icon: "box-archive", subtitle: "Withdrawn", value: @total_withdrawn, delta: @new_withdrawn .row .col-md-12 @@ -41,15 +41,15 @@ %ul.nav.nav-tabs#doughnut_tabs %li.active %a{ href: '#distribution_all', 'data-toggle' => 'tab' } - %span.fa.fa-star + %span.fa-solid.fa-star All %li %a{ href: '#distribution_confirmed', 'data-toggle' => 'tab' } - %span.fa.fa-comment + %span.fa-solid.fa-comment Confirmed %li %a{ href: '#distribution_withdrawn', 'data-toggle' => 'tab' } - %span.fa.fa-archive + %span.fa-solid.fa-box-archive Withdrawn .tab-content .tab-pane.active#distribution_all @@ -91,11 +91,11 @@ %ul.nav.nav-tabs#recentTable %li{ 'class' => "active #{hidden_if_conference_over(@conference)}" } %a{ href: '#recent_reg', 'data-toggle' => 'tab' } - %span.fa.fa-user + %span.fa-solid.fa-user Recent Registrations %li{ 'class' => "#{hidden_if_conference_over(@conference)}" } %a{ href: '#recent_submissions', 'data-toggle' => 'tab' } - %span.fa.fa-file-text + %span.fa-solid.fa-file-lines Recent Submissions .tab-content .tab-pane.active#recent_reg diff --git a/app/views/admin/events/_datatable_row.haml b/app/views/admin/events/_datatable_row.haml index 74a8ccb4..7de3f3f1 100644 --- a/app/views/admin/events/_datatable_row.haml +++ b/app/views/admin/events/_datatable_row.haml @@ -69,4 +69,4 @@ = link_to new_admin_conference_survey_path(@conference.short_title, survey: { surveyable_type: 'Event', surveyable_id: event.id }), class: 'btn btn-success' do - .fa.fa-plus + .fa-solid.fa-plus diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index eda41a3f..5fdec89e 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -85,7 +85,7 @@ %th %b State %th - .fa.fa-comment + .fa-solid.fa-comment %th Add Survey - @events.each do |event| = render 'datatable_row', diff --git a/app/views/admin/events/registrations.html.haml b/app/views/admin/events/registrations.html.haml index 70204369..f469d403 100644 --- a/app/views/admin/events/registrations.html.haml +++ b/app/views/admin/events/registrations.html.haml @@ -35,6 +35,6 @@ = check_box_tag @conference.short_title, @event.id, event_registration.attended, class: 'switch-checkbox', url: "#{toggle_attendance_admin_conference_program_event_path(@conference, @event, events_registration_id: event_registration)}&&event_registration[attended]=" %td - if event_registration.registration.attended - %i.fa.fa-check.text-success + %i.fa-solid.fa-check.text-success - else - %i.fa.fa-close.text-danger + %i.fa-solid.fa-xmark.text-danger diff --git a/app/views/admin/lodgings/index.html.haml b/app/views/admin/lodgings/index.html.haml index 67b5e3df..db1136b9 100644 --- a/app/views/admin/lodgings/index.html.haml +++ b/app/views/admin/lodgings/index.html.haml @@ -12,7 +12,7 @@ .thumbnail - unless lodging.picture? %p.text-center - %i.fa.fa-home.fa-5x + %i.fa-solid.fa-house.fa-5x - else - if lodging.website_link.present? = link_to(lodging.website_link, class: 'thumbnail') do diff --git a/app/views/admin/organizations/index.html.haml b/app/views/admin/organizations/index.html.haml index b152e4c2..d7ebe7c6 100644 --- a/app/views/admin/organizations/index.html.haml +++ b/app/views/admin/organizations/index.html.haml @@ -27,7 +27,7 @@ = organization.conferences.past.count %td.text-center - unless organization.code_of_conduct.blank? - = fa_icon 'check', title: 'yes' + = icon 'fa-solid', 'check', title: 'yes' %td .btn-group = link_to 'Admins', admins_admin_organization_path(organization), diff --git a/app/views/admin/registrations/index.html.haml b/app/views/admin/registrations/index.html.haml index 512899a2..5dc557b0 100644 --- a/app/views/admin/registrations/index.html.haml +++ b/app/views/admin/registrations/index.html.haml @@ -43,7 +43,7 @@ checkboxSwitch("[class='switch-checkbox']"); if (codeOfConductPresent) { iconize("td.code-of-conduct", "true", "check", "accepted"); - iconize("td.code-of-conduct", "false", "exclamation-circle", "Has not accepted Code of Conduct"); + iconize("td.code-of-conduct", "false", "circle-exclamation", "Has not accepted Code of Conduct"); }; // truncatify("td.truncate"); }, diff --git a/app/views/admin/sponsorship_levels/index.html.haml b/app/views/admin/sponsorship_levels/index.html.haml index c73c5582..8cd28059 100644 --- a/app/views/admin/sponsorship_levels/index.html.haml +++ b/app/views/admin/sponsorship_levels/index.html.haml @@ -21,9 +21,9 @@ = sponsorship_level.position .btn-group-vertical{role: "group"} = link_to(up_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id), method: :patch, class: 'btn btn-default btn-xs') do - %i.fa.fa-chevron-up + %i.fa-solid.fa-chevron-up = link_to(down_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id), method: :patch, class: 'btn btn-default btn-xs') do - %i.fa.fa-chevron-down + %i.fa-solid.fa-chevron-down %td = link_to 'Edit', edit_admin_conference_sponsorship_level_path(@conference.short_title, sponsorship_level.id), method: :get, class: 'btn btn-primary' diff --git a/app/views/admin/survey_questions/_form.html.haml b/app/views/admin/survey_questions/_form.html.haml index 0cde22c5..b77bb1c5 100644 --- a/app/views/admin/survey_questions/_form.html.haml +++ b/app/views/admin/survey_questions/_form.html.haml @@ -35,7 +35,7 @@ .form-group %select.selectpicker.form-control{ id: 'survey_question_kind', name: 'survey_question[kind]' } - SurveyQuestion.kinds.each do |kind| - %option{ id: "#{kind.second}", 'data-icon' => "fa fa-#{SurveyQuestion::ICONS[kind.first.to_sym]}", selected: @survey_question.kind == kind.first } + %option{ id: "#{kind.second}", 'data-icon' => "fa-solid fa-#{SurveyQuestion::ICONS[kind.first.to_sym]}", selected: @survey_question.kind == kind.first } = kind.first = f.submit nil, class: 'btn btn-primary' .col-md-6 @@ -89,7 +89,7 @@ .form-group{ class: 'datetimepicker' } .input-group .input-group-addon - %span.fa.fa-calendar + %span.fa-solid.fa-calendar %input.form-control{ readonly: 'readonly' } .kinds.numeric{ class: @survey_question.numeric? ? '' : 'hidden' } %input.form-control{ type: 'number' } diff --git a/app/views/admin/surveys/_survey_question.html.haml b/app/views/admin/surveys/_survey_question.html.haml index 485bd559..f006036e 100644 --- a/app/views/admin/surveys/_survey_question.html.haml +++ b/app/views/admin/surveys/_survey_question.html.haml @@ -35,7 +35,7 @@ .form-group{ class: 'datetimepicker' } .input-group .input-group-addon - %span.fa.fa-calendar + %span.fa-solid.fa-calendar %input.form-control{ readonly: 'readonly', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory } - elsif survey_question.numeric? %input.form-control{ type: 'number', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory } diff --git a/app/views/admin/surveys/_survey_question_title.html.haml b/app/views/admin/surveys/_survey_question_title.html.haml index 4fd0f421..51b98891 100644 --- a/app/views/admin/surveys/_survey_question_title.html.haml +++ b/app/views/admin/surveys/_survey_question_title.html.haml @@ -12,11 +12,11 @@ = survey_question.max_choices choices ) - if survey_question.mandatory - %span.fa.fa-asterisk.text-danger + %span.fa-solid.fa-asterisk.text-danger - if can? :edit, @survey %p.pull-right = "(#{survey_question.survey_replies.count} replies)" = link_to edit_admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question) do - %span.fa.fa-edit + %span.fa-solid.fa-pen-to-square = link_to admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question), method: :delete, data: { confirm: 'Are you sure you want to delete this question?' } do - %span.fa.fa-times + %span.fa-solid.fa-xmark diff --git a/app/views/admin/users/_event_registrations.html.haml b/app/views/admin/users/_event_registrations.html.haml index d512bc12..9d8f642b 100644 --- a/app/views/admin/users/_event_registrations.html.haml +++ b/app/views/admin/users/_event_registrations.html.haml @@ -20,6 +20,6 @@ %td= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event) %td - if @user.attended_event?(event) - %i.fa.fa-check.text-success + %i.fa-solid.fa-check.text-success - else - %i.fa.fa-times.text-danger + %i.fa-solid.fa-xmark.text-danger diff --git a/app/views/application/_big_statistic.haml b/app/views/application/_big_statistic.haml index 7a77d29c..c45a17f1 100644 --- a/app/views/application/_big_statistic.haml +++ b/app/views/application/_big_statistic.haml @@ -1,8 +1,8 @@ - reverse ||= false - variant = variant_from_delta(delta, reverse: reverse) .dashbox.text-center - %span.fa - = fa_icon(icon) + %span + = icon('fa-solid', icon) = value %p.text-nowrap %small diff --git a/app/views/conference_registrations/_registration_info.html.haml b/app/views/conference_registrations/_registration_info.html.haml index b7cae0ff..e8293d54 100644 --- a/app/views/conference_registrations/_registration_info.html.haml +++ b/app/views/conference_registrations/_registration_info.html.haml @@ -2,7 +2,7 @@ - code_of_conduct_link = link_to 'Code of Conduct', '#', data: { toggle: 'modal', target: '#modal-code-of-conduct'} - if @registration.accepted_code_of_conduct - = fa_icon 'check-square-o' + = icon 'fa-solid', 'square-check' I have read and accepted the = code_of_conduct_link - else diff --git a/app/views/conference_registrations/_tickets.html.haml b/app/views/conference_registrations/_tickets.html.haml index 82a995b9..d9ef16cc 100644 --- a/app/views/conference_registrations/_tickets.html.haml +++ b/app/views/conference_registrations/_tickets.html.haml @@ -23,4 +23,4 @@ %p = button_tag(type: 'submit', class: 'btn btn-success btn-lg pull-right') do Support - %i.fa.fa-shopping-cart + %i.fa-solid.fa-cart-shopping diff --git a/app/views/conference_registrations/show.html.haml b/app/views/conference_registrations/show.html.haml index 359b9de7..57ccb5d7 100644 --- a/app/views/conference_registrations/show.html.haml +++ b/app/views/conference_registrations/show.html.haml @@ -17,17 +17,19 @@ - unless @conference.code_of_conduct.blank? .row .col-md-12 - %h4= fa_stacked_icon 'handshake-o', base: 'square-o', text: 'Code of Conduct' + %h4= fa_stacked_icon 'handshake-o', base: 'square-dashed', text: 'Code of Conduct' %ul.fa-ul - if @registration.accepted_code_of_conduct %li.text-info - = fa_icon('check li') + %span.fa-li + = icon('fa-solid', 'check') You have accepted the = link_to 'Code of Conduct', '#', data: { toggle: 'modal', target: '#modal-code-of-conduct'} - else %li.text-warning - = fa_icon('exclamation-circle li') + %span.fa-li + = icon('fa-solid', 'circle-exclamation') You need to accept the = link_to 'Code of Conduct', '#', data: { toggle: 'modal', target: '#modal-code-of-conduct'} @@ -38,8 +40,8 @@ .col-md-12 %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-info.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-info.fa-stack-1x Surveys %ul @@ -49,8 +51,8 @@ .col-md-12 %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-check.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-check.fa-stack-1x Registered to the following event(s) %ul - @registration.events.each do |event| @@ -63,8 +65,8 @@ .col-md-12 %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-question.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-question.fa-stack-1x Events that require registration %ul - @registration.conference.program.events.remaining_for_registration(@registration).each do |event| @@ -77,8 +79,8 @@ .col-md-12 %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-ticket.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-ticket.fa-stack-1x Tickets - if @tickets.any? Total Purchased: @@ -139,8 +141,8 @@ - if @conference.participants.any? %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-group.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-user-group.fa-stack-1x = @conference.participants.count Registered = word_pluralize(@conference.participants.count, 'Attendee') @@ -150,8 +152,8 @@ - if @conference.program.speakers.confirmed.any? %h4 %span.fa-stack - %i.fa.fa-square-o.fa-stack-2x - %i.fa.fa-microphone.fa-stack-1x + %i.fa-solid.fa-square-dashed.fa-stack-2x + %i.fa-solid.fa-microphone.fa-stack-1x = @conference.program.speakers.confirmed.count Confirmed = word_pluralize(@conference.program.speakers.confirmed.count, 'Speaker') diff --git a/app/views/conferences/_code_of_conduct.haml b/app/views/conferences/_code_of_conduct.haml index a41ca646..1b9b9867 100644 --- a/app/views/conferences/_code_of_conduct.haml +++ b/app/views/conferences/_code_of_conduct.haml @@ -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 diff --git a/app/views/conferences/_footer.haml b/app/views/conferences/_footer.haml index 5b24fd92..cba8f844 100644 --- a/app/views/conferences/_footer.haml +++ b/app/views/conferences/_footer.haml @@ -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(){ diff --git a/app/views/conferences/_gallery.html.haml b/app/views/conferences/_gallery.html.haml index 65babbe4..69635402 100644 --- a/app/views/conferences/_gallery.html.haml +++ b/app/views/conferences/_gallery.html.haml @@ -9,9 +9,9 @@ %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 diff --git a/app/views/conferences/_lodging.haml b/app/views/conferences/_lodging.haml index 724e78ca..768f75d1 100644 --- a/app/views/conferences/_lodging.haml +++ b/app/views/conferences/_lodging.haml @@ -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 diff --git a/app/views/conferences/_modal_description.haml b/app/views/conferences/_modal_description.haml index 1c66b67d..f1cad190 100644 --- a/app/views/conferences/_modal_description.haml +++ b/app/views/conferences/_modal_description.haml @@ -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 diff --git a/app/views/conferences/_social_media.haml b/app/views/conferences/_social_media.haml index ea5c481d..e68e39f6 100644 --- a/app/views/conferences/_social_media.haml +++ b/app/views/conferences/_social_media.haml @@ -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-solid.fa-facebook.fa-4x - if contact.twitter? = link_to "#{ contact.twitter }" do - %i.fa.fa-twitter.fa-4x + %i.fa-solid.fa-twitter.fa-4x - if contact.instagram? = link_to "#{ contact.instagram }" do - %i.fa.fa-instagram.fa-4x + %i.fa-solid.fa-instagram.fa-4x - if contact.googleplus? = link_to "#{ contact.googleplus }" do - %i.fa.fa-google-plus-square.fa-4x + %i.fa-solid.fa-google-plus.fa-4x - if contact.mastodon? = link_to "#{ contact.mastodon }" do - %i.fa.icon-mastodon.fa-4x + %i.fa-solid.fa-mastodon.fa-4x - if contact.youtube? = link_to "#{ contact.youtube }" do - %i.fa.fa-youtube.fa-4x + %i.fa-solid.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 diff --git a/app/views/conferences/_tickets.haml b/app/views/conferences/_tickets.haml index 5f0da517..325f04b8 100644 --- a/app/views/conferences/_tickets.haml +++ b/app/views/conferences/_tickets.haml @@ -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) diff --git a/app/views/conferences/_venue.haml b/app/views/conferences/_venue.haml index fbdcde48..b280b741 100644 --- a/app/views/conferences/_venue.haml +++ b/app/views/conferences/_venue.haml @@ -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 diff --git a/app/views/conferences/index.html.haml b/app/views/conferences/index.html.haml index 5517a292..720e1cdf 100644 --- a/app/views/conferences/index.html.haml +++ b/app/views/conferences/index.html.haml @@ -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 diff --git a/app/views/devise/registrations/_form_fields_openid.html.haml b/app/views/devise/registrations/_form_fields_openid.html.haml index 187e4f19..1924dd68 100644 --- a/app/views/devise/registrations/_form_fields_openid.html.haml +++ b/app/views/devise/registrations/_form_fields_openid.html.haml @@ -10,7 +10,7 @@ %li{ style: "list-style: none; margin-left: 20px;" } = link_to user_openid_path(openid, user_id: current_user.id), method: :delete, data: { confirm: "Remove association with #{openid.provider} account?" } do - %span.fa.fa-times{ style: "color: red;" } + %span.fa-solid.fa-xmark.text-danger %span #{openid.provider}:#{openid.email} %br - else diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml index 940db7de..9dcd51a6 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 fa-#{provider}"} + %i{class: "fa-brand fa-#{provider}"} diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index 78523bc7..f4c20006 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -1,41 +1,41 @@ %ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse#side-nav .btn-group %button{type:'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} - %span.fa.fa-cog + %span.fa-solid.fa-gear = @conference.short_title %span.caret %ul.dropdown-menu{role:'menu'} %li = link_to(admin_conferences_path) do - %span.fa.fa-home + %span.fa-solid.fa-house All Conferences - @conferences.each do |conference| - if can? :show, conference %li = link_to(admin_conference_path(conference.short_title)) do - %span.fa.fa-cog + %span.fa-solid.fa-gear Manage = conference.short_title - if can? :new, Conference.new %li = link_to(new_admin_conference_path) do - %span.fa.fa-plus + %span.fa-solid.fa-plus New Conference %hr - if can? :show, @conference %li{class: "#{active_nav_li(admin_conference_path(@conference.short_title))} nav-header nav-header-bigger"} = link_to(admin_conference_path(@conference.short_title)) do - %span.fa.fa-tachometer + %span.fa-solid.fa-gauge-high Dashboard - if can? :show, @conference %li{class: "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"} - if can? :edit, @conference = link_to(edit_admin_conference_path(@conference.short_title)) do - %span.fa.fa-home + %span.fa-solid.fa-house Basics - else %a - %span.fa.fa-home + %span.fa-solid.fa-house Basics %ul - if can? :update, Contact.new(conference_id: @conference.id) @@ -50,7 +50,7 @@ - if can? :show, Venue.new(conference_id: @conference.id) %li{class: "#{active_nav_li(admin_conference_venue_path(@conference.short_title))}"} = link_to(admin_conference_venue_path(@conference.short_title)) do - %span.fa.fa-road + %span.fa-solid.fa-road Venue %ul - if @conference.venue && @conference.venue.persisted? && (can? :update, @conference.venue.rooms.build) @@ -62,7 +62,7 @@ - if can? :show, @conference.program %li{class: "#{active_nav_li(admin_conference_program_path(@conference.short_title))}"} = link_to admin_conference_program_path(@conference.short_title) do - %span.fa.fa-calendar + %span.fa-solid.fa-calendar Program - if @conference.program %ul @@ -91,7 +91,7 @@ - if can? :update, Registration.new(conference_id: @conference.id) %li{class: active_nav_li(admin_conference_registrations_path(@conference.short_title))} = link_to(admin_conference_registrations_path(@conference.short_title)) do - %span.fa.fa-user + %span.fa-solid.fa-user Registrations %ul - if can? :update, @conference @@ -104,7 +104,7 @@ - if (can? :manage, @conference.sponsorship_levels.build) || (can? :manage, @conference.sponsors.build) || (can? :manage, @conference.tickets.build) %li %a - %span.fa.fa-usd + %span.fa-solid.fa-dollar-sign Donations %ul - if can? :update, @conference.sponsorship_levels.build @@ -119,31 +119,31 @@ - if can? :manage, @conference.booths.build %li = link_to admin_conference_booths_path(@conference.short_title) do - %span.fa.fa-shopping-bag + %span.fa-solid.fa-bag-shopping = (t'booth').pluralize.capitalize - if can? :update, @conference.email_settings %li{class: active_nav_li(admin_conference_emails_path(@conference.short_title))} = link_to(admin_conference_emails_path(@conference.short_title)) do - %span.fa.fa-envelope + %span.fa-solid.fa-envelope E-Mails %li{ class: active_nav_li(admin_conference_surveys_path(@conference.short_title)) } = link_to(admin_conference_surveys_path(@conference.short_title)) do - %span.fa.fa-list-alt + %span.fa-solid.fa-list Surveys - if can? :index, Role.new(resource: @conference) %li{class: active_nav_li(admin_conference_roles_path(@conference.short_title))} = link_to(admin_conference_roles_path(@conference.short_title)) do - %span.fa.fa-group + %span.fa-solid.fa-user-group Roles - if can? :index, @conference.resources.new %li = link_to admin_conference_resources_path(@conference.short_title) do - %span.fa.fa-pencil-square + %span.fa-solid.fa-pencil Resources - if can?(:index, PaperTrail::Version.new(conference_id: @conference.id, item_type: 'Event')) || can?(:index, PaperTrail::Version.new(conference_id: @conference.id, item_type: 'Registration')) %li{:class=> active_nav_li(admin_conference_revision_history_path(@conference.short_title))} = link_to(admin_conference_revision_history_path(@conference.short_title)) do - %span.fa.fa-history + %span.fa-solid.fa-clock-rotate-left Revision History diff --git a/app/views/layouts/_admin_sidebar_index.html.haml b/app/views/layouts/_admin_sidebar_index.html.haml index 65735952..91001405 100644 --- a/app/views/layouts/_admin_sidebar_index.html.haml +++ b/app/views/layouts/_admin_sidebar_index.html.haml @@ -1,44 +1,44 @@ %ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse#side-nav .btn-group %button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'} - %span.fa.fa-home + %span.fa-solid.fa-house All Conferences %span.caret %ul.dropdown-menu{role: 'menu'} %li = link_to(admin_conferences_path) do - %span.fa.fa-home + %span.fa-solid.fa-house All Conferences - @conferences.each do |conference| - if can? :show, conference %li = link_to(admin_conference_path(conference.short_title)) do - %span.fa.fa-cog + %span.fa-solid.fa-gear Manage = conference.short_title - if can? :new, Conference.new %li = link_to(new_admin_conference_path) do - %span.fa.fa-plus + %span.fa-solid.fa-plus New Conference - if can? :index, User %hr %li = link_to(admin_users_path) do - %span.fa.fa-user + %span.fa-solid.fa-user Users - if can? :index, Organization %li = link_to(admin_organizations_path) do - %span.fa.fa-users + %span.fa-solid.fa-users Organizations - if can? :index, PaperTrail::Version %li = link_to(admin_revision_history_path) do - %span.fa.fa-history + %span.fa-solid.fa-clock-rotate-left Revision History - if ENV.fetch('ORGANIZATIONS_ENABLED', nil) == 'true' %li = link_to(admin_organizations_path) do - %span.fa.fa-group + %span.fa-solid.fa-user-group Organizations diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 338f4f0e..fb4a049e 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -35,16 +35,16 @@ - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true' %li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"} = link_to(new_ichain_registration_path('user')) do - %span.fa.fa-heart + %span.fa-solid.fa-heart Sign Up - else %li{class: "#{active_nav_li(new_registration_path('user'))}"} = link_to(new_registration_path('user')) do - %span.fa.fa-heart + %span.fa-solid.fa-heart Sign Up %li.dropdown.visible-desktop %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'} - %span.fa.fa-user + %span.fa-solid.fa-user Sign In %span.caret .dropdown-menu diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml index 787c8eb2..887eee03 100644 --- a/app/views/layouts/_user_menu.html.haml +++ b/app/views/layouts/_user_menu.html.haml @@ -1,6 +1,6 @@ - if can? :index, Comment %li.dropdown-header - %span.fa.fa-comment + %span.fa-solid.fa-comment Notifications (#{unread_notifications(current_user).length}) - if unread_notifications(current_user).length > 0 %li.dropdown-header Last 5 Comments for: @@ -13,71 +13,71 @@ - unless ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true' %li = link_to(edit_user_registration_path) do - %span.fa.fa-wrench + %span.fa-solid.fa-wrench Edit Account %li = link_to(edit_user_path(current_user.id)) do - %span.fa.fa-user + %span.fa-solid.fa-user Edit Profile - if @conference && ((current_user && @conference.user_registered?(current_user)) || @conference.registration_open?) %li = link_to(conference_conference_registration_path(@conference)) do - %span.fa.fa-id-badge + %span.fa-solid.fa-id-badge = @conference.short_title registration -if @conference && @conference.program %li = link_to(conference_program_proposals_path(@conference.short_title)) do - %span.fa.fa-comment + %span.fa-solid.fa-comment My Submissions %li = link_to(conference_program_tracks_path(@conference.short_title)) do - %span.fa.fa-road + %span.fa-solid.fa-road My Tracks -if @conference && (@conference.call_for_booths.try(:open?) || current_user.booths.where(conference_id: @conference.id).count > 0) %li = link_to (conference_booths_path(@conference.short_title)) do - %span.fa.fa-shopping-bag + %span.fa-solid.fa-bag-shopping My #{(t'booth').capitalize } Requests %li - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true' = link_to(destroy_user_ichain_session_path, method: 'delete') do - %span.fa.fa-minus + %span.fa-solid.fa-minus Sign out - else = link_to(destroy_user_session_path, method: 'delete') do - %span.fa.fa-minus + %span.fa-solid.fa-minus Sign out - if can? :access, Admin %li.divider %li - if Conference.any? = link_to(admin_conferences_path()) do - %span.fa.fa-home + %span.fa-solid.fa-house Administration - if can? :new, Conference.new =link_to(new_admin_conference_path) do - %span.fa.fa-plus + %span.fa-solid.fa-plus New Conference -if @conference && @conference.id && can?(:show, @conference) %li = link_to(admin_conference_path(@conference.short_title)) do - %span.fa.fa-cog + %span.fa-solid.fa-gear Manage %span.notranslate = @conference.short_title - if can? :manage, User.new %li = link_to(admin_users_path) do - %span.fa.fa-user + %span.fa-solid.fa-user Users - if can? :index, PaperTrail::Version %li = link_to(admin_revision_history_path) do - %span.fa.fa-history + %span.fa-solid.fa-clock-rotate-left Revision History - if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true' %li = link_to(admin_organizations_path) do - %span.fa.fa-group + %span.fa-solid.fa-user-group Organizations diff --git a/app/views/proposals/registrations.html.haml b/app/views/proposals/registrations.html.haml index 441ac586..3d4ed6f8 100644 --- a/app/views/proposals/registrations.html.haml +++ b/app/views/proposals/registrations.html.haml @@ -34,11 +34,11 @@ %td= event_registration.created_at %td.text-center - if event_registration.attended - %i.fa.fa-check.text-success + %i.fa-solid.fa-check.text-success - else - %i.fa.fa-times.text-danger + %i.fa-solid.fa-xmark.text-danger %td - if event_registration.registration.attended - %i.fa.fa-check.text-success + %i.fa-solid.fa-check.text-success -else - %i.fa.fa-times.text-danger + %i.fa-solid.fa-xmark.text-danger diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml index a4f947fd..fa2e2f10 100644 --- a/app/views/proposals/show.html.haml +++ b/app/views/proposals/show.html.haml @@ -40,7 +40,7 @@ %br - if speaker.email_public? = mail_to "#{ speaker.email }" do - %i.fa.fa-envelope-o.fa-2x + %i.fa-solid.fa-envelope.fa-2x - if speaker.affiliation? .text-muted from diff --git a/app/views/schedules/_carousel.html.haml b/app/views/schedules/_carousel.html.haml index e67ca91c..785a0681 100644 --- a/app/views/schedules/_carousel.html.haml +++ b/app/views/schedules/_carousel.html.haml @@ -56,8 +56,8 @@ %a.left.carousel-control{ href: "#carousel-#{ date }-#{ hrs_per_slide }", | role: "button", | "data-slide" => "prev" } - %span.glyphicon.glyphicon-chevron-left + %span.fa-solid.fa-chevron-left %a.right.carousel-control{ href: "#carousel-#{ date }-#{ hrs_per_slide }", | role: "button", | "data-slide" => "next" } - %span.glyphicon.glyphicon-chevron-right + %span.fa-solid.fa-chevron-right diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 99ced63b..25f4e1a0 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -22,17 +22,17 @@ = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 - if event_schedule.present? %span.track - %span.fa.fa-clock-o + %span.fa-solid.fa-clock %span.label{ style: "background-color: grey" } = event_schedule.start_time.strftime('%H:%M') \- = event_schedule.end_time.strftime('%H:%M') %span.track - %span.fa.fa-map-marker + %span.fa-solid.fa-location-dot %span.label{ style: "background-color: grey" } = event_schedule.room.name - if event.track %span.track - %span.fa.fa-road + %span.fa-solid.fa-road %span.label{ style: "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } = event.track.name diff --git a/app/views/schedules/events.html.haml b/app/views/schedules/events.html.haml index 8680d3c3..b6e87e31 100644 --- a/app/views/schedules/events.html.haml +++ b/app/views/schedules/events.html.haml @@ -29,7 +29,7 @@ %span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" } = date = event_schedule.start_time.strftime('%Y-%m-%d') %a{ title: "Go up", class: "pull-right", href: "#program" } - %i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true } + %i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true } - unless event_schedule.start_time.strftime('%H:%M').eql?(time) .col-xs-12.col-md-1 .start-time @@ -48,7 +48,7 @@ %span.date-title#unscheduled Unscheduled events %a{ title: "Go up", class: "pull-right", href: "#program" } - %i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true } + %i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true } - @unscheduled_events.each do |event| .col-xs-12.col-md-12 .unscheduled-event diff --git a/app/views/surveys/_list.html.haml b/app/views/surveys/_list.html.haml index bba9b1c9..200fe7e9 100644 --- a/app/views/surveys/_list.html.haml +++ b/app/views/surveys/_list.html.haml @@ -1,7 +1,7 @@ - surveys.each do |survey| - if survey.survey_submissions.find_by(user: current_user) - %i.fa.fa-check-square-o.text-success{ title: 'Thank you for filling out the survey' } + %i.fa-solid.fa-square-check.text-success{ title: 'Thank you for filling out the survey' } - else - %i.fa.fa-minus-square-o.text-danger{ title: 'Please fill out the survey' } + %i.fa-solid.fa-square-minus.text-danger{ title: 'Please fill out the survey' } = link_to survey.title, conference_survey_path(conference.short_title, survey) %br diff --git a/app/views/surveys/show.html.haml b/app/views/surveys/show.html.haml index d2104312..33729c9c 100644 --- a/app/views/surveys/show.html.haml +++ b/app/views/surveys/show.html.haml @@ -12,7 +12,7 @@ = @survey.end_date - unless @survey.active? %label - %i.fa.fa-exclamation-circle + %i.fa-solid.fa-circle-exclamation This survey does not accept replies at this monent. .row .col-md-12 diff --git a/app/views/tickets/index.html.haml b/app/views/tickets/index.html.haml index e157d75e..104cdce0 100644 --- a/app/views/tickets/index.html.haml +++ b/app/views/tickets/index.html.haml @@ -39,7 +39,7 @@ .btn-group-vertical = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do Continue - %i.fa.fa-shopping-cart + %i.fa-solid.fa-cart-shopping = link_to 'Back to registration', conference_conference_registration_path(@conference.short_title), class: 'btn btn-default btn-sm' diff --git a/app/views/tracks/index.html.haml b/app/views/tracks/index.html.haml index 23310dc3..7e8f1aa8 100644 --- a/app/views/tracks/index.html.haml +++ b/app/views/tracks/index.html.haml @@ -40,13 +40,13 @@ %tr %td{style: "padding:15px 0px 0px 8px;"} - if %w(new to_accept to_reject).include? track.state - %span{ title: 'In review', class: 'fa fa-eye' } + %span{ title: 'In review', class: 'fa-solid fa-eye' } - elsif track.state == 'accepted' - %span{ title: 'Accepted', class: 'fa fa-check text-muted' } + %span{ title: 'Accepted', class: 'fa-solid fa-check text-muted' } - elsif track.state == 'confirmed' - %spam{ title: 'Confirmed', class: 'fa fa-check text-success' } + %spam{ title: 'Confirmed', class: 'fa-solid fa-check text-success' } - elsif %w(rejected withdrawn canceled).include? track.state - %span{ title: track.state.humanize, class: 'fa fa-ban'} + %span{ title: track.state.humanize, class: 'fa-solid fa-ban'} %td{style: "padding: 15px 0px 0px 0px;"} = link_to conference_program_track_path(@conference.short_title, track), class: 'btn' do %span.label{style: "background-color: #{track.color}; color: #{ contrast_color(track.color) }"} diff --git a/spec/features/surveys_spec.rb b/spec/features/surveys_spec.rb index 927c23fc..52f8b40d 100644 --- a/spec/features/surveys_spec.rb +++ b/spec/features/surveys_spec.rb @@ -41,7 +41,7 @@ feature Survey do create :boolean_mandatory, survey: survey visit conference_conference_registration_path(conference) - expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Please fill out the survey') + expect(find(:link, survey.title).sibling('.fa-solid')[:title]).to eq('Please fill out the survey') click_link survey.title choose 'Yes' @@ -49,7 +49,7 @@ feature Survey do expect(flash).to eq('Successfully responded to survey.') visit conference_conference_registration_path(conference) - expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Thank you for filling out the survey') + expect(find(:link, survey.title).sibling('.fa-solid')[:title]).to eq('Thank you for filling out the survey') end end end