diff --git a/Gemfile b/Gemfile index 4dc4c4a..dd144b6 100644 --- a/Gemfile +++ b/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 'font-awesome-sass' +gem 'bourbon','~> 3.1.8' +gem 'font-awesome-sass', '~> 4.1.0.0' gem 'haml' -gem 'neat' -gem 'sass-rails' +gem 'neat', '~> 1.6.0' +gem 'sass-rails', '~> 5.0.3' gem 'uglifier', '~> 2.5.0' # Dependency version fix diff --git a/Gemfile.lock b/Gemfile.lock index 1ad2d88..d2a432d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,57 +9,65 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) + nio4r (~> 2.0) + 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) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + 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) - activesupport (= 4.2.11.1) - globalid (>= 0.3.0) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) - builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) - arel (~> 6.0) - activesupport (4.2.11.1) - i18n (~> 0.7) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) + globalid (>= 0.3.6) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) + arel (>= 9.0) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + 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) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + capybara (3.31.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + carrierwave (2.1.0) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + 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) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.7) + 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) - activesupport (>= 3.0.0) - factory_bot_rails (4.11.1) - factory_bot (~> 4.11.1) - railties (>= 3.0.0) + factory_bot (5.1.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.1.1) + factory_bot (~> 5.1.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 (~> 0.9.3) - railties (~> 4.0) + i18n-country-translations (1.4.1) + i18n (>= 0.9.3, < 2) + 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) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) + jquery-rails (4.3.5) + rails-dom-testing (>= 1, < 3) + 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) - capybara (~> 2.1) + poltergeist (1.18.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) - railties (>= 3.1, < 5.0) - rack (1.6.13) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.11.1) - actionmailer (= 4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) - activemodel (= 4.2.11.1) - activerecord (= 4.2.11.1) - activesupport (= 4.2.11.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) + bundler (>= 1.3.0) + railties (= 5.2.4.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + railties (5.2.4.1) + actionpack (= 5.2.4.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) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) retriable (3.1.2) rexml (3.2.4) rmagick (4.0.0) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) + rspec-support (~> 3.9.0) + rspec-rails (3.9.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.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) - sanitize (2.1.1) - nokogiri (>= 1.4.4) + ruby-vips (2.0.17) + ffi (~> 1.9) + 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) - railties (>= 4.0.0, < 6) + sass-rails (5.0.8) + 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) - childprocess (~> 0.5) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) + simplecov (0.18.5) + docile (~> 1.1) + simplecov-html (~> 0.11) + 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) - tinymce-rails (3.5.11.1) + timecop (0.9.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) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - websocket (1.2.8) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) will_paginate (3.0.12) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + 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) - carrierwave (~> 0.10.0) - codeclimate-test-reporter (~> 0.3.0) - coffee-rails (~> 4.0.0) + capybara + carrierwave + codeclimate-test-reporter + 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) - mysql2 (= 0.3.18) + jquery-rails + mysql2 neat (~> 1.6.0) - newrelic_rpm (~> 3.13.0.299) - nokogiri (~> 1.9.0) + newrelic_rpm + nokogiri phantomjs - poltergeist (~> 1.6.0) - protected_attributes (~> 1.1.3) + poltergeist pry-byebug (~> 1.3.2) - public_suffix (~> 3.1.1) + public_suffix puma - quiet_assets - rails (~> 4.2.11.1) - rails_autolink (~> 1.1.5) + rails (~> 5.2.4.1) + rails_autolink 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) - timecop (~> 0.7.1) - tinymce-rails (~> 3.5.9) + test-unit + timecop + 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 diff --git a/app/assets/stylesheets/themes/default/_variables.scss b/app/assets/stylesheets/themes/default/_variables.scss index 800f867..bbd580d 100644 --- a/app/assets/stylesheets/themes/default/_variables.scss +++ b/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); /* diff --git a/app/views/articles/_preview.html.erb b/app/views/articles/_preview.html.erb index 5d1b24a..d2f46db 100644 --- a/app/views/articles/_preview.html.erb +++ b/app/views/articles/_preview.html.erb @@ -11,7 +11,7 @@
<%= link_to article do %> - <%= icon 'comments' %> Comments (<%= article.comments.count %>) + <%= icon 'fas', 'fas', 'comments' %> Comments (<%= article.comments.count %>) <% end %>
diff --git a/app/views/articles/_top.html.erb b/app/views/articles/_top.html.erb index 35cd808..47d2826 100644 --- a/app/views/articles/_top.html.erb +++ b/app/views/articles/_top.html.erb @@ -2,7 +2,7 @@ <% if article.previous_article %> @@ -11,7 +11,7 @@ <% end %> diff --git a/app/views/contesters/_ladder.html.erb b/app/views/contesters/_ladder.html.erb index 4980141..6c58ff4 100644 --- a/app/views/contesters/_ladder.html.erb +++ b/app/views/contesters/_ladder.html.erb @@ -21,17 +21,17 @@ <%= h rank + 1%>. <% if contester.trend == Contester::TREND_UP %> - <%= icon 'chevron-up' %> + <%= icon 'fas', 'chevron-up' %> <% elsif contester.trend == Contester::TREND_DOWN %> - <%= icon 'chevron-down' %> + <%= icon 'fas', 'chevron-down' %> <% elsif contester.trend == Contester::TREND_FLAT %> - <%= icon 'minus' %> + <%= icon 'fas', 'minus' %> <% else %> <% end %> <%= flag contester.team.country %> <%= link_to (h contester.team.name), contester %> - <%= icon 'trophy' if contester == contester.contest.winner %> + <%= icon 'fas', 'trophy' if contester == contester.contest.winner %> <%= h contester.win %> <%= h contester.loss %> <%= h contester.draw %> diff --git a/app/views/contesters/_list.html.erb b/app/views/contesters/_list.html.erb index ba7fef9..b517ce6 100644 --- a/app/views/contesters/_list.html.erb +++ b/app/views/contesters/_list.html.erb @@ -19,17 +19,17 @@ <% contesters.each do |contester| %> <% if contester.trend == Contester::TREND_UP %> - <%= icon 'chevron-up' %> + <%= icon 'fas', 'chevron-up' %> <% elsif contester.trend == Contester::TREND_DOWN %> - <%= icon 'chevron-down' %> + <%= icon 'fas', 'chevron-down' %> <% elsif contester.trend == Contester::TREND_FLAT %> - <%= icon 'minus' %> + <%= icon 'fas', 'minus' %> <% else %> <% end %> <%= flag contester.team.country %> <%= link_to (h contester.team.name), contester %> - <%= icon 'trophy' if contester == contester.contest.winner %> + <%= icon 'fas', 'trophy' if contester == contester.contest.winner %> <%= h contester.total_score %> <%= h contester.win %> <%= h contester.loss %> diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index da77de2..665635a 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -27,10 +27,10 @@ <% 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 %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index f8faea7..1dce29c 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,7 +1,7 @@ <%= provide :content_class, 'no-body' %>
- <%= link_to "Forums", action: "index" %> <%= icon 'chevron-right' %> <%= namelink @forum %> + <%= link_to "Forums", action: "index" %> <%= icon 'fas', 'chevron-right' %> <%= namelink @forum %>
diff --git a/app/views/gatherers/_list.html.erb b/app/views/gatherers/_list.html.erb index 62e9606..2b058af 100644 --- a/app/views/gatherers/_list.html.erb +++ b/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 %> diff --git a/app/views/gathers/_running.html.erb b/app/views/gathers/_running.html.erb index 529e917..50397d5 100644 --- a/app/views/gathers/_running.html.erb +++ b/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 %> diff --git a/app/views/gathers/index.html.erb b/app/views/gathers/index.html.erb index e4d205d..939f1b8 100644 --- a/app/views/gathers/index.html.erb +++ b/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 %> @@ -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 %> diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 904d405..82d9140 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -132,14 +132,14 @@ @@ -188,7 +188,7 @@
- <%= icon 'times' %> + <%= icon 'fas', 'times' %> Hide information
diff --git a/app/views/matches/_list.html.erb b/app/views/matches/_list.html.erb index d5b48eb..8cb6e01 100644 --- a/app/views/matches/_list.html.erb +++ b/app/views/matches/_list.html.erb @@ -47,9 +47,9 @@ <% if match.contest.contest_type == Contest::TYPE_LADDER %> <% 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) %> diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 61e394c..6246bf1 100755 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -29,7 +29,7 @@ <% @match.team1_lineup.each do |teamer| %>
  • <% 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 %>
    • <% end %> diff --git a/app/views/teams/_list.html.erb b/app/views/teams/_list.html.erb index b560f56..0d50903 100644 --- a/app/views/teams/_list.html.erb +++ b/app/views/teams/_list.html.erb @@ -18,15 +18,15 @@ <% if cuser and cuser.admin? %> <%= 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 %> diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb index a0cba1a..fd37d29 100644 --- a/app/views/teams/edit.html.erb +++ b/app/views/teams/edit.html.erb @@ -74,7 +74,7 @@ <%= link_to member, confirm: 'Are you sure?', method: :delete, class: 'button tiny' do %> - <%= icon 'times' %> Remove + <%= icon 'fas', 'times' %> Remove <% end %> diff --git a/app/views/topics/_breadcrumbs.html.erb b/app/views/topics/_breadcrumbs.html.erb index cb89e4e..55bc77d 100644 --- a/app/views/topics/_breadcrumbs.html.erb +++ b/app/views/topics/_breadcrumbs.html.erb @@ -1,7 +1,7 @@
    <%= link_to "Forums", forums_url %> - <%= icon 'chevron-right' %> + <%= icon 'fas', 'chevron-right' %> <%= namelink topic.forum %> - <%= icon 'chevron-right' %> + <%= icon 'fas', 'chevron-right' %> <%= namelink topic %>
    \ No newline at end of file diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9ce4e05..550a520 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -39,10 +39,10 @@ <% if cuser and cuser.admin? %> <%= 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 %> <% end %> diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb index a54451b..2d44a0e 100644 --- a/app/views/widgets/_logged.html.erb +++ b/app/views/widgets/_logged.html.erb @@ -4,29 +4,29 @@ <% if cuser.admin? %>
  • <%= 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 %>
    • <% elsif cuser.moderator? %>
  • <%= 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 %>
    • <% end %>
  • <%= link_to user_path(cuser) do %> - Account <%= icon 'user' %> + Account <%= icon 'fas', 'user' %> <% end %>
  • <%= link_to "/users/agenda/#{cuser.id}" do %> - Agenda <%= icon 'calendar' %> + Agenda <%= icon 'fas', 'calendar' %> <% end %>
  • <%= 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 @@
  • <%= form_tag(controller: 'users', action: 'logout') do %> <%= link_to '#', id: 'logout' do %> - Logout <%= icon 'key' %> + Logout <%= icon 'fas', 'key' %> <% end %> <% end %>