diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue index 340360c6302..5bb7f60c015 100644 --- a/apps/federatedfilesharing/src/components/AdminSettings.vue +++ b/apps/federatedfilesharing/src/components/AdminSettings.vue @@ -82,8 +82,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' import logger from '../services/logger.ts' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'AdminSettings', diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index f7d2e9d1e03..d0ba41fa071 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -77,8 +77,6 @@ import NcNoteCard from '@nextcloud/vue/components/NcNoteCard' import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' import logger from '../../logger.ts' -import '@nextcloud/password-confirmation/dist/style.css' - const lastCron = loadState('settings', 'lastCron') const cronMaxAge = loadState('settings', 'cronMaxAge', '') const backgroundJobsMode = loadState('settings', 'backgroundJobsMode', 'cron') diff --git a/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue b/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue index f221523c5ff..cb3b3e00dfe 100644 --- a/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue +++ b/apps/settings/src/components/WebAuthn/WebAuthnAddDevice.vue @@ -63,10 +63,8 @@ import { startRegistration, } from '../../service/WebAuthnRegistrationSerice.ts' -import '@nextcloud/password-confirmation/dist/style.css' - /** - * @param {string} text + * @param {string} text The text to log */ function logAndPass(text) { return (data) => { diff --git a/apps/settings/src/components/WebAuthn/WebAuthnSection.vue b/apps/settings/src/components/WebAuthn/WebAuthnSection.vue index e15a9b779d7..2fe6aa93f20 100644 --- a/apps/settings/src/components/WebAuthn/WebAuthnSection.vue +++ b/apps/settings/src/components/WebAuthn/WebAuthnSection.vue @@ -48,8 +48,6 @@ import WebAuthnDevice from './WebAuthnDevice.vue' import logger from '../../logger.ts' import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js' -import '@nextcloud/password-confirmation/dist/style.css' - const sortByName = sortBy('name') export default { diff --git a/apps/settings/src/main-personal-security.js b/apps/settings/src/main-personal-security.js index 8d2596337e0..eabad1bca60 100644 --- a/apps/settings/src/main-personal-security.js +++ b/apps/settings/src/main-personal-security.js @@ -9,8 +9,6 @@ import VTooltipPlugin from 'v-tooltip' import Vue from 'vue' import AuthTokenSection from './components/AuthTokenSection.vue' -import '@nextcloud/password-confirmation/dist/style.css' - __webpack_nonce__ = getCSPNonce() const pinia = createPinia() diff --git a/apps/settings/src/service/PersonalInfo/EmailService.js b/apps/settings/src/service/PersonalInfo/EmailService.js index 199751aa6e9..3811856598a 100644 --- a/apps/settings/src/service/PersonalInfo/EmailService.js +++ b/apps/settings/src/service/PersonalInfo/EmailService.js @@ -9,8 +9,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation' import { generateOcsUrl } from '@nextcloud/router' import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts' -import '@nextcloud/password-confirmation/dist/style.css' - /** * Save the primary email of the user * diff --git a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js index 4e346b34991..acb4cb5e996 100644 --- a/apps/settings/src/service/PersonalInfo/PersonalInfoService.js +++ b/apps/settings/src/service/PersonalInfo/PersonalInfoService.js @@ -9,8 +9,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation' import { generateOcsUrl } from '@nextcloud/router' import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts' -import '@nextcloud/password-confirmation/dist/style.css' - /** * Save the primary account property value for the user * diff --git a/apps/settings/src/service/ProfileService.js b/apps/settings/src/service/ProfileService.js index 7e01188b3ee..1e0f4d46bbe 100644 --- a/apps/settings/src/service/ProfileService.js +++ b/apps/settings/src/service/ProfileService.js @@ -8,8 +8,6 @@ import axios from '@nextcloud/axios' import { confirmPassword } from '@nextcloud/password-confirmation' import { generateOcsUrl } from '@nextcloud/router' -import '@nextcloud/password-confirmation/dist/style.css' - /** * Save the visibility of the profile parameter * diff --git a/apps/settings/src/store/api.js b/apps/settings/src/store/api.js index 0e8bbbacfa8..6f3e661e8c1 100644 --- a/apps/settings/src/store/api.js +++ b/apps/settings/src/store/api.js @@ -6,10 +6,8 @@ import axios from '@nextcloud/axios' import { confirmPassword } from '@nextcloud/password-confirmation' -import '@nextcloud/password-confirmation/dist/style.css' - /** - * @param url + * @param {string} url - The url to sanitize */ function sanitize(url) { return url.replace(/\/$/, '') // Remove last url slash diff --git a/apps/settings/src/store/authtoken.ts b/apps/settings/src/store/authtoken.ts index f1978a515cc..ef01fc49521 100644 --- a/apps/settings/src/store/authtoken.ts +++ b/apps/settings/src/store/authtoken.ts @@ -11,8 +11,6 @@ import { generateUrl } from '@nextcloud/router' import { defineStore } from 'pinia' import logger from '../logger.ts' -import '@nextcloud/password-confirmation/dist/style.css' - const BASE_URL = generateUrl('/settings/personal/authtokens') /** diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue index 4b53fc361a1..4d5678441c6 100644 --- a/apps/sharebymail/src/components/AdminSettings.vue +++ b/apps/sharebymail/src/components/AdminSettings.vue @@ -33,8 +33,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' import { logger } from '../logger.ts' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'AdminSettings', components: { diff --git a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue index dedf673e6c5..28eb58bdb1a 100644 --- a/apps/twofactor_backupcodes/src/views/PersonalSettings.vue +++ b/apps/twofactor_backupcodes/src/views/PersonalSettings.vue @@ -65,8 +65,6 @@ import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon' import { logger } from '../logger.ts' import { print } from '../service/PrintService.js' -import '@nextcloud/password-confirmation/dist/style.css' - export default { name: 'PersonalSettings', components: { diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js index 267b1694379..d6f535340f5 100644 --- a/apps/workflowengine/src/store.js +++ b/apps/workflowengine/src/store.js @@ -10,8 +10,6 @@ import Vue from 'vue' import Vuex, { Store } from 'vuex' import { getApiUrl } from './helpers/api.js' -import '@nextcloud/password-confirmation/dist/style.css' - Vue.use(Vuex) const store = new Store({ diff --git a/core/css/server.scss b/core/css/server.scss index 593556a65f8..f880c0dac64 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -12,5 +12,6 @@ @use 'mobile'; @use 'tooltip'; // If you include .css, it will be imported as url -@use '../../node_modules/@nextcloud/dialogs/dist/style'; +@use '../../node_modules/@nextcloud/dialogs/dist/style' as *; +@use '../../node_modules/@nextcloud/password-confirmation/dist/style' as *; @use 'public'; diff --git a/core/src/OC/password-confirmation.js b/core/src/OC/password-confirmation.js index b8d0e9ce09b..ed81d455db4 100644 --- a/core/src/OC/password-confirmation.js +++ b/core/src/OC/password-confirmation.js @@ -5,13 +5,14 @@ import { confirmPassword, isPasswordConfirmationRequired } from '@nextcloud/password-confirmation' -import '@nextcloud/password-confirmation/dist/style.css' - /** * @namespace OC.PasswordConfirmation */ export default { + /** + * @deprecated 28.0.0 use methods from '@nextcloud/password-confirmation' + */ requiresPasswordConfirmation() { return isPasswordConfirmationRequired() }, @@ -20,6 +21,8 @@ export default { * @param {Function} callback success callback function * @param {object} options options currently not used by confirmPassword * @param {Function} rejectCallback error callback function + * + * @deprecated 28.0.0 use methods from '@nextcloud/password-confirmation' */ requirePasswordConfirmation(callback, options, rejectCallback) { confirmPassword().then(callback, rejectCallback) diff --git a/core/src/jquery/css/jquery.ocdialog.scss b/core/src/jquery/css/jquery.ocdialog.scss index 4e1c74e64ac..b37c49491ca 100644 --- a/core/src/jquery/css/jquery.ocdialog.scss +++ b/core/src/jquery/css/jquery.ocdialog.scss @@ -91,16 +91,3 @@ body.theme--dark .oc-dialog-dim { width: 100%; max-width: 550px; } - -.oc-dialog.password-confirmation { - .oc-dialog-content { - width: auto; - - input[type=password] { - width: 100%; - } - label { - display: none; - } - } -}