Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Author: geodem127

src/apps/content-editor/src/app/views/ItemList/ConfirmDeletesDialog.tsx

@@ -14,6 +14,7 @@ import { DeleteRounded } from "@mui/icons-material";
 import { useRef } from "react";
 import { ContentItem } from "../../../../../../shell/services/types";
 import { DialogContentItem } from "./DialogContentItem";
+import pluralizeWord from "../../../../../../utility/pluralizeWord";
 
 type ConfirmDeletesModalProps = {
   items: ContentItem[];
@@ -49,9 +50,10 @@ export const ConfirmDeletesDialog = ({
         </Stack>
         <Box>Delete {items.length} Items:</Box>
         <Typography variant="body2" color="text.secondary" mt={1}>
-          Deleting these {items.length} items will remove it from all locations
-          throughout your site and make it unavailable to API requests. This
-          cannot be undone.
+          Deleting {items.length > 1 ? "these" : "this"} {items.length}{" "}
+          {pluralizeWord("item", items.length)} will remove it from all
+          locations throughout your site and make it unavailable to API
+          requests. This cannot be undone.
         </Typography>
       </DialogTitle>
       <DialogContent>

src/apps/content-editor/src/app/views/ItemList/ConfirmPublishesDialog.tsx

@@ -57,7 +57,9 @@ export const ConfirmPublishesModal = ({
         <Typography variant="body2" color="text.secondary" mt={1}>
           This will make the the following {items.length} content{" "}
           {pluralizeWord("item", items.length)} immediately available on all of
-          your platforms. You can always unpublish this item later if needed.
+          your platforms. You can always unpublish{" "}
+          {items.length > 1 ? "these" : "this"}{" "}
+          {pluralizeWord("item", items.length)} later if needed.
         </Typography>
       </DialogTitle>
       <DialogContent>

src/shell/components/login/Login.js

@@ -92,12 +92,9 @@ export default connect((state) => {
         display="flex"
         alignItems="center"
         justifyContent="center"
-        sx={{
-          backgroundColor: "grey.900",
-        }}
       >
         <Paper
-          elevation={0}
+          elevation={8}
           sx={{
             boxSizing: "border-box",
             width: "400px",
@@ -300,15 +297,6 @@ export default connect((state) => {
             </Box>
           )}
         </Paper>
-        <Box
-          component="img"
-          src={zestyLogo}
-          position="fixed"
-          top="32px"
-          left="32px"
-          alt="Zesty.io Logo"
-          loading="lazy"
-        />
       </Box>
     );
   })

src/shell/components/private-route/index.js

@@ -74,7 +74,6 @@ export default connect((state) => {
         <Backdrop
           sx={{
             zIndex: (theme) => theme.zIndex.tooltip + 10, // Needs to be on top of everything
-            bgcolor: "background.paper",
           }}
           open={!props.auth.checking && !props.auth.valid}
         >