Skip to content

Commit

Permalink
refactor(styles): Adjust code style in SCSS sources to match our styl…
Browse files Browse the repository at this point in the history
…elint config

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux authored and skjnldsv committed Nov 19, 2024
1 parent 212cac9 commit f6e6ba4
Show file tree
Hide file tree
Showing 71 changed files with 591 additions and 467 deletions.
9 changes: 4 additions & 5 deletions apps/dashboard/src/DashboardApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions apps/dashboard/src/components/ApiDashboardWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>
</style>
2 changes: 1 addition & 1 deletion apps/dav/src/components/AbsenceForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export default {
&__picker {
flex: 1 auto;

::v-deep .native-datetime-picker--input {
:deep(.native-datetime-picker--input) {
margin-bottom: 0;
}
}
Expand Down
10 changes: 10 additions & 0 deletions apps/dav/src/components/AvailabilityForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -175,6 +182,7 @@ export default {
font-weight: bold;
}
}

.grid-table {
display: grid;
margin-bottom: 32px;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions apps/dav/src/views/CalDavSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export default {
* :deep(a) {
text-decoration: underline;
}

.settings-hint {
margin-top: -.2em;
margin-bottom: 1em;
Expand Down
7 changes: 2 additions & 5 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));

Expand All @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions apps/files/src/components/LegacyView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,3 @@ export default {
},
}
</script>
<style>
</style>
2 changes: 1 addition & 1 deletion apps/files/src/components/TemplatePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions apps/files/src/components/TransferOwnershipDialogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -229,6 +231,7 @@ p {
max-width: 280px;
}
}

.transfer-select-row {
span {
margin-inline-end: 8px;
Expand Down
20 changes: 8 additions & 12 deletions apps/files/src/views/Navigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,15 @@ export default defineComponent({
</script>

<style scoped lang="scss">
// TODO: remove when https://github.com/nextcloud/nextcloud-vue/pull/3539 is in
.app-navigation::v-deep .app-navigation-entry-icon {
background-repeat: no-repeat;
background-position: center;
}

.app-navigation::v-deep .app-navigation-entry.active .button-vue.icon-collapse:not(:hover) {
color: var(--color-primary-element-text);
}
.app-navigation {
:deep(.app-navigation-entry.active .button-vue.icon-collapse:not(:hover)) {
color: var(--color-primary-element-text);
}

.app-navigation > ul.app-navigation__list {
// Use flex gap value for more elegant spacing
padding-bottom: var(--default-grid-baseline, 4px);
> ul.app-navigation__list {
// Use flex gap value for more elegant spacing
padding-bottom: var(--default-grid-baseline, 4px);
}
}

.app-navigation-entry__settings {
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/views/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ export default {
}

.svg-icon {
::v-deep svg {
:deep(svg) {
width: 20px;
height: 20px;
fill: currentColor;
Expand Down
4 changes: 2 additions & 2 deletions apps/files/src/views/TemplatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ export default defineComponent({
padding: calc(var(--margin) * 2) var(--margin);
position: sticky;
bottom: 0;
background-image: linear-gradient(0, var(--gradient-main-background));
background-image: linear-gradient(0deg, var(--gradient-main-background));

button, input[type='submit'] {
height: 44px;
}
}

// Make sure we're relative for the loading emptycontent on top
::v-deep .modal-container {
:deep(.modal-container) {
position: relative;
}

Expand Down
Loading

0 comments on commit f6e6ba4

Please sign in to comment.