Skip to content

Commit 11acd30

Browse files
committed
fix(theme): adjust glass color theme
1 parent 6a1938a commit 11acd30

File tree

11 files changed

+190
-111
lines changed

11 files changed

+190
-111
lines changed

demo/components/DemoInputs.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
margin: 2rem 0;
393393
}
394394
395-
@media (width < 1200px) {
395+
@media (width < 1400px) {
396396
.column.content {
397397
flex: 1 0 40%;
398398
max-width: 50%;

src/lib/buttons/NeoButton.svelte

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,24 +216,19 @@
216216
}
217217
218218
&.glass {
219+
@include mixin.glass;
220+
219221
background-color: var(--neo-btn-bg-color, var(--neo-glass-background-color));
220-
box-shadow: var(--neo-glass-box-shadow-raised-3);
221222
backdrop-filter: var(--neo-blur-2) var(--neo-saturate-3);
222223
223224
&:focus-visible {
224225
background-color: var(--neo-glass-background-color-focus);
225-
box-shadow: var(--neo-glass-box-shadow-raised-2);
226226
backdrop-filter: var(--neo-blur-1) var(--neo-saturate-3);
227227
}
228228
229229
&.pressed,
230230
&:active {
231-
box-shadow: var(--neo-glass-box-shadow-inset-3);
232231
backdrop-filter: var(--neo-blur-0) var(--neo-saturate-2);
233-
234-
&.shallow {
235-
box-shadow: var(--neo-glass-box-shadow-flat);
236-
}
237232
}
238233
239234
&:disabled:not(.skeleton),
@@ -253,12 +248,10 @@
253248
&:hover:not(:active, &.pressed) {
254249
background-color: var(--neo-glass-background-color-hover);
255250
border-color: var(--neo-btn-border-color-hover, var(--neo-glass-border-color-hover));
256-
box-shadow: var(--neo-box-shadow-flat);
257251
backdrop-filter: var(--neo-blur-1) var(--neo-saturate-2);
258252
259253
&.shallow {
260254
border-color: transparent;
261-
box-shadow: var(--neo-glass-box-shadow-raised-2);
262255
}
263256
}
264257
}

src/lib/buttons/NeoButtonGroup.svelte

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
border-color: transparent !important;
135135
}
136136
137-
&:not(.text, .flat, .glass) {
137+
&:not(.text, .flat) {
138138
box-shadow: var(--neo-box-shadow-raised-3);
139139
}
140140
@@ -149,25 +149,19 @@
149149
}
150150
151151
&.glass {
152+
@include mixin.glass;
153+
152154
background-color: var(--neo-btn-bg-color, var(--neo-glass-background-color));
153155
border-color: var(
154156
--neo-btn-border-color,
155157
var(--neo-glass-top-border-color) var(--neo-glass-right-border-color) var(--neo-glass-bottom-border-color) var(--neo-glass-left-border-color)
156158
);
157159
backdrop-filter: var(--neo-blur-2) var(--neo-saturate-3);
158160
159-
&:not(.text, .flat) {
160-
box-shadow: var(--neo-glass-box-shadow-raised-3);
161-
}
162-
163161
:global(.neo-button) {
164162
background-color: transparent;
165163
backdrop-filter: none;
166164
}
167-
168-
:global(.neo-button:not(:active, .pressed)) {
169-
box-shadow: var(--neo-glass-box-shadow-flat);
170-
}
171165
}
172166
173167
:global(.neo-button) {
@@ -227,10 +221,6 @@
227221
box-shadow: var(--neo-box-shadow-raised-2);
228222
}
229223
230-
&.glass {
231-
box-shadow: var(--neo-glass-box-shadow-raised-2);
232-
}
233-
234224
:global(.neo-button.loading:active:not(.pressed)),
235225
:global(.neo-button:not(.flat, .text, :active, .pressed):hover) {
236226
box-shadow: var(--neo-box-shadow-inset-1);

src/lib/cards/NeoCard.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
--neo-card-border-color,
336336
var(--neo-glass-top-border-color) var(--neo-glass-right-border-color) var(--neo-glass-bottom-border-color) var(--neo-glass-left-border-color)
337337
);
338-
backdrop-filter: var(--neo-card-glass-blur, var(--neo-blur-4) var(--neo-saturate-2));
338+
backdrop-filter: var(--neo-card-glass-blur, var(--neo-blur-3) var(--neo-saturate-2));
339339
}
340340
341341
&.start {

src/lib/inputs/NeoInput.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@
789789
--neo-input-border-color,
790790
var(--neo-glass-top-border-color) var(--neo-glass-right-border-color) var(--neo-glass-bottom-border-color) var(--neo-glass-left-border-color)
791791
);
792-
backdrop-filter: var(--neo-input-glass-blur, var(--neo-blur-4) var(--neo-saturate-2));
792+
backdrop-filter: var(--neo-input-glass-blur, var(--neo-blur-3) var(--neo-saturate-2));
793793
}
794794
795795
&.validation {

src/lib/inputs/NeoTextarea.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@
775775
--neo-textarea-border-color,
776776
var(--neo-glass-top-border-color) var(--neo-glass-right-border-color) var(--neo-glass-bottom-border-color) var(--neo-glass-left-border-color)
777777
);
778-
backdrop-filter: var(--neo-textarea-glass-blur, var(--neo-blur-4) var(--neo-saturate-2));
778+
backdrop-filter: var(--neo-textarea-glass-blur, var(--neo-blur-3) var(--neo-saturate-2));
779779
}
780780
781781
&.validation {

src/lib/styles/common/colors.scss

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
/* ui color variables */
33
--neo-white: oklch(100% 0 0deg);
44
--neo-white-soft-light: oklch(from var(--neo-white-soft) calc(l + 0.05) c h);
5-
--neo-white-soft-light-10: oklch(from var(--neo-white-soft-light) l c h / 10%);
5+
--neo-white-soft-light-30: oklch(from var(--neo-white-soft-light) l c h / 30%);
6+
--neo-white-soft-light-60: oklch(from var(--neo-white-soft-light) l c h / 60%);
67
--neo-white-soft: oklch(92.9% 0.009 279.682deg);
7-
--neo-white-soft-5: oklch(from var(--neo-white-soft) l c h / 5%);
8-
--neo-white-soft-8: oklch(from var(--neo-white-soft) l c h / 8%);
9-
--neo-white-soft-10: oklch(from var(--neo-white-soft) l c h / 10%);
8+
--neo-white-soft-20: oklch(from var(--neo-white-soft) l c h / 20%);
9+
--neo-white-soft-22: oklch(from var(--neo-white-soft) l c h / 22%);
10+
--neo-white-soft-25: oklch(from var(--neo-white-soft) l c h / 25%);
1011
--neo-white-soft-dark: oklch(from var(--neo-white-soft) calc(l - 0.075) c h);
1112
--neo-white-soft-dark-80: oklch(from var(--neo-white-soft-dark) l c h / 80%);
1213
--neo-black: oklch(0% 0 0deg);
@@ -15,6 +16,7 @@
1516
--neo-black-10: oklch(from var(--neo-black) l c h / 10%);
1617
--neo-black-20: oklch(from var(--neo-black) l c h / 20%);
1718
--neo-black-lighter: oklch(from var(--neo-black-soft) calc(l + 0.1) c h);
19+
--neo-black-lighter-40: oklch(from var(--neo-black-lighter) l c h / 40%);
1820
--neo-black-light: oklch(from var(--neo-black-soft) calc(l + 0.05) c h);
1921
--neo-black-soft: oklch(33% 0 264.416deg);
2022
--neo-black-soft-dark: oklch(from var(--neo-black-soft) calc(l - 0.05) c h);
@@ -88,12 +90,13 @@
8890
--neo-scrollbar-color: var(--neo-grey-soft-60);
8991

9092
/** glass colors */
91-
--neo-glass-background-color: var(--neo-white-soft-5);
92-
--neo-glass-background-color-focus: var(--neo-white-soft-8);
93-
--neo-glass-background-color-hover: var(--neo-white-soft-10);
94-
--neo-glass-shadow-color: var(--neo-black-20);
95-
--neo-glass-border-color: var(--neo-white-soft-light-10);
96-
--neo-glass-border-color-hover: var(--neo-glass-background-color);
93+
--neo-glass-background-color: var(--neo-white-soft-20);
94+
--neo-glass-background-color-focus: var(--neo-white-soft-22);
95+
--neo-glass-background-color-hover: var(--neo-white-soft-25);
96+
--neo-glass-shadow-color-light: var(--neo-white-soft-light-60);
97+
--neo-glass-shadow-color-dark: var(--neo-black-10);
98+
--neo-glass-border-color: var(--neo-white-soft-light-60);
99+
--neo-glass-border-color-hover: var(--neo-white-soft-light-30);
97100
--neo-glass-skeleton-color: var(--neo-grey-soft-60);
98101

99102
/** dark primary colors */
@@ -139,22 +142,11 @@
139142
--neo-dark-glass-background-color: var(--neo-black-5);
140143
--neo-dark-glass-background-color-focus: var(--neo-black-8);
141144
--neo-dark-glass-background-color-hover: var(--neo-black-10);
142-
--neo-dark-glass-shadow-color: var(--neo-black-20);
143-
--neo-dark-glass-border-color: var(--neo-white-soft-light-10);
144-
--neo-dark-glass-border-color-hover: var(--neo-dark-glass-background-color);
145+
--neo-dark-glass-shadow-color-light: var(--neo-black-lighter-40);
146+
--neo-dark-glass-shadow-color-dark: var(--neo-black-20);
147+
--neo-dark-glass-border-color: var(--neo-black-lighter-40);
148+
--neo-dark-glass-border-color-hover: var(--neo-black-20);
145149
--neo-dark-glass-skeleton-color: var(--neo-grey-dark-80);
146-
147-
/* override semantic color if dark mode is enabled */
148-
&[neo-theme='dark'] {
149-
@include dark-theme;
150-
}
151-
152-
/* apply dark mode if not overridden */
153-
@media (prefers-color-scheme: dark) {
154-
&:not([neo-theme='light']) {
155-
@include dark-theme;
156-
}
157-
}
158150
}
159151

160152
@mixin dark-theme {
@@ -201,7 +193,8 @@
201193
--neo-glass-background-color: var(--neo-dark-glass-background-color);
202194
--neo-glass-background-color-focus: var(--neo-dark-glass-background-color-focus);
203195
--neo-glass-background-color-hover: var(--neo-dark-glass-background-color-hover);
204-
--neo-glass-shadow-color: var(--neo-dark-glass-shadow-color);
196+
--neo-glass-shadow-color-light: var(--neo-dark-glass-shadow-color-light);
197+
--neo-glass-shadow-color-dark: var(--neo-dark-glass-shadow-color-dark);
205198
--neo-glass-border-color: var(--neo-dark-glass-border-color);
206199
--neo-glass-border-color-hover: var(--neo-dark-glass-border-color-hover);
207200
--neo-glass-skeleton-color: var(--neo-dark-glass-skeleton-color);

src/lib/styles/common/filters.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@mixin filters() {
2+
/* Blurs */
3+
--neo-blur-0: blur(0);
4+
--neo-blur-1: blur(2px);
5+
--neo-blur-2: blur(4px);
6+
--neo-blur-3: blur(6px);
7+
--neo-blur-4: blur(8px);
8+
--neo-blur-5: blur(12px);
9+
10+
/* Saturation */
11+
--neo-saturate: saturate(1);
12+
--neo-saturate-1: saturate(1.1);
13+
--neo-saturate-2: saturate(1.2);
14+
--neo-saturate-3: saturate(1.3);
15+
--neo-saturate-4: saturate(1.5);
16+
--neo-saturate-5: saturate(2);
17+
}

0 commit comments

Comments
 (0)