Merge pull request #33307 from nextcloud/bump/nextcloud-dialogs-3.1.2-to-3.1.4

Bump nextcloud-dialogs from 3.1.2 to 3.1.4

core/css/server.css

@@ -5087,18 +5087,21 @@ kbd {
   background-color: var(--color-main-background);
   color: var(--color-main-text);
   box-shadow: 0 0 6px 0 var(--color-box-shadow);
-  padding: 12px;
-  padding-right: 34px;
+  padding: 0 12px;
   margin-top: 45px;
   position: fixed;
   z-index: 10100;
   border-radius: var(--border-radius);
+  display: flex;
+  align-items: center;
+}
+.toastify.dialogs .toast-undo-container {
+  display: flex;
+  align-items: center;
 }
 .toastify.dialogs .toast-undo-button,
 .toastify.dialogs .toast-close {
-  position: absolute;
-  top: 0;
-  right: 0;
+  position: static;
   overflow: hidden;
   box-sizing: border-box;
   min-width: 44px;
@@ -5112,14 +5115,28 @@ kbd {
 }
 .toastify.dialogs .toast-undo-button.toast-close,
 .toastify.dialogs .toast-close.toast-close {
-  background-image: url("./close.svg");
-  text-indent: 200%;
+  text-indent: 0;
   opacity: 0.4;
+  border: none;
+  min-height: 44px;
+  margin-left: 10px;
+  font-size: 0;
+  /* dark theme overrides for Nextcloud 25 and later */
+}
+.toastify.dialogs .toast-undo-button.toast-close::before,
+.toastify.dialogs .toast-close.toast-close::before {
+  background-image: url("./close.svg");
+  content: " ";
+  filter: var(--background-invert-if-dark);
+  display: inline-block;
+  width: 16px;
+  height: 16px;
 }
 .toastify.dialogs .toast-undo-button.toast-undo-button,
 .toastify.dialogs .toast-close.toast-undo-button {
   margin: 3px;
   height: calc(100% - 2 * 3px);
+  margin-left: 12px;
 }
 .toastify.dialogs .toast-undo-button:hover, .toastify.dialogs .toast-undo-button:focus, .toastify.dialogs .toast-undo-button:active,
 .toastify.dialogs .toast-close:hover,
@@ -5150,11 +5167,11 @@ kbd {
   border-left: 3px solid var(--color-success);
 }
 
-/* dark theme overrides */
+/* dark theme overrides for Nextcloud 24 and earlier */
 .theme--dark .toastify.dialogs .toast-close {
   /* close icon style */
 }
-.theme--dark .toastify.dialogs .toast-close.toast-close {
+.theme--dark .toastify.dialogs .toast-close.toast-close::before {
   background-image: url("./close-dark.svg");
 }
 

package-lock.json

@@ -14,7 +14,7 @@
         "@nextcloud/axios": "^1.10.0",
         "@nextcloud/calendar-availability-vue": "^0.3.1",
         "@nextcloud/capabilities": "^1.0.4",
-        "@nextcloud/dialogs": "^3.1.2",
+        "@nextcloud/dialogs": "^3.1.4",
         "@nextcloud/event-bus": "^2.1.1",
         "@nextcloud/files": "^2.1.0",
         "@nextcloud/initial-state": "^1.2.1",
@@ -3009,14 +3009,18 @@
       }
     },
     "node_modules/@nextcloud/dialogs": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.1.2.tgz",
-      "integrity": "sha512-hVgpr/CF0F+cE7tRZHJDVpB1S05K/pDcUMrfDpoxMKhux5SXlpwLXUaWM7iAbHEKYm6ArWdpUyhxBTTAo9yrvg==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.1.4.tgz",
+      "integrity": "sha512-Jf/DWacCqPZDWroDkdOFuX+3AyHVWjy6JpkxAUNkmFPlKjNG8fGPRm/cdQIkqVqAnC+b1sUdMqH6N89Zdyks2Q==",
       "dependencies": {
         "@nextcloud/l10n": "^1.3.0",
         "@nextcloud/typings": "^1.0.0",
         "core-js": "^3.6.4",
-        "toastify-js": "^1.10.0"
+        "toastify-js": "^1.12.0"
+      },
+      "engines": {
+        "node": "^14.0.0",
+        "npm": "^7.0.0"
       }
     },
     "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/typings": {
@@ -29904,9 +29908,9 @@
       }
     },
     "node_modules/toastify-js": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.11.2.tgz",
-      "integrity": "sha512-bMBNKhZLPX/sDhpwM7KHIRUTtqCylQeoZDiEWy5zE7iDUJ92XmP8AKgDAp9rXx6pR5GXGFtQHHoH62toahbHgQ=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz",
+      "integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ=="
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
@@ -34053,14 +34057,14 @@
       }
     },
     "@nextcloud/dialogs": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.1.2.tgz",
-      "integrity": "sha512-hVgpr/CF0F+cE7tRZHJDVpB1S05K/pDcUMrfDpoxMKhux5SXlpwLXUaWM7iAbHEKYm6ArWdpUyhxBTTAo9yrvg==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.1.4.tgz",
+      "integrity": "sha512-Jf/DWacCqPZDWroDkdOFuX+3AyHVWjy6JpkxAUNkmFPlKjNG8fGPRm/cdQIkqVqAnC+b1sUdMqH6N89Zdyks2Q==",
       "requires": {
         "@nextcloud/l10n": "^1.3.0",
         "@nextcloud/typings": "^1.0.0",
         "core-js": "^3.6.4",
-        "toastify-js": "^1.10.0"
+        "toastify-js": "^1.12.0"
       },
       "dependencies": {
         "@nextcloud/typings": {
@@ -55243,9 +55247,9 @@
       }
     },
     "toastify-js": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.11.2.tgz",
-      "integrity": "sha512-bMBNKhZLPX/sDhpwM7KHIRUTtqCylQeoZDiEWy5zE7iDUJ92XmP8AKgDAp9rXx6pR5GXGFtQHHoH62toahbHgQ=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz",
+      "integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ=="
     },
     "toidentifier": {
       "version": "1.0.1",

package.json

@@ -34,7 +34,7 @@
     "@nextcloud/axios": "^1.10.0",
     "@nextcloud/calendar-availability-vue": "^0.3.1",
     "@nextcloud/capabilities": "^1.0.4",
-    "@nextcloud/dialogs": "^3.1.2",
+    "@nextcloud/dialogs": "^3.1.4",
     "@nextcloud/event-bus": "^2.1.1",
     "@nextcloud/files": "^2.1.0",
     "@nextcloud/initial-state": "^1.2.1",