Skip to content

Commit 9f1022c

Browse files
authored
pin sass back to 1.91 to prevent mixed-decls warnings (#2333)
also fix a couple small sass issues
1 parent 4bfebe8 commit 9f1022c

9 files changed

Lines changed: 25 additions & 14 deletions

File tree

frontend/app/element/collapsiblemenu.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
}
1010

1111
.collapsible-menu-item {
12-
padding: 10px;
1312
cursor: pointer;
1413
user-select: none;
1514
padding: 0;

frontend/app/element/flyoutmenu.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
.menu-item {
2424
display: flex;
2525
align-items: center;
26+
justify-content: space-between;
2627
padding: 4px 6px;
2728
cursor: pointer;
2829
color: var(--main-text-color);
@@ -33,9 +34,6 @@
3334
letter-spacing: -0.12px;
3435
width: 100%;
3536
border-radius: 2px;
36-
display: flex;
37-
align-items: center;
38-
justify-content: space-between;
3937

4038
.label {
4139
@include mixins.ellipsis();

frontend/app/notification/notificationitem.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
.notification {
5+
&.hovered {
6+
background: #292929;
7+
}
8+
59
.notification-title {
610
font-size: 13px;
711
font-style: normal;
@@ -113,7 +117,4 @@
113117
margin-bottom: 7px;
114118
}
115119
}
116-
&.hovered {
117-
background: #292929;
118-
}
119120
}

frontend/app/tab/tabbar.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414

1515
.config-error-message {
1616
max-width: 500px;
17+
margin-bottom: 20px;
1718

1819
h3 {
1920
font-weight: bold;
2021
font-size: 16px;
2122
margin-bottom: 10px;
2223
}
23-
24-
margin-bottom: 20px;
2524
}
2625

2726
.tab-bar-wrapper {

frontend/app/view/chat/chatmessages.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
.chat-message {
1414
display: flex;
15-
align-items: flex-start;
1615
align-items: center;
1716
margin-bottom: 8px;
1817
font-size: 1em;

frontend/app/view/chat/userlist.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
.user-list {
55
display: flex;
66
flex-direction: column;
7-
padding: 10px;
87
max-width: 250px;
98
background-color: rgba(255, 255, 255, 0.025);
109
padding: 5px;

frontend/app/view/preview/directorypreview.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@
238238
flex-direction: column;
239239
max-width: 90%;
240240
max-height: fit-content;
241-
display: flex;
242241
padding: 10px;
243242
gap: 10px;
244243
border-radius: 4px;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"prettier-plugin-jsdoc": "^1.3.3",
7373
"prettier-plugin-organize-imports": "^4.1.0",
7474
"rollup-plugin-flow": "^1.1.1",
75-
"sass": "^1.92.0",
75+
"sass": "1.91.0",
7676
"semver": "^7.7.2",
7777
"storybook": "^8.6.14",
7878
"storybook-dark-mode": "^4.0.2",

yarn.lock

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20054,6 +20054,23 @@ __metadata:
2005420054
languageName: node
2005520055
linkType: hard
2005620056

20057+
"sass@npm:1.91.0":
20058+
version: 1.91.0
20059+
resolution: "sass@npm:1.91.0"
20060+
dependencies:
20061+
"@parcel/watcher": "npm:^2.4.1"
20062+
chokidar: "npm:^4.0.0"
20063+
immutable: "npm:^5.0.2"
20064+
source-map-js: "npm:>=0.6.2 <2.0.0"
20065+
dependenciesMeta:
20066+
"@parcel/watcher":
20067+
optional: true
20068+
bin:
20069+
sass: sass.js
20070+
checksum: 10c0/5be1c98f7a618cb5f90b62f63d2aa0f78f9bf369c93ec7cd9880752a26b0ead19aa63cc341e8a26ce6c74d080baa5705f1685dff52fe6a3f28a7828ae50182b6
20071+
languageName: node
20072+
linkType: hard
20073+
2005720074
"sass@npm:^1.92.0":
2005820075
version: 1.92.0
2005920076
resolution: "sass@npm:1.92.0"
@@ -22871,7 +22888,7 @@ __metadata:
2287122888
remark-github-blockquote-alert: "npm:^1.3.1"
2287222889
rollup-plugin-flow: "npm:^1.1.1"
2287322890
rxjs: "npm:^7.8.2"
22874-
sass: "npm:^1.92.0"
22891+
sass: "npm:1.91.0"
2287522892
semver: "npm:^7.7.2"
2287622893
shell-quote: "npm:^1.8.3"
2287722894
sprintf-js: "npm:^1.1.3"

0 commit comments

Comments
 (0)