diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2023-04-21 15:25:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 15:25:06 +0200 |
| commit | dd3d689e04a5e1d558da937ca72980e0e2c7c404 (patch) | |
| tree | bb47dd1c38ff0fa57a3462855e2cb8d2d6f0a611 /apps | |
| parent | 1bff4e23bfcfec1ed034f9ea6a1f069cbe2f906d (diff) | |
| parent | ab431999c316fc5fbb1344b87adad6fc47ef5860 (diff) | |
| download | nextcloud-server-dd3d689e04a5e1d558da937ca72980e0e2c7c404.tar.gz nextcloud-server-dd3d689e04a5e1d558da937ca72980e0e2c7c404.zip | |
Merge pull request #37858 from nextcloud/fix/lock
Fix lockfile and update cypress
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/src/components/ItemPreview.vue | 4 | ||||
| -rw-r--r-- | apps/workflowengine/src/components/Checks/FileMimeType.vue | 37 |
2 files changed, 21 insertions, 20 deletions
diff --git a/apps/theming/src/components/ItemPreview.vue b/apps/theming/src/components/ItemPreview.vue index 9299543a08b..dd70a66ec96 100644 --- a/apps/theming/src/components/ItemPreview.vue +++ b/apps/theming/src/components/ItemPreview.vue @@ -95,6 +95,8 @@ export default { } </script> <style lang="scss" scoped> +@use 'sass:math'; + .theming__preview { // We make previews on 16/10 screens --ratio: 16; @@ -144,7 +146,7 @@ export default { } } -@media (max-width: (1024px / 1.5)) { +@media (max-width: math.div(1024px, 1.5)) { .theming__preview { flex-direction: column; diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue index 8798a080b21..472edda613a 100644 --- a/apps/workflowengine/src/components/Checks/FileMimeType.vue +++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue @@ -19,7 +19,6 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - --> - <template> <div> <NcMultiselect :value="currentValue" @@ -144,24 +143,24 @@ export default { } </script> <style scoped lang="scss"> - .multiselect, input[type='text'] { - width: 100%; - } - .multiselect >>> .multiselect__content-wrapper li>span, - .multiselect >>> .multiselect__single { - display: flex; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } +.multiselect, input[type='text'] { + width: 100%; +} +.multiselect::v-deep .multiselect__content-wrapper li > span, +.multiselect::v-deep .multiselect__single { + display: flex; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} - .option__icon { - display: inline-block; - min-width: 30px; - background-position: left; - } +.option__icon { + display: inline-block; + min-width: 30px; + background-position: left; +} - .option__icon-img { - margin-right: 14px; - } +.option__icon-img { + margin-right: 14px; +} </style> |