Skip to content

Commit 4e475f9

Browse files
crisbetojelbourn
crisbeto
authored and
jelbourn
committed
build: consistent line breaks for css files (#12977)
Bumps to stylelint 9.5.0 and enables the line break checking for CSS files.
1 parent 210f3f9 commit 4e475f9

File tree

9 files changed

+632
-289
lines changed

9 files changed

+632
-289
lines changed

‎package-lock.json

Lines changed: 473 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"scss-bundle": "^2.0.1-beta.7",
128128
"selenium-webdriver": "^3.6.0",
129129
"sorcery": "^0.10.0",
130-
"stylelint": "^8.4.0",
130+
"stylelint": "^9.5.0",
131131
"ts-node": "^3.0.4",
132132
"tsconfig-paths": "^2.3.0",
133133
"tslint": "^5.11.0",

‎src/demo-app/a11y/select/select-a11y.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
.demo-select-a11y-spacer {
2-
margin-bottom: 10px;
3-
}
1+
.demo-select-a11y-spacer {
2+
margin-bottom: 10px;
3+
}

‎src/demo-app/bottom-sheet/bottom-sheet-demo.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.demo-dialog-card {
2-
max-width: 405px;
3-
margin: 20px 0;
4-
}
5-
6-
.mat-raised-button {
7-
margin-right: 5px;
8-
}
1+
.demo-dialog-card {
2+
max-width: 405px;
3+
margin: 20px 0;
4+
}
5+
6+
.mat-raised-button {
7+
margin-right: 5px;
8+
}

‎src/demo-app/drag-drop/drag-drop-demo.scss

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,99 @@
1-
.list {
2-
width: 500px;
3-
max-width: 100%;
4-
margin-bottom: 25px;
5-
display: inline-block;
6-
margin-right: 25px;
7-
vertical-align: top;
8-
9-
[dir='rtl'] & {
10-
margin-right: 0;
11-
margin-left: 25px;
12-
}
13-
14-
&.horizontal {
15-
width: 1000px;
16-
margin-right: 0;
17-
margin-left: 0;
18-
}
19-
}
20-
21-
.cdk-drop {
22-
border: solid 1px #ccc;
23-
min-height: 60px;
24-
display: block;
25-
26-
.horizontal & {
27-
display: flex;
28-
flex-direction: row;
29-
}
30-
}
31-
32-
.cdk-drag {
33-
padding: 20px 10px;
34-
border-bottom: solid 1px #ccc;
35-
display: flex;
36-
flex-direction: row;
37-
align-items: center;
38-
justify-content: space-between;
39-
box-sizing: border-box;
40-
41-
.cdk-drop-dragging &:not(.cdk-drag-placeholder) {
42-
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
43-
}
44-
45-
.horizontal & {
46-
border: none;
47-
border-right: solid 1px #ccc;
48-
flex-grow: 1;
49-
flex-basis: 0;
50-
51-
[dir='rtl'] & {
52-
border-right: none;
53-
border-left: solid 1px #ccc;
54-
}
55-
}
56-
57-
.cdk-drop &:last-child {
58-
border: none;
59-
}
60-
}
61-
62-
.cdk-drag-preview {
63-
box-sizing: border-box;
64-
opacity: 0.5;
65-
}
66-
67-
.cdk-drag-animating {
68-
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
69-
}
70-
71-
.cdk-drag-placeholder {
72-
opacity: 0;
73-
}
74-
75-
.wrapper {
76-
border: solid 1px red;
77-
}
78-
79-
.cdk-drag-handle {
80-
cursor: move;
81-
82-
svg {
83-
fill: rgba(0, 0, 0, 0.5);
84-
}
85-
}
86-
87-
pre {
88-
white-space: normal;
89-
}
90-
91-
.free-draggable {
92-
width: 200px;
93-
height: 200px;
94-
border: solid 1px #ccc;
95-
cursor: move;
96-
display: flex;
97-
justify-content: center;
98-
align-items: center;
99-
}
1+
.list {
2+
width: 500px;
3+
max-width: 100%;
4+
margin-bottom: 25px;
5+
display: inline-block;
6+
margin-right: 25px;
7+
vertical-align: top;
8+
9+
[dir='rtl'] & {
10+
margin-right: 0;
11+
margin-left: 25px;
12+
}
13+
14+
&.horizontal {
15+
width: 1000px;
16+
margin-right: 0;
17+
margin-left: 0;
18+
}
19+
}
20+
21+
.cdk-drop {
22+
border: solid 1px #ccc;
23+
min-height: 60px;
24+
display: block;
25+
26+
.horizontal & {
27+
display: flex;
28+
flex-direction: row;
29+
}
30+
}
31+
32+
.cdk-drag {
33+
padding: 20px 10px;
34+
border-bottom: solid 1px #ccc;
35+
display: flex;
36+
flex-direction: row;
37+
align-items: center;
38+
justify-content: space-between;
39+
box-sizing: border-box;
40+
41+
.cdk-drop-dragging &:not(.cdk-drag-placeholder) {
42+
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
43+
}
44+
45+
.horizontal & {
46+
border: none;
47+
border-right: solid 1px #ccc;
48+
flex-grow: 1;
49+
flex-basis: 0;
50+
51+
[dir='rtl'] & {
52+
border-right: none;
53+
border-left: solid 1px #ccc;
54+
}
55+
}
56+
57+
.cdk-drop &:last-child {
58+
border: none;
59+
}
60+
}
61+
62+
.cdk-drag-preview {
63+
box-sizing: border-box;
64+
opacity: 0.5;
65+
}
66+
67+
.cdk-drag-animating {
68+
transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
69+
}
70+
71+
.cdk-drag-placeholder {
72+
opacity: 0;
73+
}
74+
75+
.wrapper {
76+
border: solid 1px red;
77+
}
78+
79+
.cdk-drag-handle {
80+
cursor: move;
81+
82+
svg {
83+
fill: rgba(0, 0, 0, 0.5);
84+
}
85+
}
86+
87+
pre {
88+
white-space: normal;
89+
}
90+
91+
.free-draggable {
92+
width: 200px;
93+
height: 200px;
94+
border: solid 1px #ccc;
95+
cursor: move;
96+
display: flex;
97+
justify-content: center;
98+
align-items: center;
99+
}

‎src/lib/datepicker/datepicker-toggle.scss

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
.mat-form-field-appearance-legacy {
2-
.mat-form-field-prefix,
3-
.mat-form-field-suffix {
4-
.mat-datepicker-toggle-default-icon {
5-
width: 1em;
6-
}
7-
}
8-
}
9-
10-
.mat-form-field:not(.mat-form-field-appearance-legacy) {
11-
.mat-form-field-prefix,
12-
.mat-form-field-suffix {
13-
.mat-datepicker-toggle-default-icon {
14-
display: block;
15-
width: 1.5em;
16-
height: 1.5em;
17-
}
18-
19-
.mat-icon-button .mat-datepicker-toggle-default-icon {
20-
margin: auto;
21-
}
22-
}
23-
}
1+
.mat-form-field-appearance-legacy {
2+
.mat-form-field-prefix,
3+
.mat-form-field-suffix {
4+
.mat-datepicker-toggle-default-icon {
5+
width: 1em;
6+
}
7+
}
8+
}
9+
10+
.mat-form-field:not(.mat-form-field-appearance-legacy) {
11+
.mat-form-field-prefix,
12+
.mat-form-field-suffix {
13+
.mat-datepicker-toggle-default-icon {
14+
display: block;
15+
width: 1.5em;
16+
height: 1.5em;
17+
}
18+
19+
.mat-icon-button .mat-datepicker-toggle-default-icon {
20+
margin: auto;
21+
}
22+
}
23+
}

‎src/lib/form-field/_form-field-legacy-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $mat-form-field-legacy-dedupe: 0;
142142
}
143143
}
144144

145-
// translateZ causes the label to not appear while printing, so we override it to not
145+
// translateZ causes the label to not appear while printing, so we override it to not
146146
// apply translateZ while printing
147147
@media print {
148148
.mat-form-field-appearance-legacy {

‎src/material-examples/cdk-drag-drop-root-element/cdk-drag-drop-root-element-example.css

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
.dialog-content {
2-
width: 200px;
3-
height: 200px;
4-
border: solid 1px #ccc;
5-
color: rgba(0, 0, 0, 0.87);
6-
cursor: move;
7-
display: flex;
8-
justify-content: center;
9-
align-items: center;
10-
background: #fff;
11-
border-radius: 4px;
12-
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
13-
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
14-
0 2px 2px 0 rgba(0, 0, 0, 0.14),
15-
0 1px 5px 0 rgba(0, 0, 0, 0.12);
16-
}
17-
18-
.dialog-content:active {
19-
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
20-
0 8px 10px 1px rgba(0, 0, 0, 0.14),
21-
0 3px 14px 2px rgba(0, 0, 0, 0.12);
22-
}
1+
.dialog-content {
2+
width: 200px;
3+
height: 200px;
4+
border: solid 1px #ccc;
5+
color: rgba(0, 0, 0, 0.87);
6+
cursor: move;
7+
display: flex;
8+
justify-content: center;
9+
align-items: center;
10+
background: #fff;
11+
border-radius: 4px;
12+
transition: box-shadow 200ms cubic-bezier(0, 0, 0.2, 1);
13+
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
14+
0 2px 2px 0 rgba(0, 0, 0, 0.14),
15+
0 1px 5px 0 rgba(0, 0, 0, 0.12);
16+
}
17+
18+
.dialog-content:active {
19+
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
20+
0 8px 10px 1px rgba(0, 0, 0, 0.14),
21+
0 3px 14px 2px rgba(0, 0, 0, 0.12);
22+
}

‎stylelint-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"selector-max-id": 0,
8888
"no-missing-end-of-source-newline": true,
8989
"no-eol-whitespace": true,
90-
"max-line-length": 100
90+
"max-line-length": 100,
91+
"linebreaks": "unix"
9192
}
9293
}

0 commit comments

Comments
 (0)