git.iko.soy/bridge
on master help sign in
Updated to static heights
1f0cfb2Will Galebach
src/components/L2/Window/Window.scss+1
compare with master
unifiedsplit
@@ -5,4 +5,5 @@
5 border: 1px solid $light-gray;
5 border: 1px solid $light-gray;
6 width: 480px;
6 width: 480px;
7 max-width: calc(100vw - 32px);
7 max-width: calc(100vw - 32px);
8+ position: relative;
8}
9}
src/style/master-key.scss+1−1
@@ -18,7 +18,7 @@
18
18
19svg.master-key {
19svg.master-key {
20 height: 44px;
20 height: 44px;
21− margin: 80px 0;
21+ margin: 107px 0;
22 // Initial state
22 // Initial state
23 path {
23 path {
24 fill-opacity: 0.2;
24 fill-opacity: 0.2;
src/views/Activate/ActivateCode.tsx+2−2
@@ -48,9 +48,9 @@ export default function ActivateCode() {
48 </Box>
48 </Box>
49 )}
49 )}
50 {impliedPatp ? (
50 {impliedPatp ? (
51− <PointPresenter patp={impliedPatp} />
51+ <PointPresenter patp={impliedPatp} className="mb6 mt7" />
52 ) : (
52 ) : (
53− <PlaceholderSigil className="mt9 mb8" />
53+ <PlaceholderSigil className="mv9" style={{ marginTop: 78 }} />
54 )}
54 )}
55 </Box>
55 </Box>
56 </ActivateView>
56 </ActivateView>
src/views/Activate/ActivateView.tsx+3−3
@@ -1,12 +1,12 @@
1import { Box } from '@tlon/indigo-react';
1import { Box } from '@tlon/indigo-react';
2−import cn from 'classnames';
3−import View from 'components/View';
4import { Grid, Text } from 'indigo-react';
2import { Grid, Text } from 'indigo-react';
5import HeaderButton from 'components/L2/Headers/HeaderButton';
3import HeaderButton from 'components/L2/Headers/HeaderButton';
6import { useHistory } from 'store/history';
4import { useHistory } from 'store/history';
7import Window from 'components/L2/Window/Window';
5import Window from 'components/L2/Window/Window';
8import BodyPane from 'components/L2/Window/BodyPane';
6import BodyPane from 'components/L2/Window/BodyPane';
9
7
8+import './ActivateView.scss';
9+
10interface ActivateViewProps {
10interface ActivateViewProps {
11 className?: string;
11 className?: string;
12 children?: React.ReactNode;
12 children?: React.ReactNode;
@@ -49,7 +49,7 @@ export default function ActivateView({
49 onClick={onBack || (() => pop())}
49 onClick={onBack || (() => pop())}
50 />
50 />
51 )}
51 )}
52− <Window>
52+ <Window className="activate-view">
53 <BodyPane>
53 <BodyPane>
54 <Box className="w-full" gridArea="header">
54 <Box className="w-full" gridArea="header">
55 {header}
55 {header}
src/views/Activate/MasterKeyConfirm.scss+1−1
@@ -34,7 +34,7 @@
34 flex-direction: row;
34 flex-direction: row;
35 width: 80%;
35 width: 80%;
36 height: min-content;
36 height: min-content;
37− margin: 48px 0;
37+ margin: 120px 0;
38 flex-wrap: nowrap;
38 flex-wrap: nowrap;
39 justify-content: center;
39 justify-content: center;
40 }
40 }
src/views/Activate/MasterKeyDownload.tsx+2−2
@@ -133,7 +133,7 @@ const MasterKeyDownload = () => {
133 justifyContent={'space-evenly'}>
133 justifyContent={'space-evenly'}>
134 <DangerBox
134 <DangerBox
135 overrideFadeIn={triggerAnimation && isIn}
135 overrideFadeIn={triggerAnimation && isIn}
136− className={`mv7 ${!isIn ? 'hidden' : ''}`}>
136+ className={`mv8 ${!isIn ? 'hidden' : ''}`}>
137 Do not share this with anyone else!
137 Do not share this with anyone else!
138 </DangerBox>
138 </DangerBox>
139 {ticket && (
139 {ticket && (
@@ -142,7 +142,7 @@ const MasterKeyDownload = () => {
142 <MasterKeyCopy
142 <MasterKeyCopy
143 text={ticket}
143 text={ticket}
144 overrideFadeIn={triggerAnimation && isIn}
144 overrideFadeIn={triggerAnimation && isIn}
145− className={`mv2 ${!isIn ? 'hidden' : ''}`}
145+ className={`mv5 ${!isIn ? 'hidden' : ''}`}
146 />
146 />
147 </Box>
147 </Box>
148 </ActivateView>
148 </ActivateView>
src/views/Activate/MasterKeyReveal.tsx+1
@@ -87,6 +87,7 @@ const MasterKeyReveal = () => {
87 height={'100%'}
87 height={'100%'}
88 justifyContent={'center'}>
88 justifyContent={'center'}>
89 <Box
89 <Box
90+ margin={triggerAnimation ? '0' : '75px 0'}
90 display={'flex'}
91 display={'flex'}
91 flexDirection={'row'}
92 flexDirection={'row'}
92 flexWrap={'nowrap'}
93 flexWrap={'nowrap'}