Skip to content

Commit 507d6b1

Browse files
committed
Auto merge of #2372 - Turbo87:bye-bye-sass, r=locks
Use regular CSS with `postcss-nested` instead of SASS SASS support with CSS modules is a little hard to reason about and less well supported by some of the build tooling like embroider. With `postcss-nested` we can achieve everything that we are still using SASS for, so it is easier for us to switch to regular CSS instead of keeping SASS around. r? @locks
2 parents f0592e3 + 9d23334 commit 507d6b1

Some content is hidden

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

50 files changed

+88
-169
lines changed

app/components/api-token-row.module.scss renamed to app/components/api-token-row.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
.created-at,
4040
.last-used-at {
41-
composes: small from '../styles/shared/typography.module.scss';
41+
composes: small from '../styles/shared/typography.module.css';
4242
line-height: 1.15rem;
4343
}
4444

@@ -49,11 +49,11 @@
4949
}
5050

5151
.save-button {
52-
composes: yellow-button small from '../styles/shared/buttons.module.scss';
52+
composes: yellow-button small from '../styles/shared/buttons.module.css';
5353
}
5454

5555
.revoke-button {
56-
composes: tan-button small from '../styles/shared/buttons.module.scss';
56+
composes: tan-button small from '../styles/shared/buttons.module.css';
5757
}
5858

5959
.new-token {

app/components/crate-row.module.scss renamed to app/components/crate-row.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323

2424
.description {
25-
composes: small from '../styles/shared/typography.module.scss';
25+
composes: small from '../styles/shared/typography.module.css';
2626
margin-top: 8px;
2727
}
2828

app/components/email-input.module.scss renamed to app/components/email-input.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
.cancel-button,
5454
.edit-button,
5555
.resend-button {
56-
composes: yellow-button small from '../styles/shared/buttons.module.scss';
56+
composes: yellow-button small from '../styles/shared/buttons.module.css';
5757
}
5858

5959
.save-button {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.button {
2+
composes: tan-button from '../styles/shared/buttons.module.css';
3+
}

app/components/follow-button.module.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/components/pending-owner-invite-row.module.scss renamed to app/components/pending-owner-invite-row.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
}
1111

1212
.date-column {
13-
composes: small from '../styles/shared/typography.module.scss';
13+
composes: small from '../styles/shared/typography.module.css';
1414
}
1515

1616
.accept-button,
1717
.decline-button {
18-
composes: yellow-button small from '../styles/shared/buttons.module.scss';
18+
composes: yellow-button small from '../styles/shared/buttons.module.css';
1919
}
2020

2121
.error-message {

app/components/results-count.module.scss renamed to app/components/results-count.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.results-count {
2-
composes: small from '../styles/shared/typography.module.scss';
2+
composes: small from '../styles/shared/typography.module.css';
33
}
44

55
.highlight {
File renamed without changes.

app/styles/categories.module.scss renamed to app/styles/categories.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99

1010
.sort-by-label {
11-
composes: small from './shared/typography.module.scss';
11+
composes: small from './shared/typography.module.css';
1212
}
1313

1414
.list {
@@ -26,11 +26,11 @@
2626
}
2727

2828
.crate-count {
29-
composes: small from './shared/typography.module.scss';
29+
composes: small from './shared/typography.module.css';
3030
}
3131

3232
.description {
33-
composes: small from './shared/typography.module.scss';
33+
composes: small from './shared/typography.module.css';
3434
margin-top: 4px;
3535
line-height: 1.2rem;
3636
}

app/styles/category/index.module.scss renamed to app/styles/category/index.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
.crate-count,
2626
.category-description {
27-
composes: small from '../shared/typography.module.scss';
27+
composes: small from '../shared/typography.module.css';
2828
}
2929

3030
.category-description {
@@ -39,7 +39,7 @@
3939
}
4040

4141
.sort-by-label {
42-
composes: small from '../shared/typography.module.scss';
42+
composes: small from '../shared/typography.module.css';
4343
}
4444

4545
.list {

app/styles/crate/owners.module.scss renamed to app/styles/crate/owners.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525

2626
.submit-button {
27-
composes: small yellow-button from '../shared/buttons.module.scss';
27+
composes: small yellow-button from '../shared/buttons.module.css';
2828
}
2929

3030
.list {
@@ -49,5 +49,5 @@
4949
}
5050

5151
.remove-button {
52-
composes: small yellow-button from '../shared/buttons.module.scss';
52+
composes: small yellow-button from '../shared/buttons.module.css';
5353
}

app/styles/crate/version.module.scss renamed to app/styles/crate/version.module.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ div.header {
103103

104104
.last-update,
105105
.crate-size {
106-
composes: small from '../shared/typography.module.scss';
106+
composes: small from '../shared/typography.module.css';
107107
line-height: 25px;
108108
}
109109

@@ -142,7 +142,7 @@ div.header {
142142
}
143143

144144
.more-versions-link {
145-
composes: small from '../shared/typography.module.scss';
145+
composes: small from '../shared/typography.module.css';
146146
}
147147

148148
.authorship {
@@ -244,7 +244,7 @@ div.header {
244244
}
245245

246246
.stat-description {
247-
composes: small from '../shared/typography.module.scss';
247+
composes: small from '../shared/typography.module.css';
248248
}
249249

250250
.graph {
@@ -268,5 +268,5 @@ div.header {
268268
}
269269

270270
.yanked {
271-
composes: yanked from '../shared/typography.module.scss';
271+
composes: yanked from '../shared/typography.module.css';
272272
}

app/styles/crate/versions.module.scss renamed to app/styles/crate/versions.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
.page-description {
6-
composes: small from '../shared/typography.module.scss';
6+
composes: small from '../shared/typography.module.css';
77
}
88

99
.list {
@@ -25,13 +25,13 @@
2525
}
2626

2727
.date {
28-
composes: small from '../shared/typography.module.scss';
28+
composes: small from '../shared/typography.module.css';
2929
display: inline-block;
3030
margin-left: 20px;
3131
}
3232

3333
.yanked {
34-
composes: yanked from '../shared/typography.module.scss';
34+
composes: yanked from '../shared/typography.module.css';
3535
}
3636

3737
.arrow {

app/styles/crates.module.scss renamed to app/styles/crates.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939

4040
.sort-by-label {
41-
composes: small from './shared/typography.module.scss';
41+
composes: small from './shared/typography.module.css';
4242
}
4343

4444
.list {

app/styles/dashboard.module.scss renamed to app/styles/dashboard.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.stats-label {
29-
composes: small from './shared/typography.module.scss';
29+
composes: small from './shared/typography.module.css';
3030
}
3131

3232
.my-info {
@@ -102,11 +102,11 @@
102102
}
103103

104104
.feed-version {
105-
composes: small from './shared/typography.module.scss';
105+
composes: small from './shared/typography.module.css';
106106
}
107107

108108
.feed-date {
109-
composes: small from './shared/typography.module.scss';
109+
composes: small from './shared/typography.module.css';
110110
flex-grow: 1;
111111
text-align: right;
112112
}

app/styles/index.module.scss renamed to app/styles/index.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121

2222
.hero-button {
23-
composes: yellow-button from '../styles/shared/buttons.module.scss';
23+
composes: yellow-button from '../styles/shared/buttons.module.css';
2424
}
2525

2626
.blurb {
@@ -62,7 +62,7 @@
6262
}
6363

6464
.stats-label {
65-
composes: small from './shared/typography.module.scss';
65+
composes: small from './shared/typography.module.css';
6666
}
6767

6868
.lists {

app/styles/me/following.module.scss renamed to app/styles/keyword/index.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.sort-by-label {
9-
composes: small from '../shared/typography.module.scss';
9+
composes: small from '../shared/typography.module.css';
1010
}
1111

1212
.list {

app/styles/keywords.module.scss renamed to app/styles/keywords.module.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.sort-by-label {
9-
composes: small from './shared/typography.module.scss';
9+
composes: small from './shared/typography.module.css';
1010
}
1111

1212
.list {
@@ -25,5 +25,5 @@
2525
}
2626

2727
.crate-count {
28-
composes: small from './shared/typography.module.scss';
28+
composes: small from './shared/typography.module.css';
2929
}
File renamed without changes.

app/styles/me/crates.module.scss renamed to app/styles/me/crates.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.sort-by-label {
9-
composes: small from '../shared/typography.module.scss';
9+
composes: small from '../shared/typography.module.css';
1010
}
1111

1212
.list {

app/styles/keyword/index.module.scss renamed to app/styles/me/following.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.sort-by-label {
9-
composes: small from '../shared/typography.module.scss';
9+
composes: small from '../shared/typography.module.css';
1010
}
1111

1212
.list {

app/styles/me/index.module.scss renamed to app/styles/me/index.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
.select-all-button,
6060
.deselect-all-button {
61-
composes: yellow-button small from '../shared/buttons.module.scss';
61+
composes: yellow-button small from '../shared/buttons.module.css';
6262
margin-right: 1rem;
6363
}
6464

@@ -80,7 +80,7 @@
8080

8181

8282
.update-notifications-button {
83-
composes: yellow-button from '../shared/buttons.module.scss';
83+
composes: yellow-button from '../shared/buttons.module.css';
8484
}
8585

8686
.me-subheading {
@@ -94,7 +94,7 @@
9494
}
9595

9696
.new-token-button {
97-
composes: yellow-button from '../shared/buttons.module.scss';
97+
composes: yellow-button from '../shared/buttons.module.css';
9898
}
9999

100100
.token-list {

app/styles/search.module.scss renamed to app/styles/search.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.sort-by-label {
9-
composes: small from './shared/typography.module.scss';
9+
composes: small from './shared/typography.module.css';
1010
}
1111

1212
.list {

app/styles/team.module.scss renamed to app/styles/team.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535

3636
.sort-by-label {
37-
composes: small from './shared/typography.module.scss';
37+
composes: small from './shared/typography.module.css';
3838
}
3939

4040
.list {

app/styles/user.module.scss renamed to app/styles/user.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616

1717
.sort-by-label {
18-
composes: small from './shared/typography.module.scss';
18+
composes: small from './shared/typography.module.css';
1919
}
2020

2121
.list {

ember-cli-build.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ module.exports = function (defaults) {
2929
components: highlightedLanguages,
3030
},
3131
cssModules: {
32-
extension: 'module.scss',
32+
extension: 'module.css',
33+
plugins: {
34+
before: [require('postcss-nested')],
35+
},
3336
},
3437
fingerprint: {
3538
extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'ttf', 'woff', 'woff2'],

0 commit comments

Comments
 (0)