Update @nextcloud/dialogs@ and fix toasts styling

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
nextcloud · Nov 2, 2022 · 2dcd716 · 2dcd716
1 parent 77c6d24
commit 2dcd716
Show file tree

Hide file tree

Showing 61 changed files with 290 additions and 119 deletions.
diff --git a/apps/federatedfilesharing/src/main-admin.js b/apps/federatedfilesharing/src/main-admin.js
@@ -23,7 +23,7 @@
 import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { translate as t } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 import { loadState } from '@nextcloud/initial-state'
 
 import AdminSettings from './components/AdminSettings'

diff --git a/apps/federatedfilesharing/src/main-personal.js b/apps/federatedfilesharing/src/main-personal.js
@@ -20,7 +20,7 @@
 import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { translate as t } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 
 import PersonalSettings from './components/PersonalSettings'
 

diff --git a/apps/settings/src/main-admin-basic-settings.js b/apps/settings/src/main-admin-basic-settings.js
@@ -24,7 +24,7 @@ import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import { translate as t } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 
 import logger from './logger'
 

diff --git a/apps/settings/src/main-personal-info.js b/apps/settings/src/main-personal-info.js
@@ -24,7 +24,7 @@ import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import { translate as t } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 
 import AvatarSection from './components/PersonalInfo/AvatarSection.vue'
 import DetailsSection from './components/PersonalInfo/DetailsSection.vue'

diff --git a/apps/settings/src/store/apps.js b/apps/settings/src/store/apps.js
@@ -26,7 +26,7 @@ import api from './api'
 import Vue from 'vue'
 import { generateUrl } from '@nextcloud/router'
 import { showError, showInfo } from '@nextcloud/dialogs'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 
 const state = {
 	apps: [],

diff --git a/apps/sharebymail/src/main-admin.js b/apps/sharebymail/src/main-admin.js
@@ -23,7 +23,7 @@
 import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { translate as t } from '@nextcloud/l10n'
-import '@nextcloud/dialogs/styles/toast.scss'
+import '@nextcloud/dialogs/dist/index.css'
 
 import AdminSettings from './components/AdminSettings'
 

diff --git a/core/css/server.css b/core/css/server.css
diff --git a/core/css/server.css.map b/core/css/server.css.map
diff --git a/core/css/server.scss b/core/css/server.scss
@@ -7,5 +7,6 @@
 @import 'fixes.scss';
 @import 'mobile.scss';
 @import 'tooltip.scss';
-@import '../../node_modules/@nextcloud/dialogs/styles/toast.scss';
+// If you include .css, it will be imported as url
+@import '../../node_modules/@nextcloud/dialogs/dist/index';
 @import 'public.scss';
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js