8000 Merge pull request #510 from dynamic-forms/feature/20.0.x-stylelint · dynamic-forms/dynamic-forms@b1357d9 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1357d9

Browse files
AlexanderGebuhrAlexanderGebuhr
authored
Merge pull request #510 from dynamic-forms/feature/20.0.x-stylelint
Use stylelint
2 parents adabad2 + a2908b7 commit b1357d9

File tree

52 files changed

+1940
-337
lines changed

Some content is hidden

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

52 files changed

+1940
-337
lines changed

‎.vscode/extensions.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"recommendations": [
3-
"dbaeumer.vscode-eslint",
4-
"esbenp.prettier-vscode"
5-
]
6-
}
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"esbenp.prettier-vscode",
5+
"stylelint.vscode-stylelint"
6+
]
7+
}

‎.vscode/settings.json

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
{
2+
3+
"typescript.preferences.importModuleSpecifier": "relative",
24
"eslint.rules.customizations": [
35
{ "rule": "import/no-unresolved", "severity": "off" }
46
],
5-
"typescript.preferences.importModuleSpecifier": "relative",
6-
"[html]": {
7-
"editor.defaultFormatter": "esbenp.prettier-vscode",
7+
"css.validate": false,
8+
"less.validate": false,
9+
"scss.validate": false,
10+
"stylelint.validate": ["css", "scss"],
11+
"[html][typescript]": {
812
"editor.codeActionsOnSave": {
9-
"source.fixAll.eslint": "explicit"
13+
"source.fixAll.eslint": "explicit",
14+
"source.fixAll.stylelint": "never"
1015
},
1116
"editor.formatOnSave": false
1217
},
13-
"[html][typescript]": {
14-
"editor.codeActionsOnSave": {
15-
"source.fixAll.eslint": "explicit"
16-
}
18+
"[html]": {
19+
"editor.defaultFormatter": "esbenp.prettier-vscode",
1720
},
1821
"[typescript]": {
1922
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
23+
},
24+
"[scss]": {
25+
"editor.defaultFormatter": "stylelint.vscode-stylelint",
2026
"editor.codeActionsOnSave": {
21-
"source.fixAll.eslint": "explicit"
27+
"source.fixAll.stylelint": "explicit"
2228
},
2329
"editor.formatOnSave": false
2430
}

‎apps/demo/src/app/app.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
z-index: 1;
66
top: 0;
77
left: 0;
8-
background-color: grey;
8+
background-color: #808080;
99
overflow-x: hidden;
1010
padding-left: 10px;
1111
}
1212

1313
.content {
1414
margin-left: 300px;
15-
padding: 0px 10px;
16-
}
15+
padding: 0 10px;
16+
}

‎apps/demo/src/app/docs/docs.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
iframe.scrolling {
33
min-height: calc(100vh - 120px);
44
}
5-
}
5+
}

‎apps/demo/src/app/editor/form-editor-logs.component.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
padding-right: 12px;
1919
}
2020

21-
.mdc-data-table__cell, .mdc-data-table__header-cell {
22-
padding: 0 8px 0 8px;
21+
.mdc-data-table {
22+
&__cell,
23+
&__header-cell {
24+
padding: 0 8px;
25+
}
2326
}
2427

2528
.mat-column-timestamp {
@@ -42,4 +45,4 @@
4245
padding: 12px 0;
4346
line-height: 1.5;
4447
}
45-
}
48+
}

‎apps/demo/src/app/editor/form-editor.component.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
grid-template-columns: minmax(0, 1fr) 10px minmax(0, 1fr);
1414

1515
app-monaco-editor {
16-
grid-column-start: 1;
17-
grid-column-end: 1;
16+
grid-column: 1 / 1;
1817

1918
&::ng-deep {
2019
.monaco-editor {
@@ -24,12 +23,8 @@
2423
}
2524

2625
mat-tab-group {
27-
grid-column-start: 3;
28-
grid-column-end: 3;
29-
26+
grid-column: 3 / 3;
3027
}
3128
}
3229
}
33-
34-
3530
}

‎apps/demo/src/app/form/bootstrap/bootstrap-form.component.scss

Whitespace-only changes.

‎apps/demo/src/app/form/bootstrap/bootstrap-form.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { BootstrapFormModule } from './bootstrap-form.module';
11 8000 11
@Component({
1212
selector: 'app-bootstrap-form',
1313
templateUrl: './bootstrap-form.component.html',
14-
styleUrl: './bootstrap-form.component.scss',
1514
imports: [BootstrapFormModule, AsyncPipe],
1615
})
1716
export class BootstrapFormComponent extends FormBase {

‎apps/demo/src/app/form/material/material-form.component.scss

Whitespace-only changes.

‎apps/demo/src/app/form/material/material-form.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { MaterialFormModule } from './material-form.module';
66
@Component({
77
selector: 'app-material-form',
88
templateUrl: './material-form.component.html',
9-
styleUrl: './material-form.component.scss',
109
imports: [MaterialFormModule],
1110
})
1211
export class MaterialFormComponent extends FormBase {

0 commit comments

Comments
 (0)
0