Merge branch 'develop' into pagetitles2

resources/scripts/components/server/backups/BackupContainer.tsx

@@ -57,7 +57,7 @@ export default () => {
                 </div>
             }
             {featureLimits.backups === 0 &&
-                <p className="text-center text-sm text-neutral-400">
+                <p css={tw`text-center text-sm text-neutral-400`}>
                     Backups cannot be created for this server.
                 </p>
             }

resources/scripts/components/server/backups/CreateBackupButton.tsx

@@ -49,7 +49,7 @@ const ModalContent = ({ ...props }: RequiredModalProps) => {
                     </FormikFieldWrapper>
                 </div>
                 <div css={tw`flex justify-end`}>
-                    <Button type={'submit'}>
+                    <Button type={'submit'} disabled={isSubmitting}>
                         Start backup
                     </Button>
                 </div>
@@ -94,11 +94,7 @@ export default () => {
                     ignored: string(),
                 })}
             >
-                <ModalContent
-                    appear
-                    visible={visible}
-                    onDismissed={() => setVisible(false)}
-                />
+                <ModalContent appear visible={visible} onDismissed={() => setVisible(false)}/>
             </Formik>
             }
             <Button onClick={() => setVisible(true)}>