pull changes from main (#921)

Author: Kneeba921

Gemfile.lock

@@ -167,19 +167,20 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1133.0)
-    aws-sdk-core (3.227.0)
+    aws-partitions (1.1139.0)
+    aws-sdk-core (3.228.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.107.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-kms (1.109.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.194.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-s3 (1.195.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -396,7 +397,7 @@ GEM
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.2.1)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
@@ -495,6 +496,8 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
+    pg (1.6.0-aarch64-linux)
+    pg (1.6.0-arm64-darwin)
     pg (1.6.0-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.2)
@@ -521,7 +524,7 @@ GEM
       i18n (>= 0.5.0)
       railties (>= 6.1.0)
     public_suffix (6.0.1)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     pundit (2.5.0)
       activesupport (>= 3.0.0)

app/assets/stylesheets/better_together/application.scss

@@ -74,7 +74,7 @@
 #flash_messages {
   position: absolute;
   width: 100vw;
-  top: 7.5vh;
+  top: 6vh;
   z-index: 1001;
 }
 

app/views/better_together/pages/show.html.erb

@@ -28,7 +28,7 @@
 
 <% if @page.primary_image&.attached? %>
   <% content_for :og_image do %>
-    <%= url_for(@page.primary_image) %>
+    <%= rails_storage_proxy_url(@page.primary_image) %>
   <% end %>
 <% end %>