Merge remote-tracking branch 'upstream/3.x' into 3.x

moonshine-software · Jan 22, 2025 · 7866f5d · 7866f5d
2 parents 9f47cce + 8147df1
commit 7866f5d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/Laravel/src/Layouts/AppLayout.php b/src/Laravel/src/Layouts/AppLayout.php
@@ -62,7 +62,7 @@ public function build(): Layout
 
                                 $this->getFooterComponent(),
                             ])->class('layout-page')->name(self::CONTENT_FRAGMENT_NAME),
-                        ])->class('flex grow')->customAttributes(['id' => self::CONTENT_ID]),
+                        ])->class('flex grow overflow-auto')->customAttributes(['id' => self::CONTENT_ID]),
                     ]),
                 ]),
             ])

diff --git a/src/Laravel/src/Layouts/CompactLayout.php b/src/Laravel/src/Layouts/CompactLayout.php
@@ -102,7 +102,7 @@ public function build(): Layout
 
                                 $this->getFooterComponent(),
                             ])->class('layout-page')->name(self::CONTENT_FRAGMENT_NAME),
-                        ])->class('flex grow')->customAttributes(['id' => self::CONTENT_ID]),
+                        ])->class('flex grow overflow-auto')->customAttributes(['id' => self::CONTENT_ID]),
                     ]),
                 ])->class('theme-minimalistic'),
             ])

diff --git a/src/UI/dist/assets/main.css b/src/UI/dist/assets/main.css
diff --git a/src/UI/tailwind.config.js b/src/UI/tailwind.config.js
@@ -28,6 +28,7 @@ const clientSafeList = [
   'visible',
   '!hidden',
   '!block',
+  'overflow-auto',
   'pointer-events-auto',
   'opacity-0',
   'opacity-100',