Skip to content

Commit 91e5b79

Browse files
authoredJan 27, 2024
Merge pull request #2429 from luckyklyist/luckyklyist/node-sass_migrate
feat: Remove deprecated node-sass package, migrated to Sass #2392
2 parents 2b99345 + 698fcdf commit 91e5b79

Some content is hidden

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

45 files changed

+1138
-515
lines changed
 

‎Dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ FROM base as development
1010
ENV NODE_ENV development
1111
COPY package.json package-lock.json ./
1212
RUN npm install
13-
RUN npm rebuild node-sass
1413
COPY .babelrc index.js nodemon.json ./
1514
COPY ./webpack ./webpack
1615
COPY client ./client
@@ -27,6 +26,5 @@ FROM base as production
2726
ENV NODE_ENV=production
2827
COPY package.json package-lock.json index.js ./
2928
RUN npm install --production
30-
RUN npm rebuild node-sass
3129
COPY --from=build $APP_HOME/dist ./dist
3230
CMD ["npm", "run", "start:prod"]

‎client/styles/abstracts/_placeholders.scss

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
@use "sass:math";
2+
13
%toolbar-button {
24
@include themify() {
35
display: inline-block;
4-
height: #{44 / $base-font-size}rem;
5-
width: #{44 / $base-font-size}rem;
6+
height: #{math.div(44, $base-font-size)}rem;
7+
width: #{math.div(44, $base-font-size)}rem;
68
text-align: center;
79
border-radius: 100%;
810
cursor: pointer;
@@ -81,7 +83,7 @@
8183
cursor: pointer;
8284
border: 2px solid getThemifyVariable('button-border-color');
8385
border-radius: 2px;
84-
padding: #{10 / $base-font-size}rem #{30 / $base-font-size}rem;
86+
padding: #{math.div(10, $base-font-size)}rem #{math.div(30, $base-font-size)}rem;
8587
& g, & path {
8688
fill: getThemifyVariable('button-color');
8789
opacity: 1;
@@ -111,8 +113,8 @@
111113
color: getThemifyVariable('primary-text-color');
112114
background-color: getThemifyVariable('preferences-button-background-color');
113115
padding: 0;
114-
margin-bottom: #{28 / $base-font-size}rem;
115-
line-height: #{50 / $base-font-size}rem;
116+
margin-bottom: #{math.div(28, $base-font-size)}rem;
117+
line-height: #{math.div(50, $base-font-size)}rem;
116118
& g, & path {
117119
fill: getThemifyVariable('modal-button-color');
118120
}
@@ -138,12 +140,12 @@
138140
color: getThemifyVariable('heavy-text-color');
139141
}
140142
}
141-
font-size: #{12 / $base-font-size}rem;
143+
font-size: #{math.div(12, $base-font-size)}rem;
142144
cursor: pointer;
143145
text-align: left;
144146
padding: 0;
145-
margin-bottom: #{5 / $base-font-size}rem;
146-
padding-right: #{5 / $base-font-size}rem;
147+
margin-bottom: #{math.div(5, $base-font-size)}rem;
148+
padding-right: #{math.div(5, $base-font-size)}rem;
147149
border: 0;
148150
list-style-type: none;
149151
}
@@ -194,19 +196,19 @@
194196
color: getThemifyVariable('primary-text-color');
195197
}
196198
text-align: left;
197-
width: #{180 / $base-font-size}rem;
199+
width: #{math.div(180, $base-font-size)}rem;
198200
display: flex;
199201
position: absolute;
200202
flex-direction: column;
201203
top: 95%;
202204
height: auto;
203205
z-index: 9999;
204-
border-radius: #{6 / $base-font-size}rem;
206+
border-radius: #{math.div(6, $base-font-size)}rem;
205207
& li:first-child {
206-
border-radius: #{5 / $base-font-size}rem #{5 / $base-font-size}rem 0 0;
208+
border-radius: #{math.div(5, $base-font-size)}rem #{math.div(5, $base-font-size)}rem 0 0;
207209
}
208210
& li:last-child {
209-
border-radius: 0 0 #{5 / $base-font-size}rem #{5 / $base-font-size}rem;
211+
border-radius: 0 0 #{math.div(5, $base-font-size)}rem #{math.div(5, $base-font-size)}rem;
210212
}
211213
& li {
212214
& button,
@@ -216,9 +218,9 @@
216218
}
217219
width: 100%;
218220
text-align: left;
219-
padding: #{8 / $base-font-size}rem #{16 / $base-font-size}rem;
221+
padding: #{math.div(8, $base-font-size)}rem #{math.div(16, $base-font-size)}rem;
220222
}
221-
height: #{35 / $base-font-size}rem;
223+
height: #{math.div(35, $base-font-size)}rem;
222224
cursor: pointer;
223225
display: flex;
224226
align-items: center;

0 commit comments

Comments
 (0)