Skip to content

Commit 040469a

Browse files
committed
Convert scss files to modern api & update docs
1 parent ecb0e44 commit 040469a

9 files changed

Lines changed: 27 additions & 21 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import "ember-basic-dropdown";
1+
@use "ember-basic-dropdown";
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Define your variables first
2-
$ember-basic-dropdown-overlay-background: rgba(#3b5998, 0.5);
2+
@use "ember-basic-dropdown/scss/variables.scss" with (
3+
$ember-basic-dropdown-overlay-background: rgba(#3b5998, 0.5)
4+
);
35

4-
// Then import the styles, which will use your variable
5-
@import "ember-basic-dropdown";
6+
// Then use the styles, which will use your variable
7+
@use "ember-basic-dropdown";

docs/app/styles/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Basic dropdown
2-
@import "ember-basic-dropdown";
2+
@use "ember-basic-dropdown";
33

44
@import "variables";
55
@import "base";

docs/app/templates/public-pages/docs/migrate-8-0-to-9-0.gts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ import { LinkTo } from '@ember/routing';
4141
<code>sass-embedded</code>.
4242
</p>
4343
</li>
44+
<li>
45+
<p>
46+
Our SCSS files have been migrated to the modern API. Please update their
47+
usage in your app. See the
48+
<LinkTo @route="public-pages.docs.styles">Styles</LinkTo>
49+
section for details.
50+
</p>
51+
</li>
4452
<li>
4553
<p>
4654
The

docs/app/templates/public-pages/docs/styles.gts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import CodeExample from '../../../components/code-example';
1111
</p>
1212

1313
<p>
14-
If don't use any css pre-processor this is all. If you do use SASS or LESS,
15-
the addon will know it and will have to
16-
<code>@import</code>
14+
If don't use any css pre-processor this is all. If you do use SASS, the
15+
addon will know it and will have to
16+
<code>@use</code>
1717
the styles explicitly. This gives you the chance to set a few variables that
1818
Ember Basic Dropdown will use.
1919
</p>
@@ -27,7 +27,7 @@ import CodeExample from '../../../components/code-example';
2727
<p>
2828
If by example you want to change the colour of the overlay to be blue, you
2929
could do this in your
30-
<code>app.scss</code>/<code>app.less</code>.
30+
<code>app.scss</code>.
3131
</p>
3232

3333
<CodeExample @scss="styles-2.scss" @showResult={{false}} @activeTab="scss" />

ember-basic-dropdown/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import "./ember-basic-dropdown.scss";
1+
@use "./ember-basic-dropdown.scss";
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
@import "./scss/variables.scss";
2-
@import "./scss/base.scss";
1+
@use "scss/base.scss";

ember-basic-dropdown/scss/base.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
$ember-basic-dropdown-content-background-color: #fff !default;
2-
$ember-basic-dropdown-content-z-index: 1000 !default;
3-
$ember-basic-dropdown-overlay-background: rgba(0, 0, 0, 0.5) !default;
4-
$ember-basic-dropdown-overlay-pointer-events: none !default;
1+
@use "variables";
52

63
.ember-basic-dropdown {
74
position: relative;
@@ -14,8 +11,8 @@ $ember-basic-dropdown-overlay-pointer-events: none !default;
1411
.ember-basic-dropdown-content {
1512
position: absolute;
1613
width: auto;
17-
z-index: $ember-basic-dropdown-content-z-index;
18-
background-color: $ember-basic-dropdown-content-background-color;
14+
z-index: variables.$ember-basic-dropdown-content-z-index;
15+
background-color: variables.$ember-basic-dropdown-content-background-color;
1916
}
2017
.ember-basic-dropdown-content--left {
2118
left: 0;
@@ -26,13 +23,13 @@ $ember-basic-dropdown-overlay-pointer-events: none !default;
2623

2724
.ember-basic-dropdown-overlay {
2825
position: fixed;
29-
background: $ember-basic-dropdown-overlay-background;
26+
background: variables.$ember-basic-dropdown-overlay-background;
3027
width: 100%;
3128
height: 100%;
3229
z-index: 10;
3330
top: 0;
3431
left: 0;
35-
pointer-events: $ember-basic-dropdown-overlay-pointer-events;
32+
pointer-events: variables.$ember-basic-dropdown-overlay-pointer-events;
3633
}
3734

3835
.ember-basic-dropdown-content-wormhole-origin {

test-app/app/styles/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Basic dropdown
2-
@import "ember-basic-dropdown";
2+
@use "ember-basic-dropdown";

0 commit comments

Comments
 (0)