Skip to content

Commit 5c0e55d

Browse files
Merge pull request #7697 from nextcloud/feat/vue3-migration
feat: migrate to vue 3
2 parents ec06eb8 + f1e0204 commit 5c0e55d

120 files changed

Lines changed: 5833 additions & 6775 deletions

File tree

Some content is hidden

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

css/app-full.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
display: flex;
6161
align-content: center;
6262
align-items: center;
63-
gap: calc(var(--default-grid-baseline) * 4);
63+
gap: calc(var(--default-grid-baseline) * 6);
6464
justify-content: flex-start;
6565

6666
&__input {
@@ -104,7 +104,7 @@
104104
gap: calc(var(--default-grid-baseline) * 4);
105105

106106
&__front, &__edit {
107-
margin-inline-start: calc(var(--default-grid-baseline) * 4);
107+
margin-inline-start: calc(var(--default-grid-baseline) * 10);
108108
}
109109

110110
.app-full &__front, &__edit {
@@ -203,7 +203,7 @@
203203

204204
&__grid {
205205
display: grid;
206-
grid-gap: 0;
206+
gap: 0;
207207

208208
.repeat-option-set-section-grid-item {
209209
padding: var(--default-grid-baseline);

css/app-navigation.scss

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@
2020
}
2121

2222
.datepicker-button-section {
23-
&__datepicker-label {
24-
flex-grow: 4 !important;
25-
text-align: center;
26-
border-radius: 0 !important;
27-
}
28-
29-
&__datepicker {
30-
margin-inline-start: 26px;
31-
margin-top: 48px;
32-
position: absolute !important;
33-
width: 0 !important;
34-
35-
.mx-input-wrapper {
36-
display: none !important;
37-
}
38-
}
39-
40-
&__left,
41-
&__right {
42-
background-size: 10px;
43-
flex-grow: 0 !important;
44-
width: 34px;
45-
padding: 0 6px !important;
46-
}
4723
&__left{
4824
border-radius: var(--border-radius-element) 0 0 var(--border-radius-element) !important;
4925
}

css/calendar.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
@import 'app-navigation';
6-
@import 'app-full';
7-
@import 'app-settings';
8-
@import 'app-modal';
9-
@import 'freebusy';
10-
@import 'fullcalendar';
11-
@import 'global';
12-
@import 'import';
13-
@import 'print';
14-
@import 'public';
15-
@import 'props-linkify-links';
5+
@import 'app-navigation.scss';
6+
@import 'app-full.scss';
7+
@import 'app-settings.scss';
8+
@import 'app-modal.scss';
9+
@import 'freebusy.scss';
10+
@import 'fullcalendar.scss';
11+
@import 'global.scss';
12+
@import 'import.scss';
13+
@import 'print.scss';
14+
@import 'public.scss';
15+
@import 'props-linkify-links.scss';

css/public.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
}
3737
}
3838

39-
.datepicker-button-section {
40-
&__datepicker-label {
41-
min-width: 150px;
42-
}
43-
}
4439

4540
.datepicker-button-section,
4641
.today-button-section,

eslint.config.mjs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55

66
import { defineConfig } from 'eslint/config'
77

8-
// TODO: replace with recommended when migrating to Vue 3
9-
import { recommendedVue2 } from '@nextcloud/eslint-config'
8+
import { recommended } from '@nextcloud/eslint-config'
109

1110
export default defineConfig([
12-
...recommendedVue2,
11+
...recommended,
1312
{
1413
rules: {
1514
// Relax some rules for now. Can be improved later one (baseline).

0 commit comments

Comments
 (0)