From f6e6ba4851cc3ed056f43f3e47cc696bede4e259 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 18 Nov 2024 12:25:05 +0100 Subject: [PATCH] refactor(styles): Adjust code style in SCSS sources to match our stylelint config Signed-off-by: Ferdinand Thiessen --- apps/dashboard/src/DashboardApp.vue | 9 +- .../src/components/ApiDashboardWidget.vue | 3 - apps/dav/src/components/AbsenceForm.vue | 2 +- apps/dav/src/components/AvailabilityForm.vue | 10 + apps/dav/src/views/CalDavSettings.vue | 1 + .../files/src/components/FilesListVirtual.vue | 7 +- apps/files/src/components/LegacyView.vue | 2 - apps/files/src/components/TemplatePreview.vue | 2 +- .../components/TransferOwnershipDialogue.vue | 3 + apps/files/src/views/Navigation.vue | 20 +- apps/files/src/views/Sidebar.vue | 2 +- apps/files/src/views/TemplatePicker.vue | 4 +- apps/files_external/css/settings.scss | 119 ++++--- apps/files_sharing/css/icons.scss | 2 + apps/files_sharing/css/public.scss | 8 +- apps/files_sharing/css/publicView.scss | 4 +- .../src/components/SharingEntryLink.vue | 2 +- .../src/views/SharingDetailsTab.vue | 51 ++- apps/oauth2/src/App.vue | 2 + apps/oauth2/src/components/OAuthItem.vue | 3 + .../AppStoreSidebar/AppDetailsTab.vue | 1 + .../BasicSettings/BackgroundJob.vue | 2 + .../BasicSettings/ProfileSettings.vue | 3 - apps/settings/src/components/Markdown.vue | 2 +- .../components/PersonalInfo/AvatarSection.vue | 3 +- .../PersonalInfo/BirthdaySection.vue | 2 +- .../ProfileSection/ProfilePreviewCard.vue | 2 +- .../ProfileSection/ProfileSection.vue | 2 +- .../ProfileVisibilitySection.vue | 2 +- .../VisibilityDropdown.vue | 2 +- apps/settings/src/components/UserList.vue | 2 +- .../src/components/Users/UserListFooter.vue | 6 +- .../src/components/Users/UserListHeader.vue | 6 +- .../settings/src/components/Users/UserRow.vue | 6 +- apps/theming/src/UserTheming.vue | 3 +- .../src/components/BackgroundSettings.vue | 1 - apps/theming/src/components/ItemPreview.vue | 1 - .../src/components/admin/AppMenuSection.vue | 1 + .../src/components/admin/CheckboxField.vue | 2 +- .../src/components/admin/ColorPickerField.vue | 3 +- .../src/components/admin/FileInputField.vue | 2 +- .../src/components/PreviousStatus.vue | 1 + apps/weather_status/src/App.vue | 1 + apps/workflowengine/src/components/Check.vue | 2 + .../src/components/Checks/FileSystemTag.vue | 4 - .../src/components/Checks/RequestTime.vue | 2 +- .../src/components/Checks/RequestURL.vue | 1 + .../components/Checks/RequestUserAgent.vue | 1 + apps/workflowengine/src/components/Event.vue | 1 + .../src/components/Operation.vue | 2 +- apps/workflowengine/src/components/Rule.vue | 3 + .../src/components/Workflow.vue | 7 +- apps/workflowengine/src/styles/operation.scss | 6 + core/css/apps.scss | 8 +- core/css/guest.scss | 109 ++++-- core/css/icons.scss | 4 +- core/css/inputs.scss | 322 +++++++++--------- core/css/mobile.scss | 2 +- core/css/server.scss | 20 +- core/css/styles.scss | 37 +- core/css/systemtags.scss | 5 +- core/css/toast.scss | 4 + core/css/variables.scss | 2 +- .../components/UnifiedSearch/SearchResult.vue | 125 ++++--- .../UnifiedSearchLocalSearchBar.vue | 1 - core/src/jquery/css/jquery-ui-fixes.scss | 18 + core/src/jquery/css/jquery.ocdialog.scss | 8 +- core/src/views/LegacyUnifiedSearch.vue | 26 +- core/src/views/Login.vue | 1 + core/src/views/UnsupportedBrowser.vue | 3 +- stylelint.config.js | 22 ++ 71 files changed, 591 insertions(+), 467 deletions(-) diff --git a/apps/dashboard/src/DashboardApp.vue b/apps/dashboard/src/DashboardApp.vue index 78a7bb1deb3..727edbb8a93 100644 --- a/apps/dashboard/src/DashboardApp.vue +++ b/apps/dashboard/src/DashboardApp.vue @@ -507,7 +507,6 @@ export default { .panel, .panels > div { // Ensure the maxcontrast color is set for the background --color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text)); - width: 320px; max-width: 100%; margin: 16px; @@ -532,7 +531,8 @@ export default { padding: 16px; cursor: grab; - &, ::v-deep * { + &, + :deep(*) { -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; @@ -618,11 +618,10 @@ export default { .button, .button-vue, .edit-panels, -.statuses ::v-deep .action-item .action-item__menutoggle, -.statuses ::v-deep .action-item.action-item--open .action-item__menutoggle { +.statuses :deep(.action-item .action-item__menutoggle), +.statuses :deep(.action-item.action-item--open .action-item__menutoggle) { // Ensure the maxcontrast color is set for the background --color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text)); - background-color: var(--color-main-background-blur); -webkit-backdrop-filter: var(--filter-background-blur); backdrop-filter: var(--filter-background-blur); diff --git a/apps/dashboard/src/components/ApiDashboardWidget.vue b/apps/dashboard/src/components/ApiDashboardWidget.vue index c956a2e1023..e82b977b041 100644 --- a/apps/dashboard/src/components/ApiDashboardWidget.vue +++ b/apps/dashboard/src/components/ApiDashboardWidget.vue @@ -117,6 +117,3 @@ export default { }, } - - diff --git a/apps/dav/src/components/AbsenceForm.vue b/apps/dav/src/components/AbsenceForm.vue index cb3fabe49df..2f78ac3ab79 100644 --- a/apps/dav/src/components/AbsenceForm.vue +++ b/apps/dav/src/components/AbsenceForm.vue @@ -261,7 +261,7 @@ export default { &__picker { flex: 1 auto; - ::v-deep .native-datetime-picker--input { + :deep(.native-datetime-picker--input) { margin-bottom: 0; } } diff --git a/apps/dav/src/components/AvailabilityForm.vue b/apps/dav/src/components/AvailabilityForm.vue index f3a7570325f..b71ae8ff70c 100644 --- a/apps/dav/src/components/AvailabilityForm.vue +++ b/apps/dav/src/components/AvailabilityForm.vue @@ -139,30 +139,37 @@ export default { padding: 0 10px 0 10px; position: absolute; } + :deep(.availability-slots) { display: flex; white-space: normal; } + :deep(.availability-slot) { display: flex; flex-direction: row; align-items: center; flex-wrap: wrap; } + :deep(.availability-slot-group) { display: flex; flex-direction: column; } + :deep(.mx-input-wrapper) { width: 85px; } + :deep(.mx-datepicker) { width: 97px; } + :deep(.multiselect) { border: 1px solid var(--color-border-dark); width: 120px; } + .time-zone { padding-block: 32px 12px; padding-inline: 0 12px; @@ -175,6 +182,7 @@ export default { font-weight: bold; } } + .grid-table { display: grid; margin-bottom: 32px; @@ -183,9 +191,11 @@ export default { grid-template-columns: min-content auto min-content; max-width: 500px; } + .button { align-self: flex-end; } + :deep(.label-weekday) { position: relative; display: inline-flex; diff --git a/apps/dav/src/views/CalDavSettings.vue b/apps/dav/src/views/CalDavSettings.vue index b93986a9137..5fec0672d9e 100644 --- a/apps/dav/src/views/CalDavSettings.vue +++ b/apps/dav/src/views/CalDavSettings.vue @@ -156,6 +156,7 @@ export default { * :deep(a) { text-decoration: underline; } + .settings-hint { margin-top: -.2em; margin-bottom: 1em; diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index 95bd0f6c571..d4c3d9495b7 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -350,7 +350,6 @@ export default defineComponent({ --icon-preview-size: 32px; --fixed-block-start-position: var(--default-clickable-area); - overflow: auto; height: 100%; will-change: scroll-position; @@ -453,7 +452,6 @@ export default defineComponent({ display: flex; align-items: center; width: 100%; - user-select: none; border-block-end: 1px solid var(--color-border); box-sizing: border-box; user-select: none; @@ -764,7 +762,6 @@ tbody.files-list__tbody.files-list__tbody--grid { --row-width: calc(var(--icon-preview-size) + var(--item-padding) * 2); --row-height: calc(var(--icon-preview-size) + var(--name-height) + var(--mtime-height) + var(--item-padding) * 2); --checkbox-padding: 0px; - display: grid; grid-template-columns: repeat(auto-fill, var(--row-width)); @@ -787,8 +784,8 @@ tbody.files-list__tbody.files-list__tbody--grid { .files-list__row-checkbox { position: absolute; z-index: 9; - top: calc(var(--item-padding)/2); - inset-inline-start: calc(var(--item-padding)/2); + top: calc(var(--item-padding) / 2); + inset-inline-start: calc(var(--item-padding) / 2); overflow: hidden; --checkbox-container-size: 44px; width: var(--checkbox-container-size); diff --git a/apps/files/src/components/LegacyView.vue b/apps/files/src/components/LegacyView.vue index b3ec4095fc2..d9baeeb1b07 100644 --- a/apps/files/src/components/LegacyView.vue +++ b/apps/files/src/components/LegacyView.vue @@ -38,5 +38,3 @@ export default { }, } - diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue index 57af0bf9b64..46e141c6b3b 100644 --- a/apps/files/src/components/TemplatePreview.vue +++ b/apps/files/src/components/TemplatePreview.vue @@ -198,7 +198,7 @@ export default { &__title { overflow: hidden; // also count preview border - max-width: calc(var(--width) + 2*2px); + max-width: calc(var(--width) + 2 * 2px); padding: var(--margin); white-space: nowrap; text-overflow: ellipsis; diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue index 5496c9edc92..6b8e0eb77ba 100644 --- a/apps/files/src/components/TransferOwnershipDialogue.vue +++ b/apps/files/src/components/TransferOwnershipDialogue.vue @@ -206,10 +206,12 @@ export default { .middle-align { vertical-align: middle; } + p { margin-top: 12px; margin-bottom: 12px; } + .new-owner-row { display: flex; flex-wrap: wrap; @@ -229,6 +231,7 @@ p { max-width: 280px; } } + .transfer-select-row { span { margin-inline-end: 8px; diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue index 9570cb1be66..1420e8e1d9e 100644 --- a/apps/files/src/views/Navigation.vue +++ b/apps/files/src/views/Navigation.vue @@ -201,19 +201,15 @@ export default defineComponent({ diff --git a/apps/settings/src/components/Markdown.vue b/apps/settings/src/components/Markdown.vue index c22bf389585..36535e46763 100644 --- a/apps/settings/src/components/Markdown.vue +++ b/apps/settings/src/components/Markdown.vue @@ -100,7 +100,7 @@ export default { diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue index af0879573c9..7dea5091f3b 100644 --- a/apps/settings/src/components/Users/UserRow.vue +++ b/apps/settings/src/components/Users/UserRow.vue @@ -907,10 +907,10 @@ export default { diff --git a/apps/workflowengine/src/components/Checks/RequestTime.vue b/apps/workflowengine/src/components/Checks/RequestTime.vue index 1a09fcbfb31..f48ec8cd270 100644 --- a/apps/workflowengine/src/components/Checks/RequestTime.vue +++ b/apps/workflowengine/src/components/Checks/RequestTime.vue @@ -109,7 +109,7 @@ export default { margin-bottom: 5px; } - .multiselect::v-deep .multiselect__tags:not(:hover):not(:focus):not(:active) { + .multiselect:deep(.multiselect__tags:not(:hover):not(:focus):not(:active)) { border: 1px solid transparent; } diff --git a/apps/workflowengine/src/components/Checks/RequestURL.vue b/apps/workflowengine/src/components/Checks/RequestURL.vue index b91fdec5872..b6a0bbd80e6 100644 --- a/apps/workflowengine/src/components/Checks/RequestURL.vue +++ b/apps/workflowengine/src/components/Checks/RequestURL.vue @@ -117,6 +117,7 @@ export default { input[type='text'] { width: 100%; } + input[type='text'] { min-height: 48px; } diff --git a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue index 15e7dfdae72..be4075a1370 100644 --- a/apps/workflowengine/src/components/Checks/RequestUserAgent.vue +++ b/apps/workflowengine/src/components/Checks/RequestUserAgent.vue @@ -109,6 +109,7 @@ export default { input[type='text'] { width: 100%; } + input[type='text'] { min-height: 48px; } diff --git a/apps/workflowengine/src/components/Event.vue b/apps/workflowengine/src/components/Event.vue index af00ee9df71..52a14bd08ec 100644 --- a/apps/workflowengine/src/components/Event.vue +++ b/apps/workflowengine/src/components/Event.vue @@ -94,6 +94,7 @@ export default { max-width: 550px; } } + .isComplex { img { vertical-align: text-top; diff --git a/apps/workflowengine/src/components/Operation.vue b/apps/workflowengine/src/components/Operation.vue index 2936f71e131..c24471c8fd9 100644 --- a/apps/workflowengine/src/components/Operation.vue +++ b/apps/workflowengine/src/components/Operation.vue @@ -40,5 +40,5 @@ export default { diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index 234debdde34..80745643084 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -233,6 +233,7 @@ export default { margin-inline-end: 20px; } } + .trigger p, .action p { min-height: 34px; display: flex; @@ -249,9 +250,11 @@ export default { max-width: 300px; } } + .trigger p:first-child span { padding-top: 3px; } + .trigger p:last-child { padding-top: 8px; } diff --git a/apps/workflowengine/src/components/Workflow.vue b/apps/workflowengine/src/components/Workflow.vue index 8ea22690425..632be97c509 100644 --- a/apps/workflowengine/src/components/Workflow.vue +++ b/apps/workflowengine/src/components/Workflow.vue @@ -140,9 +140,12 @@ export default { diff --git a/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue index 44d1d716375..67853490d9f 100644 --- a/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue +++ b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue @@ -93,7 +93,6 @@ function clearAndCloseSearch() {