Merge remote-tracking branch 'upstream/pull/3649'

diff --git a/Gemfile b/Gemfile
index 65ee29d58dac53ea8aa0014f61603180d563f873..1b2b60864e080919086a01f3a4cd0fadd760f067 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,9 @@ gem "image_optim_rails"
 # Use argon2 for password hashing
 gem "argon2"
 
+# Support brotli compression for assets
+gem "sprockets-exporters_pack"
+
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d0587ad95bc4f51f701e9d3cd49d8d690e5aeeb..d2d443eb68010c5a4388f3c62f4b32ffff9a42e7 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,6 +125,7 @@ GEM
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     brakeman (5.2.3)
+    brotli (0.4.0)
     browser (5.3.1)
     builder (3.2.4)
     bzip2-ffi (1.1.0)
@@ -476,6 +477,9 @@ GEM
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    sprockets-exporters_pack (0.1.2)
+      brotli (>= 0.2.0)
+      sprockets (>= 4.0.0.beta3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -590,6 +594,7 @@ DEPENDENCIES
   selenium-webdriver
   simplecov
   simplecov-lcov
+  sprockets-exporters_pack
   strong_migrations
   terser
   validates_email_format_of (>= 1.5.1)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fdf35d615d0e106981421e3d85e1701130337db9..9ec7fb3f4f14f6a2ad429738f44051cd26560484 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -201,16 +201,9 @@ nav.secondary {
       &:hover {
         border-color: $grey;
       }
-      &:focus {
-        background-color: white;
-        box-shadow: none;
-      }
     }
     &.show .btn-outline-secondary {
       background-color: white;
-      &:focus {
-        box-shadow: none;
-      }
     }
   }
 

diff --git a/config/initializers/brotli.rb b/config/initializers/brotli.rb
new file mode 100644 (file)
index 0000000..9e8125b
--- /dev/null
+++ b/config/initializers/brotli.rb
@@ -0,0 +1,3 @@
+Rails.application.config.assets.configure do |env|
+  env.register_exporter %w[text/* application/javascript application/json application/xml image/x-icon image/svg+xml], Sprockets::ExportersPack::BrotliExporter
+end