Skip to content

Commit a732661

Browse files
committed
updated styling, fixes lightmode styling and initial state of darkmode toggle
1 parent 9d6d445 commit a732661

1 file changed

Lines changed: 34 additions & 24 deletions

File tree

frontend/generated.html

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,16 @@
888888
z-index: 101;
889889
border-radius: calc(2px + var(--ds-dialog-radius));
890890
}
891+
@supports (display: flow-root) {
892+
.ds-dialog {
893+
display: flow-root;
894+
}
895+
}
896+
@supports not (display: flow-root) {
897+
.ds-dialog {
898+
padding: 0.05px;
899+
}
900+
}
891901
.ds-dialog-narrow {
892902
width: var(--ds-dialog-narrow);
893903
}
@@ -1814,7 +1824,7 @@
18141824
}
18151825
.ds-darkmode .solid-dialog {
18161826
box-shadow: var(--ds-shadow-small);
1817-
outline: 1px solid var(--ds-grey-80);
1827+
border: 1px solid var(--ds-grey-80);
18181828
}
18191829
@media (prefers-color-scheme: dark) {
18201830
.ds-darkmode-auto .solid-dialog {
@@ -2141,25 +2151,6 @@
21412151
}
21422152
let result = await simplyDataApi.sendPasswordReset(resetParams);
21432153
return result;
2144-
},
2145-
// component/solid-drawer-darkmode
2146-
"darkmodeInit" : function() {
2147-
const button = document.querySelector('.solid-darkmode-toggle button')
2148-
if (!button) {
2149-
return
2150-
}
2151-
if (document.body.classList.contains('ds-darkmode')) {
2152-
button.dataset.simplyState = 'default'
2153-
} else if (document.body.classList.contains('ds-darkmode-auto')) {
2154-
const darkModeMql = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)');
2155-
if (darkModeMql && darkModeMql.matches) {
2156-
button.dataset.simplyState = 'default'
2157-
} else {
2158-
button.dataset.simplyState = 'alt'
2159-
}
2160-
} else {
2161-
button.dataset.simplyState = 'alt'
2162-
}
21632154
}
21642155
},
21652156
/* /Actions */
@@ -2697,7 +2688,10 @@ <h1>Allow access?</h1>
26972688
<img class="ds-background-image solid-darkbg" src="/assets/img/bg2.jpg" alt="">
26982689
<nav class="solid-drawer-position">
26992690
<label class="ds-align-right ds-dropdown solid-drawer solid-darkmode-toggle">
2700-
<button class="ds-button ds-button-naked" data-simply-command="darkmodeToggle" data-simply-state="alt">
2691+
<button class="ds-button ds-button-naked"
2692+
data-simply-activate="darkmode"
2693+
data-simply-command="darkmodeToggle"
2694+
data-simply-state="alt">
27012695
<svg class="ds-icon ds-icon-feather" data-simply-state="default">
27022696
<use xlink:href="/assets/img/feather-sprite.svg#moon"></use>
27032697
</svg>
@@ -2781,7 +2775,7 @@ <h1>You have been logged out.</h1>
27812775
<template data-simply-template="change-password">
27822776
<simply-render rel="header"></simply-render>
27832777
<main class="solid-main">
2784-
<simply-render rel="change-password"></simply-render>
2778+
<simply-render rel="reset-change-password"></simply-render>
27852779
</main>
27862780
</template>
27872781
<!-- page/reset-password-->
@@ -2877,6 +2871,23 @@ <h1>You have been logged out.</h1>
28772871
}
28782872
})
28792873
</script>
2874+
<!-- darkmode-init (baseComponent/darkmode) -->
2875+
<script>
2876+
simply.activate.addListener('darkmode', function() {
2877+
if (document.body.classList.contains('ds-darkmode')) {
2878+
this.dataset.simplyState = 'default'
2879+
} else if (document.body.classList.contains('ds-darkmode-auto')) {
2880+
const darkModeMql = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)');
2881+
if (darkModeMql && darkModeMql.matches) {
2882+
this.dataset.simplyState = 'default'
2883+
} else {
2884+
this.dataset.simplyState = 'alt'
2885+
}
2886+
} else {
2887+
this.dataset.simplyState = 'alt'
2888+
}
2889+
})
2890+
</script>
28802891
<!-- password-input (baseComponent/password-input) -->
28812892
<script>
28822893
editor.field.registerType(
@@ -2907,5 +2918,4 @@ <h1>You have been logged out.</h1>
29072918
});
29082919
</script>
29092920
<!-- /Foot HTML -->
2910-
</body>
2911-
</html>
2921+
</b

0 commit comments

Comments
 (0)