Skip to content

Commit 7ec3852

Browse files
authored
Merge pull request #207 from UncoderIO/ui-fix
Update sass files
2 parents 3e2c071 + a022af3 commit 7ec3852

File tree

36 files changed

+76
-70
lines changed

36 files changed

+76
-70
lines changed

uncoder-os/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
"eslint-plugin-local-rules": "^3.0.2",
5151
"eslint-plugin-react-hooks": "^4.6.2",
5252
"file-loader": "^6.2.0",
53-
"html-webpack-plugin": "^5.6.0",
54-
"mini-css-extract-plugin": "^2.9.1",
53+
"html-webpack-plugin": "^5.6.3",
54+
"mini-css-extract-plugin": "^2.9.2",
5555
"node-polyfill-webpack-plugin": "^4.0.0",
56-
"postcss": "^8.4.47",
56+
"postcss": "^8.4.49",
5757
"postcss-inline-base64": "^7.3.1",
5858
"postcss-loader": "^8.1.1",
59-
"sass": "^1.79.3",
60-
"sass-loader": "^16.0.2",
59+
"sass": "^1.81.0",
60+
"sass-loader": "^16.0.3",
6161
"source-map-loader": "^5.0.0",
6262
"style-loader": "^4.0.0",
6363
"ts-loader": "^9.5.1",
64-
"typescript": "^5.6.2",
65-
"webpack": "5.94.0",
64+
"typescript": "^5.6.3",
65+
"webpack": "5.96.1",
6666
"webpack-cli": "5.1.4",
6767
"webpack-dev-server": "^5.1.0",
6868
"webpack-merge": "^6.0.1",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@import ./inter
2-
@import ./jetBrains
1+
@use "./inter" as *
2+
@use "./jetBrains" as *

uncoder-os/src/assets/sass/helpers/common.sass

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1+
@use "variables" as variables
2+
@use "mixins" as mixins
3+
@use "helpers" as helpers
4+
15
html,
26
body
3-
background-color: $backgroundDarkBlue
7+
background-color: variables.$backgroundDarkBlue
48

59
body
610
min-width: 375px
7-
font-family: $inter
11+
font-family: variables.$inter
812
font-size: 14px
913
font-weight: 400
10-
color: $textDefault
11-
+scrollbars
14+
color: variables.$textDefault
15+
+mixins.scrollbars
1216

1317
.inner
1418
margin: 0 auto
1519
padding: 0 32px
1620
width: 100%
1721
max-width: 1920px
18-
+md
22+
+helpers.md
1923
padding: 0 12px
2024
&--xl
2125
max-width: 1650px
22-
+xlMin
26+
+helpers.xlMin
2327
max-width: 1920px
2428
&--md
2529
max-width: 1110px
@@ -31,7 +35,7 @@ body
3135
.simplebar-track
3236
.simplebar-scrollbar
3337
&::before
34-
background-color: $backgroundSilverBlue
38+
background-color: variables.$backgroundSilverBlue
3539

3640
.three-dots
3741
max-width: 100%
@@ -65,7 +69,7 @@ body
6569
left: 0
6670
width: 100%
6771
height: 1px
68-
background-color: $backgroundWhite
72+
background-color: variables.$backgroundWhite
6973
transform: scaleX(0)
7074
transition: transform .15s
7175
&:hover
@@ -77,15 +81,15 @@ body
7781
&--white
7882
&,
7983
&:hover
80-
color: $textDefault
84+
color: variables.$textDefault
8185
&::after
82-
background-color: $backgroundWhite
86+
background-color: variables.$backgroundWhite
8387
&--green
8488
&,
8589
&:hover
86-
color: $textSuccess
90+
color: variables.$textSuccess
8791
&::after
88-
background-color: $backgroundSuccess
92+
background-color: variables.$backgroundSuccess
8993
&--underline
9094
&::after
9195
transform: scaleX(1)
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import mixins
2-
@import reset
3-
@import helpers
4-
@import margin
5-
@import variables
6-
@import common
1+
@use "mixins" as *
2+
@use "reset" as *
3+
@use "helpers" as *
4+
@use "margin" as *
5+
@use "variables" as *
6+
@use "common" as *

uncoder-os/src/assets/sass/helpers/mixins.sass

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
=scrollbars($size: 6px, $foreground-color: $backgroundSilverBlue, $background-color: transparent)
1+
@use 'variables' as variables
2+
3+
=scrollbars($size: 6px, $foreground-color: variables.$backgroundSilverBlue, $background-color: transparent)
24
// Standard version (Firefox only for now)
35
scrollbar-color: $foreground-color $background-color
46
// For Chrome & Safari

uncoder-os/src/assets/sass/index.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@import helpers/index
2-
@import fonts/index
1+
@use "helpers/index" as *
2+
@use "fonts/index" as *

uncoder-os/src/components/AdditionalButtons/AdditionalButton/AdditionalButton.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import ../../../assets/sass/helpers/variables
1+
@use "../../../assets/sass/helpers/variables" as *
22

33
.additional-button
44
text-align: center

uncoder-os/src/components/Banner/Banner.sass

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import ../../assets/sass/helpers/variables
2-
@import ../../assets/sass/helpers/helpers
1+
@use "../../assets/sass/helpers/variables" as *
2+
@use "../../assets/sass/helpers/helpers" as *
33

44
.banner-grid
55
padding: 16px 24px

uncoder-os/src/components/Buttons/Button/Button.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import ../../../assets/sass/helpers/variables
1+
@use "../../../assets/sass/helpers/variables" as *
22

33
.button
44
padding: 0 10px
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import ../../../assets/sass/helpers/variables
1+
@use "../../../assets/sass/helpers/variables" as *
22

33
.button--upper
44
&:disabled, &:disabled:hover
55
border-color: $borderDisabled
66
background-color: $iconDisabled
77
box-shadow: none
8-
z-index: 1
8+
z-index: 1

0 commit comments

Comments
 (0)