Skip to content

Commit e0106bc

Browse files
committed
fix: Migrate away from SASS @import
This finally silences: ``` [test:ember] [test:ember] ╷ [test:ember] 9 │ @import './tailwind/components/docs-btn'; [test:ember] │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [test:ember] ╵ [test:ember] addon/styles/addon.scss#sass 9:9 root stylesheet [test:ember] [test:ember] DEPRECATION WARNING: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. ``` Fixes: ember-learn#1673
1 parent 0726744 commit e0106bc

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

addon/styles/addon.scss

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
@use "sass:meta";
12
@tailwind base;
23
@tailwind components;
34
@tailwind utilities;
45

5-
@import './tailwind/components/docs-brand-colors';
6-
@import './tailwind/components/docs-btn';
7-
@import './tailwind/components/docs-container';
8-
@import './tailwind/components/docs-md';
6+
@include meta.load-css('tailwind/components/docs-brand-colors');
7+
@include meta.load-css('tailwind/components/docs-btn');
8+
@include meta.load-css('tailwind/components/docs-container');
9+
@include meta.load-css('tailwind/components/docs-md');
910

10-
@import './utilities/masks';
11-
@import './utilities/nudge';
11+
@include meta.load-css('utilities/masks');
12+
@include meta.load-css('utilities/nudge');
1213

13-
@import './components/docs-header-search-box';
14-
@import './components/docs-hero';
15-
@import './components/docs-keyboard-shortcuts';
16-
@import './components/docs-viewer-x-current-page-index';
17-
@import './components/docs-viewer-x-nav';
18-
@import './components/modal-dialog';
14+
@include meta.load-css('components/docs-header-search-box');
15+
@include meta.load-css('components/docs-hero');
16+
@include meta.load-css('components/docs-keyboard-shortcuts');
17+
@include meta.load-css('components/docs-viewer-x-current-page-index');
18+
@include meta.load-css('components/docs-viewer-x-nav');
19+
@include meta.load-css('components/modal-dialog');
1920

20-
@import 'syntax';
21+
@include meta.load-css('syntax');
2122

2223
// Figure out how to do this in tailwind
2324
.docs-fill-current {
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
@use '../variables' as vars;
2+
13
.AddonDocs-DocsViewer-Nav {
2-
@media (min-width: $site-container) {
3-
width: calc(((100% - #{$site-container}) / 2) + 288px);
4-
padding-left: calc((100% - #{$site-container}) / 2);
4+
@media (min-width: vars.$site-container) {
5+
width: calc(((100% - #{vars.$site-container}) / 2) + 288px);
6+
padding-left: calc((100% - #{vars.$site-container}) / 2);
57
}
68
}

0 commit comments

Comments
 (0)