Skip to content

Commit 1cb2225

Browse files
AndyKIronAndyKIron
committed
Revert "chore(update-a18): refactor common scss"
This reverts commit 5c4a9ff.
1 parent 5c4a9ff commit 1cb2225

File tree

13 files changed

+154
-154
lines changed

13 files changed

+154
-154
lines changed

‎projects/fusion-ui/src/style/scss/v1/fonts.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use './vars/fonts' as *;
21
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600');
32
$baseSDN: 'https://fusion.ironsrc.net/assets';
43

@@ -57,6 +56,8 @@ $baseSDN: 'https://fusion.ironsrc.net/assets';
5756
font-style: normal;
5857
}
5958

59+
@import 'vars/fonts';
60+
6061
.fu-font1 {
6162
@extend %font1;
6263
}

‎projects/fusion-ui/src/style/scss/v1/grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "sass:math";
22
@use "sass:map";
33

4-
@use "mixins/breakpoints" as *;
4+
@import "mixins/breakpoints";
55

66
$gridColumns: 12 !default;
77
$gridColumnGap: 32px !default;

‎projects/fusion-ui/src/style/scss/v2/fonts.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@use './vars/fonts' as *;
2-
31
$baseSDN: 'https://fusion.ironsrc.net/assets';
42

53
@font-face {
@@ -38,6 +36,7 @@ $baseSDN: 'https://fusion.ironsrc.net/assets';
3836
url('#{$baseSDN}/fonts/HelveticaNeue-Medium.ttf') format('truetype');
3937
}
4038

39+
@import 'vars/fonts';
4140

4241
// fonts v2
4342
.fu-font-headlineLarge {

‎projects/fusion-ui/src/style/scss/v2/grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "sass:math";
22
@use "sass:map";
33

4-
@use "mixins/breakpoints" as *;
4+
@import "mixins/breakpoints";
55

66
$gridColumns: 12 !default;
77
$gridColumnGap: 32px !default;

‎projects/fusion-ui/src/style/scss/v3/grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "sass:math";
22
@use "sass:map";
33

4-
@use "mixins/breakpoints" as *;
4+
@import "mixins/breakpoints";
55

66
$gridColumns: 12 !default;
77
$gridColumnGap: 32px !default;

‎projects/fusion-ui/src/style/scss/v4/border-radius.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
@use './vars/border-radius';
1+
@import './vars/border-radius';
22

33
/* region css variables */
44
.fusion-v4 {
5-
--border-radius-xs: #{border-radius.$borderRadiusV4-xs};
6-
--border-radius-sm: #{border-radius.$borderRadiusV4-sm};
7-
--border-radius-md: #{border-radius.$borderRadiusV4-md};
8-
--border-radius-lg: #{border-radius.$borderRadiusV4-lg};
9-
--border-radius-xl: #{border-radius.$borderRadiusV4-xl};
10-
--border-radius-full: #{border-radius.$borderRadiusV4-full};
5+
--border-radius-xs: #{$borderRadiusV4-xs};
6+
--border-radius-sm: #{$borderRadiusV4-sm};
7+
--border-radius-md: #{$borderRadiusV4-md};
8+
--border-radius-lg: #{$borderRadiusV4-lg};
9+
--border-radius-xl: #{$borderRadiusV4-xl};
10+
--border-radius-full: #{$borderRadiusV4-full};
1111
}

‎projects/fusion-ui/src/style/scss/v4/colors.scss

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
1-
@use './vars/colors';
1+
@import './vars/colors';
22

33
/* region css variables */
44
.fusion-v4 {
5-
--background-default: #{colors.$color-v4-background-default};
6-
--background-paper: #{colors.$color-v4-background-paper};
7-
--background-model-elevation: #{colors.$color-v4-background-model-elevation};
8-
--background-backdrop: #{colors.$color-v4-background-backdrop};
9-
--background-paper-elevation-0: #{colors.$color-v4-background-paper-elevation-0};
10-
--background-paper-elevation-1: #{colors.$color-v4-background-paper-elevation-1};
11-
--background-paper-elevation-2: #{colors.$color-v4-background-paper-elevation-2};
12-
--background-paper-elevation-3: #{colors.$color-v4-background-paper-elevation-3};
13-
--background-paper-elevation-4: #{colors.$color-v4-background-paper-elevation-4};
14-
--background-paper-elevation-5: #{colors.$color-v4-background-paper-elevation-5};
15-
--background-paper-elevation-6: #{colors.$color-v4-background-paper-elevation-6};
16-
--background-paper-elevation-7: #{colors.$color-v4-background-paper-elevation-7};
17-
--background-paper-elevation-8: #{colors.$color-v4-background-paper-elevation-8};
18-
--background-paper-elevation-9: #{colors.$color-v4-background-paper-elevation-9};
5+
--background-default: #{$color-v4-background-default};
6+
--background-paper: #{$color-v4-background-paper};
7+
--background-model-elevation: #{$color-v4-background-model-elevation};
8+
--background-backdrop: #{$color-v4-background-backdrop};
9+
--background-paper-elevation-0: #{$color-v4-background-paper-elevation-0};
10+
--background-paper-elevation-1: #{$color-v4-background-paper-elevation-1};
11+
--background-paper-elevation-2: #{$color-v4-background-paper-elevation-2};
12+
--background-paper-elevation-3: #{$color-v4-background-paper-elevation-3};
13+
--background-paper-elevation-4: #{$color-v4-background-paper-elevation-4};
14+
--background-paper-elevation-5: #{$color-v4-background-paper-elevation-5};
15+
--background-paper-elevation-6: #{$color-v4-background-paper-elevation-6};
16+
--background-paper-elevation-7: #{$color-v4-background-paper-elevation-7};
17+
--background-paper-elevation-8: #{$color-v4-background-paper-elevation-8};
18+
--background-paper-elevation-9: #{$color-v4-background-paper-elevation-9};
1919

20-
--action-primary: #{colors.$color-v4-action-primary};
21-
--action-active: #{colors.$color-v4-action-active};
22-
--action-hover: #{colors.$color-v4-action-hover};
23-
--action-selected: #{colors.$color-v4-action-selected};
24-
--action-disabled: #{colors.$color-v4-action-disabled};
25-
--action-disabled-background: #{colors.$color-v4-action-disabled-background};
26-
--action-focus: #{colors.$color-v4-action-focus};
27-
--action-outlined-border: #{colors.$color-v4-action-outlined-border};
20+
--action-primary: #{$color-v4-action-primary};
21+
--action-active: #{$color-v4-action-active};
22+
--action-hover: #{$color-v4-action-hover};
23+
--action-selected: #{$color-v4-action-selected};
24+
--action-disabled: #{$color-v4-action-disabled};
25+
--action-disabled-background: #{$color-v4-action-disabled-background};
26+
--action-focus: #{$color-v4-action-focus};
27+
--action-outlined-border: #{$color-v4-action-outlined-border};
2828

29-
--default-light: #{colors.$color-v4-default-light};
30-
--default-main: #{colors.$color-v4-default-main};
31-
--default-dark: #{colors.$color-v4-default-dark};
32-
--default-outlined-border: #{colors.$color-v4-default-outlined-border};
33-
--default-contrast-text: #{colors.$color-v4-default-contrast-text};
34-
--default-button-contrast-text: #{colors.$color-v4-default-button-contrast-text};
29+
--default-light: #{$color-v4-default-light};
30+
--default-main: #{$color-v4-default-main};
31+
--default-dark: #{$color-v4-default-dark};
32+
--default-outlined-border: #{$color-v4-default-outlined-border};
33+
--default-contrast-text: #{$color-v4-default-contrast-text};
34+
--default-button-contrast-text: #{$color-v4-default-button-contrast-text};
3535

36-
--common-white: #{colors.$color-v4-common-white};
37-
--common-black: #{colors.$color-v4-common-black};
38-
--common-inverse-white: #{colors.$color-v4-common-inverse-white};
39-
--common-inverse-black: #{colors.$color-v4-common-inverse-black};
40-
--common-divider: #{colors.$color-v4-common-divider};
41-
--common-divider-elevation-0: #{colors.$color-v4-common-divider-elevation-0};
36+
--common-white: #{$color-v4-common-white};
37+
--common-black: #{$color-v4-common-black};
38+
--common-inverse-white: #{$color-v4-common-inverse-white};
39+
--common-inverse-black: #{$color-v4-common-inverse-black};
40+
--common-divider: #{$color-v4-common-divider};
41+
--common-divider-elevation-0: #{$color-v4-common-divider-elevation-0};
4242

43-
--text-primary: #{colors.$color-v4-text-primary};
44-
--text-secondary: #{colors.$color-v4-text-secondary};
45-
--text-disabled: #{colors.$color-v4-text-disabled};
43+
--text-primary: #{$color-v4-text-primary};
44+
--text-secondary: #{$color-v4-text-secondary};
45+
--text-disabled: #{$color-v4-text-disabled};
4646

47-
--primary-lighter: #{colors.$color-v4-primary-lighter};
48-
--primary-light: #{colors.$color-v4-primary-light};
49-
--primary-main: #{colors.$color-v4-primary-main};
50-
--primary-main-8-p: #{colors.$color-v4-primary-main-8-p};
51-
--primary-main-50-p: #{colors.$color-v4-primary-main-50-p};
52-
--primary-dark: #{colors.$color-v4-primary-dark};
53-
--primary-darker: #{colors.$color-v4-primary-darker};
54-
--primary-outlined-border: #{colors.$color-v4-primary-outlined-border};
55-
--primary-contrast-text: #{colors.$color-v4-primary-contrast-text};
56-
--primary-button-contrast-text: #{colors.$color-v4-primary-button-contrast-text};
47+
--primary-lighter: #{$color-v4-primary-lighter};
48+
--primary-light: #{$color-v4-primary-light};
49+
--primary-main: #{$color-v4-primary-main};
50+
--primary-main-8-p: #{$color-v4-primary-main-8-p};
51+
--primary-main-50-p: #{$color-v4-primary-main-50-p};
52+
--primary-dark: #{$color-v4-primary-dark};
53+
--primary-darker: #{$color-v4-primary-darker};
54+
--primary-outlined-border: #{$color-v4-primary-outlined-border};
55+
--primary-contrast-text: #{$color-v4-primary-contrast-text};
56+
--primary-button-contrast-text: #{$color-v4-primary-button-contrast-text};
5757

58-
--info-lighter: #{colors.$color-v4-info-lighter};
59-
--info-light: #{colors.$color-v4-info-light};
60-
--info-main: #{colors.$color-v4-info-main};
61-
--info-main-8-p: #{colors.$color-v4-info-main-8-p};
62-
--info-main-50-p: #{colors.$color-v4-info-main-50-p};
63-
--info-dark: #{colors.$color-v4-info-dark};
64-
--info-darker: #{colors.$color-v4-info-darker};
65-
--info-outlined-border: #{colors.$color-v4-info-outlined-border};
66-
--info-contrast-text: #{colors.$color-v4-info-contrast-text};
67-
--info-button-contrast-text: #{colors.$color-v4-info-button-contrast-text};
58+
--info-lighter: #{$color-v4-info-lighter};
59+
--info-light: #{$color-v4-info-light};
60+
--info-main: #{$color-v4-info-main};
61+
--info-main-8-p: #{$color-v4-info-main-8-p};
62+
--info-main-50-p: #{$color-v4-info-main-50-p};
63+
--info-dark: #{$color-v4-info-dark};
64+
--info-darker: #{$color-v4-info-darker};
65+
--info-outlined-border: #{$color-v4-info-outlined-border};
66+
--info-contrast-text: #{$color-v4-info-contrast-text};
67+
--info-button-contrast-text: #{$color-v4-info-button-contrast-text};
6868

69-
--success-lighter: #{colors.$color-v4-success-lighter};
70-
--success-light: #{colors.$color-v4-success-light};
71-
--success-main: #{colors.$color-v4-success-main};
72-
--success-main-8-p: #{colors.$color-v4-success-main-8-p};
73-
--success-main-50-p: #{colors.$color-v4-success-main-50-p};
74-
--success-dark: #{colors.$color-v4-success-dark};
75-
--success-darker: #{colors.$color-v4-success-darker};
76-
--success-outlined-border: #{colors.$color-v4-success-outlined-border};
77-
--success-contrast-text: #{colors.$color-v4-success-contrast-text};
78-
--success-button-contrast-text: #{colors.$color-v4-success-button-contrast-text};
69+
--success-lighter: #{$color-v4-success-lighter};
70+
--success-light: #{$color-v4-success-light};
71+
--success-main: #{$color-v4-success-main};
72+
--success-main-8-p: #{$color-v4-success-main-8-p};
73+
--success-main-50-p: #{$color-v4-success-main-50-p};
74+
--success-dark: #{$color-v4-success-dark};
75+
--success-darker: #{$color-v4-success-darker};
76+
--success-outlined-border: #{$color-v4-success-outlined-border};
77+
--success-contrast-text: #{$color-v4-success-contrast-text};
78+
--success-button-contrast-text: #{$color-v4-success-button-contrast-text};
7979

80-
--warning-lighter: #{colors.$color-v4-warning-lighter};
81-
--warning-light: #{colors.$color-v4-warning-light};
82-
--warning-main: #{colors.$color-v4-warning-main};
83-
--warning-main-8-p: #{colors.$color-v4-warning-main-8-p};
84-
--warning-main-50-p: #{colors.$color-v4-warning-main-50-p};
85-
--warning-dark: #{colors.$color-v4-warning-dark};
86-
--warning-darker: #{colors.$color-v4-warning-darker};
87-
--warning-outlined-border: #{colors.$color-v4-warning-outlined-border};
88-
--warning-contrast-text: #{colors.$color-v4-warning-contrast-text};
89-
--warning-button-contrast-text: #{colors.$color-v4-warning-button-contrast-text};
80+
--warning-lighter: #{$color-v4-warning-lighter};
81+
--warning-light: #{$color-v4-warning-light};
82+
--warning-main: #{$color-v4-warning-main};
83+
--warning-main-8-p: #{$color-v4-warning-main-8-p};
84+
--warning-main-50-p: #{$color-v4-warning-main-50-p};
85+
--warning-dark: #{$color-v4-warning-dark};
86+
--warning-darker: #{$color-v4-warning-darker};
87+
--warning-outlined-border: #{$color-v4-warning-outlined-border};
88+
--warning-contrast-text: #{$color-v4-warning-contrast-text};
89+
--warning-button-contrast-text: #{$color-v4-warning-button-contrast-text};
9090

91-
--error-lighter: #{colors.$color-v4-error-lighter};
92-
--error-light: #{colors.$color-v4-error-light};
93-
--error-main: #{colors.$color-v4-error-main};
94-
--error-main-8-p: #{colors.$color-v4-error-main-8-p};
95-
--error-main-50-p: #{colors.$color-v4-error-main-50-p};
96-
--error-dark: #{colors.$color-v4-error-dark};
97-
--error-darker: #{colors.$color-v4-error-darker};
98-
--error-outlined-border: #{colors.$color-v4-error-outlined-border};
99-
--error-contrast-text: #{colors.$color-v4-error-contrast-text};
100-
--error-button-contrast-text: #{colors.$color-v4-error-button-contrast-text};
91+
--error-lighter: #{$color-v4-error-lighter};
92+
--error-light: #{$color-v4-error-light};
93+
--error-main: #{$color-v4-error-main};
94+
--error-main-8-p: #{$color-v4-error-main-8-p};
95+
--error-main-50-p: #{$color-v4-error-main-50-p};
96+
--error-dark: #{$color-v4-error-dark};
97+
--error-darker: #{$color-v4-error-darker};
98+
--error-outlined-border: #{$color-v4-error-outlined-border};
99+
--error-contrast-text: #{$color-v4-error-contrast-text};
100+
--error-button-contrast-text: #{$color-v4-error-button-contrast-text};
101101

102-
--aba: #{colors.$color-v4-aba};
103-
--abb: #{colors.$color-v4-abb};
102+
--aba: #{$color-v4-aba};
103+
--abb: #{$color-v4-abb};
104104
}
105105
/* endregion css variables */
106106

‎projects/fusion-ui/src/style/scss/v4/grid.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "sass:math";
22
@use "sass:map";
33

4-
@use "mixins/breakpoints" as *;
4+
@import "mixins/breakpoints";
55

66
$gridColumns: 12 !default;
77
$gridColumnGap: 32px !default;

‎projects/fusion-ui/src/style/scss/v4/shadows.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@use './vars/shadows';
1+
@import './vars/shadows';
22

33
.fusion-v4 {
4-
--box-shadow-xs: #{shadows.$boxShadowV4-XS};
5-
--box-shadow-sm: #{shadows.$boxShadowV4-SM};
6-
--box-shadow-md: #{shadows.$boxShadowV4-MD};
7-
--box-shadow-lg: #{shadows.$boxShadowV4-LG};
8-
--box-shadow-xl: #{shadows.$boxShadowV4-XL};
9-
--box-shadow-xxl: #{shadows.$boxShadowV4-XXL};
10-
--box-shadow-xxxl: #{shadows.$boxShadowV4-XXXL};
11-
--box-shadow-slg: #{shadows.$boxShadowV4-SLG};
4+
--box-shadow-xs: #{$boxShadowV4-XS};
5+
--box-shadow-sm: #{$boxShadowV4-SM};
6+
--box-shadow-md: #{$boxShadowV4-MD};
7+
--box-shadow-lg: #{$boxShadowV4-LG};
8+
--box-shadow-xl: #{$boxShadowV4-XL};
9+
--box-shadow-xxl: #{$boxShadowV4-XXL};
10+
--box-shadow-xxxl: #{$boxShadowV4-XXXL};
11+
--box-shadow-slg: #{$boxShadowV4-SLG};
1212
}

‎projects/fusion-ui/src/style/scss/v4/spacings.scss

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
@use './vars/spacings';
1+
@import 'vars/spacings';
22

33
.fusion-v4 {
4-
--spacing-tockenset: #{spacings.$spacingV4-tokenset};
5-
--spacing-25: #{spacings.$spacingV4-25};
6-
--spacing-50: #{spacings.$spacingV4-50};
7-
--spacing-75: #{spacings.$spacingV4-75};
8-
--spacing-100: #{spacings.$spacingV4-100};
9-
--spacing-125: #{spacings.$spacingV4-125};
10-
--spacing-150: #{spacings.$spacingV4-150};
11-
--spacing-200: #{spacings.$spacingV4-200};
12-
--spacing-250: #{spacings.$spacingV4-250};
13-
--spacing-300: #{spacings.$spacingV4-300};
14-
--spacing-400: #{spacings.$spacingV4-400};
15-
--spacing-500: #{spacings.$spacingV4-500};
16-
--spacing-600: #{spacings.$spacingV4-600};
17-
--spacing-700: #{spacings.$spacingV4-700};
18-
--spacing-800: #{spacings.$spacingV4-800};
19-
--spacing-900: #{spacings.$spacingV4-900};
20-
--spacing-1000: #{spacings.$spacingV4-1000};
4+
--spacing-tockenset: #{$spacingV4-tokenset};
5+
--spacing-25: #{$spacingV4-25};
6+
--spacing-50: #{$spacingV4-50};
7+
--spacing-75: #{$spacingV4-75};
8+
--spacing-100: #{$spacingV4-100};
9+
--spacing-125: #{$spacingV4-125};
10+
--spacing-150: #{$spacingV4-150};
11+
--spacing-200: #{$spacingV4-200};
12+
--spacing-250: #{$spacingV4-250};
13+
--spacing-300: #{$spacingV4-300};
14+
--spacing-400: #{$spacingV4-400};
15+
--spacing-500: #{$spacingV4-500};
16+
--spacing-600: #{$spacingV4-600};
17+
--spacing-700: #{$spacingV4-700};
18+
--spacing-800: #{$spacingV4-800};
19+
--spacing-900: #{$spacingV4-900};
20+
--spacing-1000: #{$spacingV4-1000};
2121
}

‎projects/fusion-ui/src/style/scss/v4/style-guide.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@forward './fonts';
2-
@forward './colors';
3-
@forward './shadows';
4-
@forward './border-radius';
5-
@forward './spacings';
6-
@forward './grid';
1+
@import './fonts';
2+
@import './colors';
3+
@import './shadows';
4+
@import './border-radius';
5+
@import './spacings';
6+
@import './grid';

‎projects/fusion-ui/src/style/scss/v4/variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@forward './colors';
2-
@forward './shadows';
3-
@forward './border-radius';
4-
@forward './spacings';
1+
@import './colors';
2+
@import './shadows';
3+
@import './border-radius';
4+
@import './spacings';

0 commit comments

Comments
 (0)