Skip to content

Commit f6e6ba4

Browse files
susnuxskjnldsv
authored andcommitted
refactor(styles): Adjust code style in SCSS sources to match our stylelint config
Signed-off-by: Ferdinand Thiessen <[email protected]>
1 parent 212cac9 commit f6e6ba4

File tree

71 files changed

+591
-467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+591
-467
lines changed

apps/dashboard/src/DashboardApp.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ export default {
507507
.panel, .panels > div {
508508
// Ensure the maxcontrast color is set for the background
509509
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
510-
511510
width: 320px;
512511
max-width: 100%;
513512
margin: 16px;
@@ -532,7 +531,8 @@ export default {
532531
padding: 16px;
533532
cursor: grab;
534533
535-
&, ::v-deep * {
534+
&,
535+
:deep(*) {
536536
-webkit-touch-callout: none;
537537
-webkit-user-select: none;
538538
-khtml-user-select: none;
@@ -618,11 +618,10 @@ export default {
618618
.button,
619619
.button-vue,
620620
.edit-panels,
621-
.statuses ::v-deep .action-item .action-item__menutoggle,
622-
.statuses ::v-deep .action-item.action-item--open .action-item__menutoggle {
621+
.statuses :deep(.action-item .action-item__menutoggle),
622+
.statuses :deep(.action-item.action-item--open .action-item__menutoggle) {
623623
// Ensure the maxcontrast color is set for the background
624624
--color-text-maxcontrast: var(--color-text-maxcontrast-background-blur, var(--color-main-text));
625-
626625
background-color: var(--color-main-background-blur);
627626
-webkit-backdrop-filter: var(--filter-background-blur);
628627
backdrop-filter: var(--filter-background-blur);

apps/dashboard/src/components/ApiDashboardWidget.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,3 @@ export default {
117117
},
118118
}
119119
</script>
120-
121-
<style lang="scss" scoped>
122-
</style>

apps/dav/src/components/AbsenceForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ export default {
261261
&__picker {
262262
flex: 1 auto;
263263
264-
::v-deep .native-datetime-picker--input {
264+
:deep(.native-datetime-picker--input) {
265265
margin-bottom: 0;
266266
}
267267
}

apps/dav/src/components/AvailabilityForm.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,30 +139,37 @@ export default {
139139
padding: 0 10px 0 10px;
140140
position: absolute;
141141
}
142+
142143
:deep(.availability-slots) {
143144
display: flex;
144145
white-space: normal;
145146
}
147+
146148
:deep(.availability-slot) {
147149
display: flex;
148150
flex-direction: row;
149151
align-items: center;
150152
flex-wrap: wrap;
151153
}
154+
152155
:deep(.availability-slot-group) {
153156
display: flex;
154157
flex-direction: column;
155158
}
159+
156160
:deep(.mx-input-wrapper) {
157161
width: 85px;
158162
}
163+
159164
:deep(.mx-datepicker) {
160165
width: 97px;
161166
}
167+
162168
:deep(.multiselect) {
163169
border: 1px solid var(--color-border-dark);
164170
width: 120px;
165171
}
172+
166173
.time-zone {
167174
padding-block: 32px 12px;
168175
padding-inline: 0 12px;
@@ -175,6 +182,7 @@ export default {
175182
font-weight: bold;
176183
}
177184
}
185+
178186
.grid-table {
179187
display: grid;
180188
margin-bottom: 32px;
@@ -183,9 +191,11 @@ export default {
183191
grid-template-columns: min-content auto min-content;
184192
max-width: 500px;
185193
}
194+
186195
.button {
187196
align-self: flex-end;
188197
}
198+
189199
:deep(.label-weekday) {
190200
position: relative;
191201
display: inline-flex;

apps/dav/src/views/CalDavSettings.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export default {
156156
* :deep(a) {
157157
text-decoration: underline;
158158
}
159+
159160
.settings-hint {
160161
margin-top: -.2em;
161162
margin-bottom: 1em;

apps/files/src/components/FilesListVirtual.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ export default defineComponent({
350350
--icon-preview-size: 32px;
351351
352352
--fixed-block-start-position: var(--default-clickable-area);
353-
354353
overflow: auto;
355354
height: 100%;
356355
will-change: scroll-position;
@@ -453,7 +452,6 @@ export default defineComponent({
453452
display: flex;
454453
align-items: center;
455454
width: 100%;
456-
user-select: none;
457455
border-block-end: 1px solid var(--color-border);
458456
box-sizing: border-box;
459457
user-select: none;
@@ -764,7 +762,6 @@ tbody.files-list__tbody.files-list__tbody--grid {
764762
--row-width: calc(var(--icon-preview-size) + var(--item-padding) * 2);
765763
--row-height: calc(var(--icon-preview-size) + var(--name-height) + var(--mtime-height) + var(--item-padding) * 2);
766764
--checkbox-padding: 0px;
767-
768765
display: grid;
769766
grid-template-columns: repeat(auto-fill, var(--row-width));
770767
@@ -787,8 +784,8 @@ tbody.files-list__tbody.files-list__tbody--grid {
787784
.files-list__row-checkbox {
788785
position: absolute;
789786
z-index: 9;
790-
top: calc(var(--item-padding)/2);
791-
inset-inline-start: calc(var(--item-padding)/2);
787+
top: calc(var(--item-padding) / 2);
788+
inset-inline-start: calc(var(--item-padding) / 2);
792789
overflow: hidden;
793790
--checkbox-container-size: 44px;
794791
width: var(--checkbox-container-size);

apps/files/src/components/LegacyView.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,3 @@ export default {
3838
},
3939
}
4040
</script>
41-
<style>
42-
</style>

apps/files/src/components/TemplatePreview.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export default {
198198
&__title {
199199
overflow: hidden;
200200
// also count preview border
201-
max-width: calc(var(--width) + 2*2px);
201+
max-width: calc(var(--width) + 2 * 2px);
202202
padding: var(--margin);
203203
white-space: nowrap;
204204
text-overflow: ellipsis;

apps/files/src/components/TransferOwnershipDialogue.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,12 @@ export default {
206206
.middle-align {
207207
vertical-align: middle;
208208
}
209+
209210
p {
210211
margin-top: 12px;
211212
margin-bottom: 12px;
212213
}
214+
213215
.new-owner-row {
214216
display: flex;
215217
flex-wrap: wrap;
@@ -229,6 +231,7 @@ p {
229231
max-width: 280px;
230232
}
231233
}
234+
232235
.transfer-select-row {
233236
span {
234237
margin-inline-end: 8px;

apps/files/src/views/Navigation.vue

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,19 +201,15 @@ export default defineComponent({
201201
</script>
202202

203203
<style scoped lang="scss">
204-
// TODO: remove when https://github.com/nextcloud/nextcloud-vue/pull/3539 is in
205-
.app-navigation::v-deep .app-navigation-entry-icon {
206-
background-repeat: no-repeat;
207-
background-position: center;
208-
}
209-
210-
.app-navigation::v-deep .app-navigation-entry.active .button-vue.icon-collapse:not(:hover) {
211-
color: var(--color-primary-element-text);
212-
}
204+
.app-navigation {
205+
:deep(.app-navigation-entry.active .button-vue.icon-collapse:not(:hover)) {
206+
color: var(--color-primary-element-text);
207+
}
213208
214-
.app-navigation > ul.app-navigation__list {
215-
// Use flex gap value for more elegant spacing
216-
padding-bottom: var(--default-grid-baseline, 4px);
209+
> ul.app-navigation__list {
210+
// Use flex gap value for more elegant spacing
211+
padding-bottom: var(--default-grid-baseline, 4px);
212+
}
217213
}
218214
219215
.app-navigation-entry__settings {

0 commit comments

Comments
 (0)