Fix icon issue, Bump MySQL version

downgrade style plugins

Gemfile

@@ -16,7 +16,7 @@ gem 'dotenv-rails'
 # Fixme: using this bc puma startup problem
 gem 'active_record_union'
 gem 'dalli', '~> 2.7.0'
-gem 'mysql2', '0.3.18'
+gem 'mysql2'
 
 # Web server
 gem 'faraday', '~> 0.9.0'
@@ -58,11 +58,11 @@ gem 'tinymce-rails'
 # Please install nodejs locally.
 # gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux'
 
-gem 'bourbon'
+gem 'bourbon','~> 3.1.8'
-gem 'font-awesome-sass'
+gem 'font-awesome-sass', '~> 4.1.0.0'
 gem 'haml'
-gem 'neat'
+gem 'neat', '~> 1.6.0'
-gem 'sass-rails'
+gem 'sass-rails', '~> 5.0.3'
 gem 'uglifier', '~> 2.5.0'
 
 # Dependency version fix

Gemfile.lock

@@ -9,57 +9,65 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.11.1)
+    actioncable (5.2.4.1)
-      actionpack (= 4.2.11.1)
+      actionpack (= 5.2.4.1)
-      actionview (= 4.2.11.1)
+      nio4r (~> 2.0)
-      activejob (= 4.2.11.1)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
-    actionpack (4.2.11.1)
+    actionpack (5.2.4.1)
-      actionview (= 4.2.11.1)
+      actionview (= 5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
-      rack (~> 1.6)
+      rack (~> 2.0, >= 2.0.8)
-      rack-test (~> 0.6.2)
+      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
+    actionview (5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_link_to (1.0.5)
       actionpack
       addressable
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (4.2.11.1)
+    activejob (5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
-      globalid (>= 0.3.0)
+      globalid (>= 0.3.6)
-    activemodel (4.2.11.1)
+    activemodel (5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
-      builder (~> 3.1)
+    activerecord (5.2.4.1)
-    activerecord (4.2.11.1)
+      activemodel (= 5.2.4.1)
-      activemodel (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
-      activesupport (= 4.2.11.1)
+      arel (>= 9.0)
-      arel (~> 6.0)
+    activestorage (5.2.4.1)
-    activesupport (4.2.11.1)
+      actionpack (= 5.2.4.1)
-      i18n (~> 0.7)
+      activerecord (= 5.2.4.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.0)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    arel (6.0.4)
+    arel (9.0.0)
     ast (2.4.0)
-    bbcoder (1.0.1)
+    bbcoder (1.1.1)
     better_errors (2.6.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
+    bindex (0.8.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
@@ -70,26 +78,29 @@ GEM
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    capybara (2.4.4)
+    capybara (3.31.0)
-      mime-types (>= 1.16)
+      addressable
-      nokogiri (>= 1.3.3)
+      mini_mime (>= 0.1.3)
-      rack (>= 1.0.0)
+      nokogiri (~> 1.8)
-      rack-test (>= 0.5.4)
+      rack (>= 1.6.0)
-      xpath (~> 2.0)
+      rack-test (>= 0.6.3)
-    carrierwave (0.10.0)
+      regexp_parser (~> 1.5)
-      activemodel (>= 3.2.0)
+      xpath (~> 3.2)
-      activesupport (>= 3.2.0)
+    carrierwave (2.1.0)
-      json (>= 1.7)
+      activemodel (>= 5.0.0)
-      mime-types (>= 1.16)
+      activesupport (>= 5.0.0)
-    childprocess (0.9.0)
+      addressable (~> 2.6)
-      ffi (~> 1.0, >= 1.0.11)
+      image_processing (~> 1.1)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
+    childprocess (3.0.0)
     cliver (0.3.2)
-    codeclimate-test-reporter (0.3.0)
+    codeclimate-test-reporter (1.0.7)
-      simplecov (>= 0.7.1, < 1.0.0)
+      simplecov
     coderay (1.1.2)
-    coffee-rails (4.0.1)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -105,25 +116,25 @@ GEM
       sort_alphabetical (~> 1.0)
     crass (1.0.6)
     dalli (2.7.10)
-    database_cleaner (1.2.0)
+    database_cleaner (1.8.3)
     debug_inspector (0.0.3)
     debugger-linecache (1.2.0)
     declarative (0.0.10)
     declarative-option (0.1.0)
     diff-lcs (1.3)
+    docile (1.3.2)
     dotenv (2.7.5)
     dotenv-rails (2.7.5)
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
     dynamic_form (1.1.4)
     erubi (1.9.0)
-    erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (4.11.1)
+    factory_bot (5.1.1)
-      activesupport (>= 3.0.0)
+      activesupport (>= 4.2.0)
-    factory_bot_rails (4.11.1)
+    factory_bot_rails (5.1.1)
-      factory_bot (~> 4.11.1)
+      factory_bot (~> 5.1.0)
-      railties (>= 3.0.0)
+      railties (>= 4.2.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
@@ -148,15 +159,16 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    haml (4.0.7)
+    haml (5.1.2)
+      temple (>= 0.8.0)
       tilt
     httpclient (2.8.3)
     hurley (0.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    i18n-country-translations (1.3.0)
+    i18n-country-translations (1.4.1)
-      i18n (~> 0.9.3)
+      i18n (>= 0.9.3, < 2)
-      railties (~> 4.0)
+      railties (>= 5.0)
     i18n-js (3.6.0)
       i18n (>= 0.6.6)
     i18n_country_select (1.2.1)
@@ -164,10 +176,14 @@ GEM
       i18n-country-translations (~> 1.0, >= 1.3.0)
       unicode_utils (~> 1.0, >= 1.0.0)
     i18n_data (0.10.0)
+    image_processing (1.10.3)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     jaro_winkler (1.5.4)
-    jquery-rails (2.0.3)
+    jquery-rails (4.3.5)
-      railties (>= 3.1.0, < 5.0)
+      rails-dom-testing (>= 1, < 3)
-      thor (~> 0.14)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     json (2.3.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
@@ -179,114 +195,116 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     memoist (0.16.2)
     method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
+    mimemagic (0.3.4)
+    mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mysql2 (0.3.18)
+    mysql2 (0.5.3)
     neat (1.6.0)
       bourbon (>= 3.1)
       sass (>= 3.3)
-    newrelic_rpm (3.13.0.299)
+    newrelic_rpm (6.9.0.363)
     nio4r (2.5.2)
-    nokogiri (1.9.1)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.2)
+      nokogiri (~> 1.8, >= 1.8.4)
     os (0.9.6)
     parallel (1.19.1)
     parser (2.7.0.4)
       ast (~> 2.4.0)
     phantomjs (2.1.1.0)
-    poltergeist (1.6.0)
+    poltergeist (1.18.1)
-      capybara (~> 2.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     power_assert (1.1.6)
-    protected_attributes (1.1.4)
-      activemodel (>= 4.0.1, < 5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (1.3.3)
       byebug (~> 2.7)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.3)
     puma (4.3.3)
       nio4r (~> 2.0)
-    quiet_assets (1.1.0)
+    rack (2.2.2)
-      railties (>= 3.1, < 5.0)
+    rack-test (1.1.0)
-    rack (1.6.13)
+      rack (>= 1.0, < 3)
-    rack-test (0.6.3)
+    rails (5.2.4.1)
-      rack (>= 1.0)
+      actioncable (= 5.2.4.1)
-    rails (4.2.11.1)
+      actionmailer (= 5.2.4.1)
-      actionmailer (= 4.2.11.1)
+      actionpack (= 5.2.4.1)
-      actionpack (= 4.2.11.1)
+      actionview (= 5.2.4.1)
-      actionview (= 4.2.11.1)
+      activejob (= 5.2.4.1)
-      activejob (= 4.2.11.1)
+      activemodel (= 5.2.4.1)
-      activemodel (= 4.2.11.1)
+      activerecord (= 5.2.4.1)
-      activerecord (= 4.2.11.1)
+      activestorage (= 5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
-      bundler (>= 1.3.0, < 2.0)
+      bundler (>= 1.3.0)
-      railties (= 4.2.11.1)
+      railties (= 5.2.4.1)
-      sprockets-rails
+      sprockets-rails (>= 2.0.0)
-    rails-deprecated_sanitizer (1.0.3)
+    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0.alpha)
+      activesupport (>= 4.2.0)
-    rails-dom-testing (1.0.9)
+      nokogiri (>= 1.6)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.11.1)
+    railties (5.2.4.1)
-      actionpack (= 4.2.11.1)
+      actionpack (= 5.2.4.1)
-      activesupport (= 4.2.11.1)
+      activesupport (= 5.2.4.1)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (1.7.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    responders (2.4.1)
+    responders (3.0.0)
-      actionpack (>= 4.2.0, < 6.0)
+      actionpack (>= 5.0)
-      railties (>= 4.2.0, < 6.0)
+      railties (>= 5.0)
     retriable (3.1.2)
     rexml (3.2.4)
     rmagick (4.0.0)
-    rspec (3.3.0)
+    rspec (3.9.0)
-      rspec-core (~> 3.3.0)
+      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.3.0)
+      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.3.0)
+      rspec-mocks (~> 3.9.0)
-    rspec-core (3.3.2)
+    rspec-core (3.9.1)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.9.1)
-    rspec-expectations (3.3.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.9.0)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.9.0)
-    rspec-rails (3.3.3)
+    rspec-rails (3.9.1)
-      actionpack (>= 3.0, < 4.3)
+      actionpack (>= 3.0)
-      activesupport (>= 3.0, < 4.3)
+      activesupport (>= 3.0)
-      railties (>= 3.0, < 4.3)
+      railties (>= 3.0)
-      rspec-core (~> 3.3.0)
+      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.3.0)
+      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.3.0)
+      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.9.0)
-    rspec-support (3.3.0)
+    rspec-support (3.9.2)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -296,34 +314,36 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    rubyzip (1.3.0)
+    ruby-vips (2.0.17)
-    sanitize (2.1.1)
+      ffi (~> 1.9)
-      nokogiri (>= 1.4.4)
+    rubyzip (2.3.0)
+    sanitize (5.1.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
+    sass-rails (5.0.8)
-      railties (>= 4.0.0, < 6)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (2.47.1)
+    selenium-webdriver (3.142.7)
-      childprocess (~> 0.5)
+      childprocess (>= 0.5, < 4.0)
-      multi_json (~> 1.0)
+      rubyzip (>= 1.2.2)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
     signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.7.1)
+    simplecov (0.18.5)
-      multi_json (~> 1.0)
+      docile (~> 1.1)
-      simplecov-html (~> 0.7.1)
+      simplecov-html (~> 0.11)
-    simplecov-html (0.7.1)
+    simplecov-html (0.12.2)
     sixarm_ruby_unaccent (1.2.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
@@ -336,13 +356,14 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    test-unit (3.1.9)
+    temple (0.8.2)
+    test-unit (3.3.5)
       power_assert
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.7.4)
+    timecop (0.9.1)
-    tinymce-rails (3.5.11.1)
+    tinymce-rails (5.2.0)
       railties (>= 3.1.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
@@ -354,84 +375,81 @@ GEM
     unicode_utils (1.4.0)
     unread (0.10.1)
       activerecord (>= 3)
-    web-console (2.3.0)
+    web-console (3.7.0)
-      activemodel (>= 4.0)
+      actionview (>= 5.0)
-      binding_of_caller (>= 0.7.2)
+      activemodel (>= 5.0)
-      railties (>= 4.0)
+      bindex (>= 0.4.0)
-      sprockets-rails (>= 2.0, < 4.0)
+      railties (>= 5.0)
-    websocket (1.2.8)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     will_paginate (3.0.12)
-    xpath (2.1.0)
+    xpath (3.2.0)
-      nokogiri (~> 1.3)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_link_to (~> 1.0.2)
+  active_link_to
   active_record_union
   annotate
-  bbcoder (~> 1.0.1)
+  bbcoder
   better_errors
   binding_of_caller
-  bluecloth (~> 2.2.0)
+  bluecloth
   bourbon (~> 3.1.8)
-  capybara (~> 2.4.4)
+  capybara
-  carrierwave (~> 0.10.0)
+  carrierwave
-  codeclimate-test-reporter (~> 0.3.0)
+  codeclimate-test-reporter
-  coffee-rails (~> 4.0.0)
+  coffee-rails
   country_select
   dalli (~> 2.7.0)
-  database_cleaner (~> 1.2.0)
+  database_cleaner
   dotenv-rails
-  dynamic_form (~> 1.1.4)
+  dynamic_form
   factory_bot_rails
   faraday (~> 0.9.0)
   font-awesome-sass (~> 4.1.0.0)
   google-api-client (~> 0.10.3)
-  haml (~> 4.0.5)
+  haml
   i18n-js
   i18n_country_select
-  jquery-rails (~> 2.0.2)
+  jquery-rails
-  mysql2 (= 0.3.18)
+  mysql2
   neat (~> 1.6.0)
-  newrelic_rpm (~> 3.13.0.299)
+  newrelic_rpm
-  nokogiri (~> 1.9.0)
+  nokogiri
   phantomjs
-  poltergeist (~> 1.6.0)
+  poltergeist
-  protected_attributes (~> 1.1.3)
   pry-byebug (~> 1.3.2)
-  public_suffix (~> 3.1.1)
+  public_suffix
   puma
-  quiet_assets
+  rails (~> 5.2.4.1)
-  rails (~> 4.2.11.1)
+  rails_autolink
-  rails_autolink (~> 1.1.5)
   rake (< 11.0)
   responders
   rmagick
   rspec
-  rspec-rails (~> 3.3.3)
+  rspec-rails
   rubocop
-  sanitize (~> 2.1.0)
+  sanitize
   sass-rails (~> 5.0.3)
   selenium-webdriver
   signet (= 0.11.0)
-  simplecov (~> 0.7.1)
+  simplecov
   spring (= 2.0.2)
   steam-condenser!
-  test-unit (~> 3.1.3)
+  test-unit
-  timecop (~> 0.7.1)
+  timecop
-  tinymce-rails (~> 3.5.9)
+  tinymce-rails
   uglifier (~> 2.5.0)
   unread (= 0.10.1)
-  web-console
+  web-console (= 3.7.0)
   will_paginate (~> 3.0.5)
 
 RUBY VERSION
-   ruby 2.3.8p459
+   ruby 2.4.9p362
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

app/assets/stylesheets/themes/default/_variables.scss

@@ -10,6 +10,7 @@ $theme-path: "themes/#{$theme-name}";
 */
 
 $max-width: 1020px;
+/* FIXME: remove his for future version of neat */
 $gutter: em(20);
 
 /*

app/views/articles/_preview.html.erb

@@ -11,7 +11,7 @@
 
   <div class="comments">
     <%= link_to article do %>
-      <%= icon 'comments' %> Comments (<%= article.comments.count %>)
+      <%= icon 'fas', 'fas', 'comments' %> Comments (<%= article.comments.count %>)
     <% end %>
   </div>
 </div>

app/views/articles/_top.html.erb

@@ -2,7 +2,7 @@
   <% if article.previous_article %>
     <div class="previous">
       <%= link_to article.previous_article do %>
-        <%= icon 'arrow-left' %>
+        <%= icon 'fas', 'arrow-left' %>
         <%= article.previous_article %>
       <% end %>
     </div>
@@ -11,7 +11,7 @@
     <div class="next">
       <%= link_to article.next_article do %>
         <%= article.next_article %>
-        <%= icon 'arrow-right' %>
+        <%= icon 'fas', 'arrow-right' %>
       <% end %>
     </div>
   <% end %>

app/views/contesters/_ladder.html.erb

@@ -21,17 +21,17 @@
     <tr>
       <td><%= h rank + 1%>.</td>
       <% if contester.trend == Contester::TREND_UP %>
-        <td><%= icon 'chevron-up' %></td>
+        <td><%= icon 'fas', 'chevron-up' %></td>
       <% elsif contester.trend == Contester::TREND_DOWN %>
-        <td><%= icon 'chevron-down' %></td>
+        <td><%= icon 'fas', 'chevron-down' %></td>
       <% elsif contester.trend == Contester::TREND_FLAT %>
-        <td><%= icon 'minus' %></td>
+        <td><%= icon 'fas', 'minus' %></td>
       <% else %>
         <td></td>
       <% end %>
       <td><%= flag contester.team.country %></td>
       <td><%= link_to (h contester.team.name), contester %></td>
-      <td><%= icon 'trophy' if contester == contester.contest.winner %></td>
+      <td><%= icon 'fas', 'trophy' if contester == contester.contest.winner %></td>
       <td><%= h contester.win %></td>
       <td><%= h contester.loss %></td>
       <td><%= h contester.draw %></td>

app/views/contesters/_list.html.erb

@@ -19,17 +19,17 @@
   <% contesters.each do |contester| %>
     <tr>
       <% if contester.trend == Contester::TREND_UP %>
-        <td><%= icon 'chevron-up' %></td>
+        <td><%= icon 'fas', 'chevron-up' %></td>
       <% elsif contester.trend == Contester::TREND_DOWN %>
-        <td><%= icon 'chevron-down' %></td>
+        <td><%= icon 'fas', 'chevron-down' %></td>
       <% elsif contester.trend == Contester::TREND_FLAT %>
-        <td><%= icon 'minus' %></td>
+        <td><%= icon 'fas', 'minus' %></td>
       <% else %>
         <td></td>
       <% end %>
       <td><%= flag contester.team.country %></td>
       <td><%= link_to (h contester.team.name), contester %></td>
-      <td><%= icon 'trophy' if contester == contester.contest.winner %></td>
+      <td><%= icon 'fas', 'trophy' if contester == contester.contest.winner %></td>
       <td><%= h contester.total_score %></td>
       <td><%= h contester.win %></td>
       <td><%= h contester.loss %></td>

app/views/forums/index.html.erb

@@ -27,10 +27,10 @@
             <td class="actions">
               <% if forum.can_update? cuser %>
                 <%= link_to action: "up", id: forum do %>
-                  <% icon 'arrow-up' %>
+                  <% icon 'fas', 'arrow-up' %>
                 <% end %>
                 <%= link_to action: "down", id: forum do %>
-                  <% icon 'arrow-down' %>
+                  <% icon 'fas', 'arrow-down' %>
                 <% end %>
               <% end %>
             </td>

app/views/forums/show.html.erb

@@ -1,7 +1,7 @@
 <%= provide :content_class, 'no-body' %>
 
 <div class="breadcrumbs">
-  <%= link_to "Forums", action: "index" %> <%= icon 'chevron-right' %> <%= namelink @forum %>
+  <%= link_to "Forums", action: "index" %> <%= icon 'fas', 'chevron-right' %> <%= namelink @forum %>
 </div>
 
 <div class="topic-controls">

app/views/gatherers/_list.html.erb

@@ -19,7 +19,7 @@
           <%= flag(gatherer.user.country) if gatherer.user && gatherer.user.country %>
 
           <% if gatherer == captain and gatherer.team == gatherer.gather.turn %>
-            <%= icon 'chevron-right' %>
+            <%= icon 'fas', 'chevron-right' %>
           <% end %>
 
           <%= namelink gatherer.user %>

app/views/gathers/_running.html.erb

@@ -11,7 +11,7 @@
             <%= namelink gatherer.user %>
             <% if cuser and gatherer.can_destroy?(cuser) %>
               <%= link_to gatherer, method: :delete, class: 'delete' do %>
-                <%= icon 'times' %>
+                <%= icon 'fas', 'times' %>
               <% end %>
             <% end %>
           </li>

app/views/gathers/index.html.erb

@@ -18,7 +18,7 @@
               <% if gatherer.team == 1 %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain1 == gatherer %>
-                  <%= icon 'star' %>
+                  <%= icon 'fas', 'star' %>
                 <% end %>
               <% end %>
             </li>
@@ -32,7 +32,7 @@
               <% if gatherer.team == 2 %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain2 == gatherer %>
-                  <%= icon 'star' %>
+                  <%= icon 'fas', 'star' %>
                 <% end %>
               <% end %>
             </li>

app/views/gathers/show.html.erb

@@ -132,14 +132,14 @@
 
   <div class="previous">
     <%= link_to @gather.previous_gather, class: 'button tiny' do %>
-      <%= icon 'chevron-left' %> Previous
+      <%= icon 'fas', 'chevron-left' %> Previous
     <% end %>
   </div>
 
   <div class="next">
     <% if @gather.next_gather %>
       <%= link_to @gather.next_gather, class: 'button tiny' do %>
-        Next <%= icon 'chevron-right' %>
+        Next <%= icon 'fas', 'chevron-right' %>
       <% end %>
     <% end %>
   </div>
@@ -188,7 +188,7 @@
 
       <div class="hide">
         <a id="gather-info-hide" class="button tiny">
-          <%= icon 'times' %>
+          <%= icon 'fas', 'times' %>
           Hide information
         </a>
       </div>

app/views/matches/_list.html.erb

@@ -47,9 +47,9 @@
       <% if match.contest.contest_type == Contest::TYPE_LADDER %>
         <td>
           <% if match.get_friendly(:points) > 0 %>
-            <%= icon 'chevron-up' %>
+            <%= icon 'fas', 'chevron-up' %>
           <% elsif match.get_friendly(:points) < 0 %>
-            <%= icon 'chevron-down' %>
+            <%= icon 'fas', 'chevron-down' %>
           <% end %>
           <%= match.get_friendly(:points) %>
         </td>

app/views/matches/show.html.erb

@@ -29,7 +29,7 @@
             <% @match.team1_lineup.each do |teamer| %>
               <li>
                 <% if teamer.user == @match.motm %>
-                  <%= icon 'star' %>
+                  <%= icon 'fas', 'star' %>
                 <% end %>
                 <%= teamer.user.username %>
                 <%= flag teamer.user.country %>
@@ -47,7 +47,7 @@
                 <%= flag teamer.user.country %>
                 <%= teamer.user.username %>  
                 <% if teamer.user == @match.motm %>
-                  <%= icon 'star' %>
+                  <%= icon 'fas', 'star' %>
                 <% end %>
               </li>
             <% end %>  

app/views/teams/_list.html.erb

@@ -18,15 +18,15 @@
         <% if cuser and cuser.admin? %>
           <td class="actions">
             <%= link_to edit_team_path(team) do %>
-              <%= icon 'pencil' %>
+              <%= icon 'fas', 'pencil' %>
             <% end %>
             <% if team.active %>
               <%= link_to team, confirm: 'Are you sure?', method: :delete do %>
-                <%= icon 'times' %>
+                <%= icon 'fas', 'times' %>
               <% end %>
             <% else %>
               <%= link_to action: "recover", id: team do %>
-                <%= icon 'save' %>
+                <%= icon 'fas', 'save' %>
               <% end %>
             <% end %>
           </td>

app/views/teams/edit.html.erb

@@ -74,7 +74,7 @@
               </td>
               <td>
                 <%= link_to member, confirm: 'Are you sure?', method: :delete, class: 'button tiny' do %>
-                  <%= icon 'times' %> Remove
+                  <%= icon 'fas', 'times' %> Remove
                 <% end %>
               </td>
             </tr>

app/views/topics/_breadcrumbs.html.erb

@@ -1,7 +1,7 @@
 <div class="breadcrumbs">
   <%= link_to "Forums", forums_url %>
-  <%= icon 'chevron-right' %>
+  <%= icon 'fas', 'chevron-right' %>
   <%= namelink topic.forum %>
-  <%= icon 'chevron-right' %>
+  <%= icon 'fas', 'chevron-right' %>
   <%= namelink topic %>
 </div>

app/views/users/index.html.erb

@@ -39,10 +39,10 @@
       <% if cuser and cuser.admin? %>
         <td class="actions">
           <%= link_to edit_user_path(user) do %>
-            <%= icon 'pencil' %>
+            <%= icon 'fas', 'pencil' %>
           <% end %>
           <%= link_to user, confirm: "Proceed to delete?", method: :delete do %>
-            <%= icon 'times' %>
+            <%= icon 'fas', 'times' %>
           <% end %>
         </td>
       <% end %>

app/views/widgets/_logged.html.erb

@@ -4,29 +4,29 @@
       <% if cuser.admin? %>
         <li>
           <%= link_to '/about/adminpanel', class: 'admin' do %>
-            Admin (<%= Issue.with_status(0).count  %>) <%= icon 'wrench' %>
+            Admin (<%= Issue.with_status(0).count  %>) <%= icon 'fas', 'wrench' %>
           <% end %>
         </li>
       <% elsif cuser.moderator? %>
         <li>
           <%= link_to issues_path, class: 'admin' do %>
-            Issues (<%= Issue.where(category_id: Issue.allowed_categories(cuser)).with_status(0).count %>) <%= icon 'wrench' %>
+            Issues (<%= Issue.where(category_id: Issue.allowed_categories(cuser)).with_status(0).count %>) <%= icon 'fas', 'wrench' %>
           <% end %>
         </li>
       <% end %>
       <li>
         <%= link_to user_path(cuser) do %>
-          Account <%= icon 'user' %>
+          Account <%= icon 'fas', 'user' %>
         <% end %>
       </li>
       <li>
         <%= link_to "/users/agenda/#{cuser.id}" do %>
-          Agenda <%= icon 'calendar' %>
+          Agenda <%= icon 'fas', 'calendar' %>
         <% end %>
       </li>
       <li>
         <%= link_to messages_path do %>
-          Messages <%= icon 'envelope' %>
+          Messages <%= icon 'fas', 'envelope' %>
         <% end %>
         <% if c = cuser.new_messages.count > 0 %>
           (<%= cuser.new_messages.count %>)
@@ -35,7 +35,7 @@
       <li>
         <%= form_tag(controller: 'users', action: 'logout') do %>
           <%= link_to '#', id: 'logout' do %>
-            Logout <%= icon 'key' %>
+            Logout <%= icon 'fas', 'key' %>
           <% end %>
         <% end %>
       </li>