diff --git a/Gemfile b/Gemfile index e21209a9..75a2348b 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'pg', '1.3.5' gem 'puma', '4.3.12' -gem 'webpacker', '4.3.0' +gem 'webpacker', '5.4.4' gem 'turbolinks', '5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index afdc974c..a41a8883 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,9 +128,9 @@ GEM listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.20.0) + loofah (2.21.2) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -154,7 +154,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.14.3) + nokogiri (1.14.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) orm_adapter (0.5.0) @@ -166,7 +166,7 @@ GEM activesupport (>= 3.0.0) racc (1.6.2) rack (2.2.7) - rack-proxy (0.7.2) + rack-proxy (0.7.6) rack rack-test (2.1.0) rack (>= 1.3) @@ -233,6 +233,7 @@ GEM childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) + semantic_range (3.0.0) spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -244,7 +245,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.2.1) + thor (1.2.2) tilt (2.0.10) timeout (0.3.2) turbolinks (5.2.1) @@ -263,10 +264,11 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0) - webpacker (4.3.0) - activesupport (>= 4.2) + webpacker (5.4.4) + activesupport (>= 5.2) rack-proxy (>= 0.6.1) - railties (>= 4.2) + railties (>= 5.2) + semantic_range (>= 2.3.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -302,7 +304,7 @@ DEPENDENCIES tzinfo-data web-console (>= 3.3.0) webdrivers (= 5.0.0) - webpacker (= 4.3.0) + webpacker (= 5.4.4) RUBY VERSION ruby 3.0.6p216 diff --git a/app/javascript/components/SiteSettings/Boards/BoardEditable.tsx b/app/javascript/components/SiteSettings/Boards/BoardEditable.tsx index 7acb399d..4bdc1d0a 100644 --- a/app/javascript/components/SiteSettings/Boards/BoardEditable.tsx +++ b/app/javascript/components/SiteSettings/Boards/BoardEditable.tsx @@ -6,7 +6,6 @@ import { DescriptionText } from '../../common/CustomTexts'; import DragZone from '../../common/DragZone'; import PostBoardLabel from '../../common/PostBoardLabel'; -import Separator from '../../common/Separator'; import BoardForm from './BoardForm'; import ActionLink from '../../common/ActionLink'; import { CancelIcon, DeleteIcon, EditIcon } from '../../common/Icons'; diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index dd38bac1..313aa87c 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -8,6 +8,9 @@ require("turbolinks").start() require("@rails/activestorage").start() require("channels") +// i18n-js translations +require('translations/index.js.erb') + require("./bootstrap_custom") require("../stylesheets/main") require("../images/favicon.png") @@ -23,5 +26,3 @@ require("../images/logo.png") var componentRequireContext = require.context("components", true); var ReactRailsUJS = require("react_ujs"); ReactRailsUJS.useContext(componentRequireContext); - -import I18n from 'translations/index.js.erb' \ No newline at end of file diff --git a/app/javascript/stylesheets/common/_index.scss b/app/javascript/stylesheets/common/_index.scss index b79ea7b8..5d8bc670 100644 --- a/app/javascript/stylesheets/common/_index.scss +++ b/app/javascript/stylesheets/common/_index.scss @@ -190,6 +190,7 @@ } .actionLink { + color: $astuto-black; display: flex; cursor: pointer; align-self: center; diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index c8831dec..897c04c9 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -30,7 +30,7 @@