Merge branch 'master' of github.com:noesya/osuny

Gemfile.lock

@@ -79,7 +79,7 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.518.0)
+    aws-partitions (1.519.0)
     aws-sdk-core (3.121.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -112,8 +112,9 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (3.3.0)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -200,7 +201,7 @@ GEM
       thor (>= 0.14, < 2.0)
     js_cookie_rails (2.2.0)
       railties (>= 3.1)
-    json (2.6.0)
+    json (2.6.1)
     kamifusen (1.9)
       image_processing
       rails
@@ -225,6 +226,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -328,7 +330,7 @@ GEM
     simple_form_bs5_file_input (0.0.3)
       rails
       simple_form
-    simple_form_password_with_hints (0.0.2)
+    simple_form_password_with_hints (0.0.3)
       rails
       simple_form
     sinatra (2.1.0)

app/assets/javascripts/admin.js

 //= require activestorage
-//= require bootstrap-sprockets
 //= require jquery3
 //= require jquery_ujs
 //= require notyf/notyf.min

app/assets/stylesheets/commons/_forms.sass

@@ -2,3 +2,6 @@
     position: relative
 .sfpwh-password-toggle
     top: calc(50% - 6px)
+
+legend ~ *
+    clear: left