Skip to content

Commit 6b69432

Browse files
committed
Tons of little fixes for things
1 parent ea9c835 commit 6b69432

File tree

4 files changed

+1640
-1517
lines changed

4 files changed

+1640
-1517
lines changed

Helium/gtk-4.0/_functions.scss

+13-23
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,34 @@
6060
}
6161

6262
@function shadow($level) {
63-
// Sunken controls
63+
// Elevation -1
6464
@if $level == -1 {
65-
@return 0 -2px 0 0 rgb(0, 0, 0, 0.1), 0 -1px 0 0 rgb(0, 0, 0, 0.05),
66-
0 -2px 0 0 rgb(0, 0, 0, 0.025), 0 2px 0 0 rgb(255, 255, 255, 0.025),
67-
0 1px 0 0 rgb(255, 255, 255, 0.05),
68-
0 2px 0 0 rgb(255, 255, 255, 0.1);
69-
// Outline border
65+
@return 0 -1px 0 0 rgb(0, 0, 0, 0.14));
66+
// Outline/Elevation 0
7067
} @else if $level == 0 {
71-
@return 0 0 0 1px rgb(0, 0, 0, 0.38);
72-
// Elevation 1
68+
@return 0 0 0 1px $outline;
69+
// Elevation 1
7370
} @else if $level == 1 {
7471
@return 0 2px 4px 0px rgb(0, 0, 0, 0.14),
7572
0 2px 4px 0px rgb(0, 0, 0, 0.14);
76-
// Elevation 2
73+
// Elevation 2
7774
} @else if $level == 2 {
7875
@return 0 4px 8px 0px rgb(0, 0, 0, 0.14),
7976
0 4px 8px 0px rgb(0, 0, 0, 0.14);
80-
// Elevation 3
77+
// Elevation 3
8178
} @else if $level == 3 {
8279
@return 0 8px 16px 0px rgb(0, 0, 0, 0.14),
8380
0 8px 16px 0px rgb(0, 0, 0, 0.14);
84-
// Elevation 4
81+
// Elevation 4
8582
} @else if $level == 4 {
86-
@return 0 0 8px 0px rgb(0, 0, 0, 0.2),
87-
0 14px 28px 0px rgb(0, 0, 0, 0.24);
88-
// Elevation 5
83+
@return 0 14px 28px 0px rgb(0, 0, 0, 0.24);
84+
// Elevation 5
8985
} @else if $level == 5 {
90-
@return 0 0 8px 0px rgb(0, 0, 0, 0.2),
91-
0 32px 64px 0px rgb(0, 0, 0, 0.24);
86+
@return 0 32px 64px 0px rgb(0, 0, 0, 0.24);
9287
}
9388
}
9489

95-
@function px-to-rem($pixels, $text-size: 10.5pt) {
90+
@function px-to-rem($pixels, $text-size: 10px) {
9691
@if (unitless($pixels)) {
9792
$pixels: $pixels * 1px;
9893
}
@@ -101,10 +96,5 @@
10196
$text-size: $text-size * 1px;
10297
}
10398

104-
@if ($pixels > 0) {
105-
// Workaround GTK clamping instead of rounding up
106-
@return (calc($pixels / $text-size) * 1rem) + 0.000000001rem;
107-
} @else {
108-
@return (calc($pixels / $text-size) * 1rem) - 0.000000001rem;
109-
}
99+
@return (calc($pixels / $text-size) * 1rem);
110100
}

0 commit comments

Comments
 (0)