Skip to content

Commit f1d44b1

Browse files
Jimmy LeeJimmy Lee
authored andcommitted
1.1.0 - checkmate modal, redo card elements and remeasure to grid
1 parent 1e7c17f commit f1d44b1

13 files changed

+164
-16
lines changed

app/page.tsx

Lines changed: 73 additions & 0 deletions
Large diffs are not rendered by default.

components/ActionButton.module.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
color: var(--theme-text);
44
flex-shrink: 0;
55
cursor: pointer;
6-
transition: 200ms ease all;
76
font-weight: 400;
8-
transition-property: background;
97
padding: 0 1ch 0 1ch;
108
user-select: none;
119
flex-shrink: 0;
@@ -22,8 +20,6 @@
2220
cursor: pointer;
2321
padding: 0 1ch 0 1ch;
2422
text-transform: uppercase;
25-
transition: 200ms ease all;
26-
transition-property: background;
2723
user-select: none;
2824
}
2925

components/Card.module.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
.card {
22
position: relative;
33
display: block;
4-
padding: 0 1ch calc((var(--font-size) * 0.5) * var(--theme-line-height-base)) 1ch;
4+
padding-top: 0;
5+
padding-left: 0;
6+
padding-right: 0;
7+
padding-bottom: 0;
58
white-space: prewrap;
69
}
710

@@ -11,8 +14,10 @@
1114
inset -2px 0 0 0 var(--theme-text),
1215
inset 0 -2px 0 0 var(--theme-text);
1316
display: block;
14-
padding: calc((var(--font-size) * 0.5) * var(--theme-line-height-base)) 2ch calc(var(--font-size) * var(--theme-line-height-base)) 2ch;
15-
17+
padding-top: calc(var(--theme-line-height-base) * 0.5rem);
18+
padding-left: 2ch;
19+
padding-right: 2ch;
20+
padding-bottom: calc(var(--theme-line-height-base) * 1rem);
1621
overflow-x: auto;
1722
overflow-y: hidden;
1823

components/CardDouble.module.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
position: relative;
77
display: block;
8-
padding: 0 1ch calc(var(--card-double-half-gutter) * var(--theme-line-height-base)) 1ch;
8+
padding-top: 0;
9+
padding-right: 0;
10+
padding-left: 0;
11+
padding-bottom: 0;
912
}
1013

1114
.children {
@@ -16,7 +19,10 @@
1619
border-right: var(--card-double-border-width) solid var(--theme-text);
1720
border-right-style: double;
1821
display: block;
19-
padding: 10px calc(2ch - 6px) 14px calc(2ch - 6px);
22+
padding-top: calc(var(--theme-line-height-base) * 0.5rem);
23+
padding-left: calc(2ch - var(--card-double-border-width));
24+
padding-right: calc(2ch - var(--card-double-border-width));
25+
padding-bottom: calc(var(--theme-line-height-base) * 1rem - var(--card-double-border-width));
2026

2127
overflow-x: auto;
2228
overflow-y: hidden;

components/CardDouble.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ interface CardProps extends React.HTMLAttributes<HTMLDivElement> {
77
children?: React.ReactNode;
88
title?: string | any;
99
mode?: string | any;
10+
style?: any;
1011
}
1112

12-
const CardDouble: React.FC<CardProps> = ({ children, mode, title, ...rest }) => {
13+
const CardDouble: React.FC<CardProps> = ({ children, mode, title, style, ...rest }) => {
1314
let titleElement = (
1415
<header className={styles.action}>
1516
<div className={styles.left} aria-hidden="true"></div>
@@ -42,7 +43,9 @@ const CardDouble: React.FC<CardProps> = ({ children, mode, title, ...rest }) =>
4243
<article className={styles.card}>
4344
{titleElement}
4445
<section className={styles.children}>
45-
<section className={styles.borderChildren}>{children}</section>
46+
<section className={styles.borderChildren} style={style}>
47+
{children}
48+
</section>
4649
</section>
4750
</article>
4851
);

components/SidebarLayout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const SidebarLayout: React.FC<SidebarLayoutProps> = ({ defaultSidebarWidth = 20,
4141
return (
4242
<div className={styles.root} {...rest}>
4343
<div className={styles.content}>{children}</div>
44+
&nbsp;
4445
<div
4546
className={styles.sidebar}
4647
style={{

components/examples/DashboardRadar.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
justify-content: space-between;
55
width: 100%;
66
flex-direction: column;
7-
height: calc(var(--theme-line-height-base) * (var(--font-size) * 29));
7+
height: calc(var(--theme-line-height-base) * (var(--font-size) * 29.5));
88
}
99

1010
.customTop {
@@ -18,7 +18,7 @@
1818
}
1919

2020
.root {
21-
min-width: 44ch;
21+
min-width: 56ch;
2222
}
2323

2424
.cross {

components/examples/DashboardRadar.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const DashboardRadar = (props) => {
5757
CONDITION
5858
<br />
5959
CODE
60+
<br />
6061
<ActionButton style={{ width: '100%' }}>16 S=C75C</ActionButton>
6162
<ActionButton>PAST=8</ActionButton>
6263
<br />
@@ -86,6 +87,7 @@ const DashboardRadar = (props) => {
8687
</span>
8788
</RowSpaceBetween>
8889
</Card>
90+
<br />
8991
<Card>
9092
<RowSpaceBetween style={{ position: 'absolute', top: 0, left: `6ch`, right: `6ch` }}>
9193
<RadarMarker />

components/examples/Denabase.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
top: calc(var(--theme-line-height-base) * -0.5rem);
7373
left: 0;
7474
height: calc(var(--theme-line-height-base) * 0.5rem);
75-
width: 13.8ch;
75+
width: 14.2ch;
7676
background: var(--theme-background);
7777
position: absolute;
7878
box-shadow:
@@ -82,7 +82,7 @@
8282
}
8383

8484
.box {
85-
width: 6.9ch;
85+
width: 7.1ch;
8686
flex-shrink: 0;
8787
height: calc(var(--theme-line-height-base) * 3rem);
8888
display: inline-flex;

components/examples/Denabase.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ const Denabase = (props) => {
6262
<br />
6363
<Divider type="GRADIENT" />
6464
</Card>
65+
<br />
6566
<Card>
6667
<SidebarLayout
6768
sidebar={

0 commit comments

Comments
 (0)