Skip to content

Commit 37304cb

Browse files
committed
🎨 Improve manageability of setting screens.
* The titles is sticky when scrolling. * Close "x" is always clickable.
1 parent 72725ca commit 37304cb

File tree

5 files changed

+35
-2
lines changed

5 files changed

+35
-2
lines changed

src/components/Card.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ export const Card = (props: CardProps) => {
5151
const [{volume}] = useSettings()
5252
const [playSound] = useSound(volume)
5353

54-
// TODO maybe put in useSound
5554
// Generic function to wrap other fn's
5655
const wrapSound = useCallback((fn: () => void): () => void => {
5756
return () => {

src/components/InfoPanel.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react'
2+
import './css/InfoPanel.css'
23

34
export interface InfoPanelProps {
45
hideInfo: () => void

src/components/css/Help.css

+15-1
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,28 @@
22
background: rgba(255, 255, 255, 0.9);
33
color: black; border-radius: 0.5em;
44
width: calc(var(--card-width) * 1.2 * var(--card-ratio));
5-
height: calc(var(--card-height) * 1.2 * var(--card-ratio));
5+
height: calc((var(--card-height) * 1.2 * var(--card-ratio)) * 0.88);
66
overflow: auto;
77
cursor: default;
8+
padding-top: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
89
}
910
.help .title {
1011
border-radius: 0.5em 0.5em 0 0;
1112
background: rgba(255, 255, 255, 0.8);
1213
padding: 3px;
1314
cursor: grab;
15+
position: absolute;
16+
top: 0;
17+
left: 0;
18+
width: calc((var(--card-width) * 1.2 * var(--card-ratio)) - (3px * 2));
19+
height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
20+
line-height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
21+
}
22+
.help .title h3 {
23+
line-height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
24+
height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
25+
margin: 0;
26+
padding: 0;
1427
}
1528
.help .content {
1629
text-align: left;
@@ -27,6 +40,7 @@
2740
font-weight: normal;
2841
}
2942
.help .close {
43+
z-index: 2;
3044
cursor: pointer;
3145
position: absolute;
3246
top: 0;

src/components/css/InfoPanel.css

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.settings {
2+
width: calc(var(--card-width) * 1.2 * var(--card-ratio));
3+
height: calc((var(--card-height) * 1.2 * var(--card-ratio)) * 0.88);
4+
padding-top: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
5+
}
6+
.settings .title {
7+
width: 100%;
8+
position: absolute;
9+
top: 0;
10+
left: 0;
11+
cursor: grab;
12+
width: calc((var(--card-width) * 1.2 * var(--card-ratio)) - (3px * 2));
13+
height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
14+
line-height: calc(0.12 * (var(--card-height) * 1.2 * var(--card-ratio)));
15+
}
16+
.settings .title h3 {
17+
margin: 0;
18+
}

src/components/css/SettingsPanel.css

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
text-shadow: 0 1px 10px #FFD700, 0 2px 10px #FFAB00;
7878
}
7979
.settings .close {
80+
z-index: 2;
8081
cursor: pointer;
8182
position: absolute;
8283
top: 0;

0 commit comments

Comments
 (0)