diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
index ddc28fcdd9bd55f3907832b11661b6eb19baf207..5f254837fe90bdc57b78d79c82615e1da6dbe05f 100644
Binary files a/apps/dashboard/js/dashboard.js and b/apps/dashboard/js/dashboard.js differ
diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
index 342df6e3bcb24d3397e18b181db74de15cf69572..8a5890a37a8ccc785fa191bda1337ea4a1cb69c6 100644
Binary files a/apps/dashboard/js/dashboard.js.map and b/apps/dashboard/js/dashboard.js.map differ
diff --git a/apps/files/js/dist/personal-settings.js b/apps/files/js/dist/personal-settings.js
index be56fe43a4069ecaab54e29236cc509bf4499d87..b3ea05484d7e9f37f5515b733c81d5a78973857a 100644
Binary files a/apps/files/js/dist/personal-settings.js and b/apps/files/js/dist/personal-settings.js differ
diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map
index 4e08921d8dc8cb7734f31687bd5d68afd909afee..bd6ed98074b5e301869e2a205784ff94ba26de7b 100644
Binary files a/apps/files/js/dist/personal-settings.js.map and b/apps/files/js/dist/personal-settings.js.map differ
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
index ddcff7405072220524bd7a944858a042ad446b58..f5dae581fa0754920d286418767b1ca2ed408984 100644
Binary files a/apps/files/js/dist/sidebar.js and b/apps/files/js/dist/sidebar.js differ
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
index 14dfff7bb316d140e3dd7d356df34e711b1cf236..54d69846ad0b246f739c55b7fdb56cbf21af54c6 100644
Binary files a/apps/files/js/dist/sidebar.js.map and b/apps/files/js/dist/sidebar.js.map differ
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
index 5ce0c586009a77235d6075b2aa532116ba0f8394..489321488dc2cc95c1f57409a95ba3e0751ff085 100644
Binary files a/apps/files_sharing/js/dist/files_sharing_tab.js and b/apps/files_sharing/js/dist/files_sharing_tab.js differ
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
index fa6243aff70c95b68f441966f1b0d13d6e3e0635..a2d6a3463727a4726438396dc5d7417de18c65c4 100644
Binary files a/apps/files_sharing/js/dist/files_sharing_tab.js.map and b/apps/files_sharing/js/dist/files_sharing_tab.js.map differ
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
index ff5039b3974eab928f272edaad72e1432f37fc92..00d3d82db6b9b458da36cd4b91e9437d753b9f1e 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js and b/apps/settings/js/vue-settings-admin-security.js differ
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
index 865b5417905efa55e564b54845c137181a22dbc4..121f282595cea70928a8952b69e6f955ba699abe 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js.map and b/apps/settings/js/vue-settings-admin-security.js.map differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
index 0b59b9f7344045b1e2d8b065f7d3302e4113f837..b8543e1d97d731d4d3daac801269f8e24ef1de1b 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js and b/apps/settings/js/vue-settings-apps-users-management.js differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
index bbf376e22f8094636caf94ded68bcaadcf4040dc..ae023daddd8f5afd101553c912fb4d8a4f752f10 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js.map and b/apps/settings/js/vue-settings-apps-users-management.js.map differ
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
index fa2630d1450b1a77129f91f3a9d67c522df9affa..6faadef7a32ba66b46f4306e2af6c634d22e9f2c 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js and b/apps/settings/js/vue-settings-personal-security.js differ
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
index 2dfa970b22b2434a9a944850a0b3df479de43abb..c805a4fb67432ba120fe0db686b8a6552b5d13e7 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js.map and b/apps/settings/js/vue-settings-personal-security.js.map differ
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js b/apps/settings/js/vue-settings-personal-webauthn.js
index f9c11c69f5b8098d011b3cf42cd78011e5b67af9..446c7433bf5476d50eb86eb3c8d3c1481914345c 100644
Binary files a/apps/settings/js/vue-settings-personal-webauthn.js and b/apps/settings/js/vue-settings-personal-webauthn.js differ
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js.map b/apps/settings/js/vue-settings-personal-webauthn.js.map
index 94cadd41f8a481e96300aecbf74707f7a0b333d7..354ed83c220495ae4a9d0ac1c8b47addb8878767 100644
Binary files a/apps/settings/js/vue-settings-personal-webauthn.js.map and b/apps/settings/js/vue-settings-personal-webauthn.js.map differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js b/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js
new file mode 100644
index 0000000000000000000000000000000000000000..43b742a06111bbaf8b3e02ffa2262759558bd7c7
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js.map b/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..48bebdd7167c96206fff252f9d14a88610e9f156
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-020aea84238902004ab4.js.map differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js b/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js
new file mode 100644
index 0000000000000000000000000000000000000000..99c4c5cfbbcb093a19b9efedb5aebb02c6957cda
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js.map b/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..4c5b758d25a9a4e118eb46c25d5b94a04e87b34f
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-settings-users-20d27e7401b445f2948d.js.map differ
diff --git a/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js b/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3c642ed8a893dd0f9dd4588a3cfae8ffc61e7c9
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js differ
diff --git a/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js.map b/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..008fa73c04ccb1b44759cd59b78ac6852456e85b
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-users-65f832aec1eb45875fe6.js.map differ
diff --git a/apps/updatenotification/js/updatenotification.js b/apps/updatenotification/js/updatenotification.js
index 3619bf9165f6667905721bb62ec9162b2aca7227..13d1a304b2ec97fb99ad4774d5767f04fefd8aa3 100644
Binary files a/apps/updatenotification/js/updatenotification.js and b/apps/updatenotification/js/updatenotification.js differ
diff --git a/apps/updatenotification/js/updatenotification.js.map b/apps/updatenotification/js/updatenotification.js.map
index 832b0b5ce53cfb674a3fc91180ef7d59dd90490d..e744acd9efe952ff97f135df03f2d2939e099c63 100644
Binary files a/apps/updatenotification/js/updatenotification.js.map and b/apps/updatenotification/js/updatenotification.js.map differ
diff --git a/apps/user_status/js/dashboard.js b/apps/user_status/js/dashboard.js
index f0ecdf7c439d9edcc82803f28baa0f47d96f06a7..c60dcc17ef2eb373112dfb694fcfe8632bd98898 100644
Binary files a/apps/user_status/js/dashboard.js and b/apps/user_status/js/dashboard.js differ
diff --git a/apps/user_status/js/dashboard.js.map b/apps/user_status/js/dashboard.js.map
index 33dcd6872b3f6def445a07f8506f963feabe8670..1c2fba4674e6c2c7858d019be1fba3adacad2086 100644
Binary files a/apps/user_status/js/dashboard.js.map and b/apps/user_status/js/dashboard.js.map differ
diff --git a/apps/user_status/js/user-status-menu.js b/apps/user_status/js/user-status-menu.js
index 988b4931baa1b5ed0637f221a478205896f7927b..fa448d2a3d1c3456687874735eb73cc3a8e8cb06 100644
Binary files a/apps/user_status/js/user-status-menu.js and b/apps/user_status/js/user-status-menu.js differ
diff --git a/apps/user_status/js/user-status-menu.js.map b/apps/user_status/js/user-status-menu.js.map
index 659c0667d1afa4d37b0e890c876a1ce2aea693a3..1f8e5695f0405effd81fd35bd4ab6cd3b4074600 100644
Binary files a/apps/user_status/js/user-status-menu.js.map and b/apps/user_status/js/user-status-menu.js.map differ
diff --git a/apps/user_status/js/user-status-modal.js b/apps/user_status/js/user-status-modal.js
index c55e254481b977a42f96dc85f3d7d4da0e71742c..463ab16482e2203d717fc7d2030930968f4f2dc5 100644
Binary files a/apps/user_status/js/user-status-modal.js and b/apps/user_status/js/user-status-modal.js differ
diff --git a/apps/user_status/js/user-status-modal.js.map b/apps/user_status/js/user-status-modal.js.map
index 5a8841c0b0b3f7614ece326d6d784c30f2f87e6c..10c8b7e6080ba4af0042857e88e49993cd1ebf5f 100644
Binary files a/apps/user_status/js/user-status-modal.js.map and b/apps/user_status/js/user-status-modal.js.map differ
diff --git a/apps/user_status/js/vendors-user-status-modal.js b/apps/user_status/js/vendors-user-status-modal.js
index cbe81fef86bcec2c358516625f732e19c50a6e6e..1a4b647f502e088ea0919641be707bc431a2bfe6 100644
Binary files a/apps/user_status/js/vendors-user-status-modal.js and b/apps/user_status/js/vendors-user-status-modal.js differ
diff --git a/apps/user_status/js/vendors-user-status-modal.js.map b/apps/user_status/js/vendors-user-status-modal.js.map
index 1f48916798c7c26d097a100603b8b3284f9b11e8..57fb4e9fca73f3a088891e83557a583decc9fb76 100644
Binary files a/apps/user_status/js/vendors-user-status-modal.js.map and b/apps/user_status/js/vendors-user-status-modal.js.map differ
diff --git a/apps/user_status/src/components/OnlineStatusSelect.vue b/apps/user_status/src/components/OnlineStatusSelect.vue
index b03af75681eba5512e49d76a255b526b7edfe5e2..d9ce249ad133db88b6440d816ad7781b6c3a51e5 100644
--- a/apps/user_status/src/components/OnlineStatusSelect.vue
+++ b/apps/user_status/src/components/OnlineStatusSelect.vue
@@ -28,7 +28,8 @@
name="user-status-online"
@change="onChange">
<label :for="id" :class="icon" class="user-status-online-select__label">
- <slot />
+ {{ label }}
+ <em class="user-status-online-select__subline">{{ subline }}</em>
</label>
</div>
</template>
@@ -50,6 +51,14 @@ export default {
type: String,
required: true,
},
+ label: {
+ type: String,
+ required: true,
+ },
+ subline: {
+ type: String,
+ default: null,
+ },
},
computed: {
@@ -91,6 +100,11 @@ $label-padding: 8px;
background-color: var(--color-background-hover);
background-position: $label-padding center;
background-size: $icon-size;
+
+ span,
+ & {
+ cursor: pointer;
+ }
}
&__input:checked + &__label,
@@ -98,6 +112,11 @@ $label-padding: 8px;
&__label:hover {
border-color: var(--color-primary);
}
+
+ &__subline {
+ display: block;
+ color: var(--color-text-lighter);
+ }
}
</style>
diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue
index c6d48d493cea877f20011eea08dfe02981c9bc60..f651bc6289135be9fd97ae9fa0ef2bd85385b768 100644
--- a/apps/user_status/src/components/SetStatusModal.vue
+++ b/apps/user_status/src/components/SetStatusModal.vue
@@ -34,10 +34,7 @@
:key="status.type"
v-bind="status"
:checked="status.type === statusType"
- @select="changeStatus">
- {{ status.label }}
- <em class="subline">{{ status.subline }}</em>
- </OnlineStatusSelect>
+ @select="changeStatus" />
</div>
<!-- Status message -->
@@ -248,10 +245,6 @@ export default {
// Space between the two sections
margin-bottom: 40px;
grid-template-columns: 1fr 1fr;
-
- .subline {
- display: block;
- }
}
&__custom-input {
diff --git a/apps/weather_status/js/weather-status.js b/apps/weather_status/js/weather-status.js
index 3999da95ad1aae6e99dcf9be7e87534d6607b29d..8f02cf2028c68c71c6afff9ec5142cbd8d4a49e5 100644
Binary files a/apps/weather_status/js/weather-status.js and b/apps/weather_status/js/weather-status.js differ
diff --git a/apps/weather_status/js/weather-status.js.map b/apps/weather_status/js/weather-status.js.map
index 6597b4b158cf79e552aaa5216ab0a09604652810..4c5eb21c70a612246bdbdd86f3ba3ee1a1ee4a44 100644
Binary files a/apps/weather_status/js/weather-status.js.map and b/apps/weather_status/js/weather-status.js.map differ
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
index 42d57d5ea5801b1eb294c647ea7279540704d4d1..aa9b670bb2bfa1e489222feb332e3ed9ead95029 100644
Binary files a/apps/workflowengine/js/workflowengine.js and b/apps/workflowengine/js/workflowengine.js differ
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
index 4d8e5b5626d7750ec7b2bf086a8540a729e1b329..851932db045125d6619caff3b583edea19ece7f9 100644
Binary files a/apps/workflowengine/js/workflowengine.js.map and b/apps/workflowengine/js/workflowengine.js.map differ
diff --git a/core/js/dist/unified-search.js b/core/js/dist/unified-search.js
index 9558f11c55206df9f24a4128c2a25f050b5568d9..c7186358261e97653eb9696cd681a417ad85ef39 100644
Binary files a/core/js/dist/unified-search.js and b/core/js/dist/unified-search.js differ
diff --git a/core/js/dist/unified-search.js.map b/core/js/dist/unified-search.js.map
index bfa696930a780d627917c60864dbfb38619a1f84..e6bb6cdc25d8045666d535672d85b4a8371f24c3 100644
Binary files a/core/js/dist/unified-search.js.map and b/core/js/dist/unified-search.js.map differ
diff --git a/package-lock.json b/package-lock.json
index 5343f8fc8ce680fc1aabf8024380bbf065d6f4b4..a61e232a7b51e91c9c65d2bf17e9d32322ecdc56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1272,9 +1272,9 @@
}
},
"@nextcloud/vue": {
- "version": "2.6.7",
- "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.7.tgz",
- "integrity": "sha512-ISu1ceEifRpQ7TiXykCnr/mPPtmlmGLW2hOOq3DBbpxueiEk8w6JCBB7SCwNbSg01T/vm01dlnT1ibHm1HjAIg==",
+ "version": "2.6.8",
+ "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.8.tgz",
+ "integrity": "sha512-9yi9V4gX4Y1uxh2hNxCAlTHaS9zolzAy7x1sowII/WZfxMysF/yIGmEsnYGyz6CZ5eYCzxNUgrU5p/HQ21/09Q==",
"requires": {
"@nextcloud/auth": "^1.2.3",
"@nextcloud/axios": "^1.3.2",
diff --git a/package.json b/package.json
index 9e10317ddb1431235e2d5fb4d0b5c5c34a008104..db90724dfc834c6c34986488011e9092562218ed 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"@nextcloud/password-confirmation": "^1.0.1",
"@nextcloud/paths": "^1.1.2",
"@nextcloud/router": "^1.1.0",
- "@nextcloud/vue": "^2.6.7",
+ "@nextcloud/vue": "^2.6.8",
"@nextcloud/vue-dashboard": "^1.0.1",
"autosize": "^4.0.2",
"backbone": "^1.4.0",