Merge branch 'master' into support/devide-core-package

apps/app/src/components/Admin/Customize/CustomizeThemeOptions.tsx

@@ -30,7 +30,7 @@ const CustomizeThemeOptions = (props: Props): JSX.Element => {
       {/* Light and Dark Themes */}
       <div>
         <h3 className="mb-3">{t('customize_settings.theme_desc.light_and_dark')}</h3>
-        <div className="hstack gap-3">
+        <div className="hstack gap-3 flex-wrap">
           {lightNDarkThemes.map((theme) => {
             return (
               <ThemeColorBox
@@ -47,7 +47,7 @@ const CustomizeThemeOptions = (props: Props): JSX.Element => {
       {/* Only one mode Theme */}
       <div className="mt-3">
         <h3 className="mb-3">{t('customize_settings.theme_desc.unique')}</h3>
-        <div className="hstack gap-3">
+        <div className="hstack gap-3 align-items-start flex-wrap">
           {oneModeThemes.map((theme) => {
             return (
               <ThemeColorBox

apps/app/src/features/growi-plugin/server/services/growi-plugin/growi-plugin.integ.ts

@@ -88,7 +88,7 @@ describe('Installing a GROWI theme plugin', () => {
     expect(results.themeMetadata).not.toBeNull();
     expect(results.themeHref).not.toBeNull();
     expect(results.themeHref
-      .startsWith('/static/plugins/weseek/growi-plugin-theme-vivid-internet/dist/assets/style.')).toBeTruthy();
+      .startsWith('/static/plugins/weseek/growi-plugin-theme-vivid-internet/dist/assets/style-')).toBeTruthy();
   });
 
 });

apps/app/src/server/service/file-uploader/aws.ts

@@ -236,8 +236,7 @@ module.exports = (crowi) => {
         configManager.getConfig('crowi', 'aws:s3Region') != null
           || configManager.getConfig('crowi', 'aws:s3CustomEndpoint') != null
       )
-      && configManager.getConfig('crowi', 'aws:s3Bucket') != null
-      && configManager.getConfig('crowi', 'aws:s3BucketAclsDisable') != null;
+      && configManager.getConfig('crowi', 'aws:s3Bucket') != null;
   };
 
   (lib as any).deleteFile = async function(attachment) {