Skip to content

Commit fc5721d

Browse files
authored
Merge pull request #313 from dev-protocol/aggre-patch-1
Patch: fixes the bugged behavior
2 parents 944c14c + 9ce7320 commit fc5721d

File tree

1 file changed

+114
-2
lines changed

1 file changed

+114
-2
lines changed

packages/hashi/_init-base.scss

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ $_tones: (
140140
}
141141

142142
@media (prefers-color-scheme: dark) {
143-
@at-root #{selector.nest('html:not([hashi-theme="light"]), html:not([data-theme="light"]), html:not([theme="light"]), html:not(.is-light)', &)} {
143+
@at-root #{selector.nest('html:not([hashi-theme="light"]):not([data-theme="light"]):not([theme="light"]):not(.is-light)', &)} {
144144
@content;
145145
}
146146
}
@@ -574,6 +574,118 @@ $_tones: (
574574
),
575575
);
576576
}
577+
}
578+
579+
@if $_dark-mode == 'auto' {
580+
@media (prefers-color-scheme: dark) {
581+
&:not([hashi-theme='light']):not([theme='light']):not([data-theme='light']):not(.is-light) {
582+
color-scheme: dark;
583+
@include hs-core.token-config(
584+
$primary: (
585+
200: hs-core.token-get('primary-dark-200'),
586+
300: hs-core.token-get('primary-dark-300'),
587+
400: hs-core.token-get('primary-dark-400'),
588+
600: hs-core.token-get('primary-dark-600'),
589+
'ink': hs-core.token-get('primary-dark-ink'),
590+
'alpha': (
591+
200: rgba(_raw('primary-dark-200'), 8%),
592+
300: rgba(_raw('primary-dark-300'), 12%),
593+
400: rgba(_raw('primary-dark-400'), 20%),
594+
600: rgba(_raw('primary-dark-600'), 33%)
595+
),
596+
),
597+
$accent: (
598+
200: hs-core.token-get('accent-dark-200'),
599+
300: hs-core.token-get('accent-dark-300'),
600+
400: hs-core.token-get('accent-dark-400'),
601+
600: hs-core.token-get('accent-dark-600'),
602+
'ink': hs-core.token-get('accent-dark-ink'),
603+
'alpha': (
604+
200: rgba(_raw('accent-dark-200'), 8%),
605+
300: rgba(_raw('accent-dark-300'), 12%),
606+
400: rgba(_raw('accent-dark-400'), 20%),
607+
600: rgba(_raw('accent-dark-600'), 33%)
608+
),
609+
),
610+
$surface: (
611+
200: hs-core.token-get('surface-dark-200'),
612+
300: hs-core.token-get('surface-dark-300'),
613+
400: hs-core.token-get('surface-dark-400'),
614+
600: hs-core.token-get('surface-dark-600'),
615+
'ink': hs-core.token-get('surface-dark-ink'),
616+
'alpha': (
617+
200: rgba(_raw('surface-dark-200'), 8%),
618+
300: rgba(_raw('surface-dark-300'), 12%),
619+
400: rgba(_raw('surface-dark-400'), 20%),
620+
600: rgba(_raw('surface-dark-600'), 33%)
621+
),
622+
),
623+
$disabled: (
624+
'default': hs-core.primitive-token-get('dp-white-alpha.default'),
625+
'ink': hs-core.primitive-token-get('dp-white-alpha.ink')
626+
),
627+
$background: (
628+
'default': hs-core.token-get('background-dark'),
629+
'ink': hs-core.token-get('background-dark-ink'),
630+
),
631+
);
632+
}
633+
}
634+
&.is-dark,
635+
&[hashi-theme='dark'],
636+
&[theme='dark'],
637+
&[data-theme='dark'] {
638+
color-scheme: dark;
639+
@include hs-core.token-config(
640+
$primary: (
641+
200: hs-core.token-get('primary-dark-200'),
642+
300: hs-core.token-get('primary-dark-300'),
643+
400: hs-core.token-get('primary-dark-400'),
644+
600: hs-core.token-get('primary-dark-600'),
645+
'ink': hs-core.token-get('primary-dark-ink'),
646+
'alpha': (
647+
200: rgba(_raw('primary-dark-200'), 8%),
648+
300: rgba(_raw('primary-dark-300'), 12%),
649+
400: rgba(_raw('primary-dark-400'), 20%),
650+
600: rgba(_raw('primary-dark-600'), 33%)
651+
),
652+
),
653+
$accent: (
654+
200: hs-core.token-get('accent-dark-200'),
655+
300: hs-core.token-get('accent-dark-300'),
656+
400: hs-core.token-get('accent-dark-400'),
657+
600: hs-core.token-get('accent-dark-600'),
658+
'ink': hs-core.token-get('accent-dark-ink'),
659+
'alpha': (
660+
200: rgba(_raw('accent-dark-200'), 8%),
661+
300: rgba(_raw('accent-dark-300'), 12%),
662+
400: rgba(_raw('accent-dark-400'), 20%),
663+
600: rgba(_raw('accent-dark-600'), 33%)
664+
),
665+
),
666+
$surface: (
667+
200: hs-core.token-get('surface-dark-200'),
668+
300: hs-core.token-get('surface-dark-300'),
669+
400: hs-core.token-get('surface-dark-400'),
670+
600: hs-core.token-get('surface-dark-600'),
671+
'ink': hs-core.token-get('surface-dark-ink'),
672+
'alpha': (
673+
200: rgba(_raw('surface-dark-200'), 8%),
674+
300: rgba(_raw('surface-dark-300'), 12%),
675+
400: rgba(_raw('surface-dark-400'), 20%),
676+
600: rgba(_raw('surface-dark-600'), 33%)
677+
),
678+
),
679+
$disabled: (
680+
'default': hs-core.primitive-token-get('dp-white-alpha.default'),
681+
'ink': hs-core.primitive-token-get('dp-white-alpha.ink')
682+
),
683+
$background: (
684+
'default': hs-core.token-get('background-dark'),
685+
'ink': hs-core.token-get('background-dark-ink'),
686+
),
687+
);
688+
}
577689
}
578690
}
579691

@@ -602,4 +714,4 @@ $_tones: (
602714

603715
@function _raw($query) {
604716
@return hs-core.token-switch-raw($query, hs-core.primitive-token-switch($query));
605-
}
717+
}

0 commit comments

Comments
 (0)