Skip to content

Commit 5b134bc

Browse files
committed
chore: add prefix for sass variables
1 parent 7e5d31c commit 5b134bc

Some content is hidden

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

83 files changed

+1101
-1097
lines changed

packages/platform/src/app/routes/layout/header/Header.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
width: 100%;
1010
height: 64px;
1111
padding: 0 16px 0 0;
12-
color: map.get($colors, 'white');
12+
color: map.get($d-colors, 'white');
1313
/* stylelint-disable-next-line declaration-property-value-allowed-list */
1414
background-color: #001529;
1515
box-shadow: 0 2px 8px 0 var(--d-shadow-color);

packages/platform/src/styles/_app.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ body {
1414

1515
.app-link {
1616
font: inherit;
17-
color: var(--#{$variable-prefix}color-primary);
17+
color: var(--#{$d-prefix}color-primary);
1818
text-decoration: none;
19-
transition: color var(--#{$variable-prefix}animation-duration-fast) linear;
19+
transition: color var(--#{$d-prefix}animation-duration-fast) linear;
2020

2121
&:hover,
2222
&:focus {
23-
color: var(--#{$variable-prefix}color-primary-lighter);
23+
color: var(--#{$d-prefix}color-primary-lighter);
2424
}
2525

2626
&:active {
27-
color: var(--#{$variable-prefix}color-primary-darker);
27+
color: var(--#{$d-prefix}color-primary-darker);
2828
}
2929
}
3030

packages/platform/src/styles/_components.scss

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

packages/platform/src/styles/_module.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
@import 'variables';
22

3-
@import '~rfs/scss';
4-
5-
@import 'vendor/bootstrap';
3+
@import '~bootstrap/scss/functions';
4+
@import '~bootstrap/scss/variables';
5+
@import '~bootstrap/scss/maps';
6+
@import '~bootstrap/scss/mixins';
67

78
@import '~@react-devui/ui/styles/variables';
89
@import '~@react-devui/ui/styles/mixins';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
$namespace: 'app';
1+
$d-namespace: 'app';
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
@import 'vendor/ui';
21
@import 'vendor/bootstrap';
2+
@import 'vendor/ui';
33

44
@import 'variables';
55

6-
@import 'root';
7-
@import 'components';
86
@import 'app';
7+
8+
@import 'root';
9+
10+
@import 'components/fcp-loader';
11+
@import 'components/language';
12+
@import 'components/list';
13+
@import 'components/route-header';
Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
$grid-breakpoints: (
2-
xs: 0,
3-
sm: 576px,
4-
md: 768px,
5-
lg: 992px,
6-
xl: 1200px,
7-
xxl: 1400px,
8-
);
9-
$enable-important-utilities: true;
10-
11-
@import '~bootstrap/scss/mixins/breakpoints';
12-
@import '~bootstrap/scss/mixins/utilities';
13-
14-
$utilities: (
15-
'display': (
16-
responsive: true,
17-
print: true,
18-
property: display,
19-
class: d,
20-
values: inline inline-block block grid table table-row table-cell flex inline-flex none,
21-
),
22-
);
1+
// Custom.scss
2+
// Option B: Include parts of Bootstrap
233

4+
// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
5+
@import '~bootstrap/scss/functions';
6+
7+
// 2. Include any default variable overrides here
8+
9+
// 3. Include remainder of required Bootstrap stylesheets
10+
@import '~bootstrap/scss/variables';
11+
12+
// 4. Include any default map overrides here
13+
14+
// 5. Include remainder of required parts
15+
@import '~bootstrap/scss/maps';
16+
@import '~bootstrap/scss/mixins';
17+
@import '~bootstrap/scss/root';
18+
19+
// 6. Optionally include any other parts as needed
20+
@import '~bootstrap/scss/utilities';
21+
@import '~bootstrap/scss/grid';
22+
23+
// 7. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
2424
@import '~bootstrap/scss/utilities/api';
25+
26+
// 8. Add additional custom code here

packages/site/src/app/routes/docs/dynamic-theme/DynamicTheme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ export default function App() {
2323

2424
## Variable conflict
2525

26-
All our css variables have namespaces added, the default is `d`, if our css variables conflict with your project, you can modify `$namespace`.
26+
All our css variables have namespaces added, the default is `d`, if our css variables conflict with your project, you can modify `$d-namespace`.
2727

28-
Note: `$namespace` also affects stylesheets, so you need to modify the `DRoot` configuration:
28+
Note: `$d-namespace` also affects stylesheets, so you need to modify the `DRoot` configuration:
2929

3030
```scss
31-
$namespace: 'app';
31+
$d-namespace: 'app';
3232
```
3333

3434
```tsx

packages/site/src/app/routes/docs/dynamic-theme/DynamicTheme.zh-CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ export default function App() {
2323

2424
## 变量冲突
2525

26-
我们的 css 变量均添加了命名空间,默认为 `d`,如果我们的 css 变量与您项目冲突,可以修改 `$namespace`
26+
我们的 css 变量均添加了命名空间,默认为 `d`,如果我们的 css 变量与您项目冲突,可以修改 `$d-namespace`
2727

28-
注意:`$namespace` 同样影响样式表,所以您需要修改 `DRoot` 的配置:
28+
注意:`$d-namespace` 同样影响样式表,所以您需要修改 `DRoot` 的配置:
2929

3030
```scss
31-
$namespace: 'app';
31+
$d-namespace: 'app';
3232
```
3333

3434
```tsx

packages/site/src/app/routes/docs/getting-started/GettingStarted.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ Global style:
1919
Import on demand:
2020

2121
```scss
22-
@import '~@react-devui/ui/styles/custom';
22+
@import '~@react-devui/ui/styles/variables';
23+
24+
@import '~@react-devui/ui/styles/mixins';
25+
26+
@import '~@react-devui/ui/styles/root';
27+
@import '~@react-devui/ui/styles/reboot';
28+
@import '~@react-devui/ui/styles/animations';
29+
@import '~@react-devui/ui/styles/common';
2330

2431
@import '~@react-devui/ui/styles/components/button';
2532
```

0 commit comments

Comments
 (0)