Skip to content

Commit 65ab4ef

Browse files
committed
Merge branch 'frontend-update-welcome-message'
2 parents 0e75b2f + 54aadc4 commit 65ab4ef

File tree

4 files changed

+13
-105
lines changed

4 files changed

+13
-105
lines changed

frontends/web/src/locales/en/app.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,9 +1903,8 @@
19031903
"welcome": {
19041904
"connect": "Connect your BitBox",
19051905
"getStarted": "Let's get started by installing firmware on your BitBox.",
1906-
"insertBitBox02": "For the BitBox02, please tap the device to continue.",
1907-
"insertDevice": "Please connect your device to get started",
19081906
"loadingAccounts": "Loading accounts",
1907+
"message": "Please connect your BitBox and tap the side to continue.",
19091908
"title": "Welcome"
19101909
}
19111910
}

frontends/web/src/routes/device/bitbox01/bitbox01.module.css

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -42,107 +42,10 @@
4242
margin-bottom: var(--spacing-default);
4343
}
4444

45-
.heading {
46-
margin-top: 1px;
47-
}
48-
49-
.content {
50-
display: flex;
51-
flex-basis: auto;
52-
flex-direction: column;
53-
flex-grow: 1;
54-
flex-shrink: 1;
55-
max-width: var(--content-width);
56-
width: 100%;
57-
padding: var(--spacing-large) var(--spacing-default) 0 var(--spacing-default);
58-
}
59-
60-
.verticalButtons {
61-
display: flex;
62-
flex-direction: column;
63-
max-width: 300px;
64-
width: 100%;
65-
margin: 0 auto;
66-
}
67-
68-
.verticalButtons button:first-child {
69-
margin-bottom: var(--spacing-default);
70-
}
71-
72-
.block {
73-
flex: 1;
74-
}
75-
76-
.block p:first-child,
77-
.block h2:first-child {
78-
margin-top: 0;
79-
}
80-
81-
.block p:last-child {
82-
margin-bottom: var(--spacing-large);
83-
}
84-
8545
.list {
8646
padding-left: 18px;
8747
}
8848

8949
.list li:not(:first-child) {
9050
margin-top: var(--spacing-half);
9151
}
92-
93-
.buttons {
94-
margin-bottom: 0;
95-
margin-top: var(--spacing-large);
96-
}
97-
98-
.stepNumber {
99-
min-width: 20px !important;
100-
margin-right: 20px;
101-
text-align: center;
102-
color: var(--color-secondary);
103-
font-size: var(--size-extra-large);
104-
line-height: var(--size-extra-large);
105-
font-weight: 400;
106-
}
107-
108-
.badge {
109-
max-height: 40px;
110-
height: 40px;
111-
}
112-
113-
.waitingLogo {
114-
margin-bottom: var(--space-default);
115-
}
116-
117-
.waitingContent {
118-
max-width: 540px;
119-
width: 100%;
120-
background-color: var(--background-secondary);
121-
padding: var(--space-default);
122-
margin: 0 auto;
123-
text-align: center;
124-
}
125-
126-
.waitingText {
127-
margin-top: 0;
128-
margin-bottom: var(--space-half);
129-
text-align: center;
130-
font-weight: 400;
131-
font-size: var(--size-subheader);
132-
}
133-
134-
.waitingDescription {
135-
text-align: center;
136-
margin-bottom: 0;
137-
}
138-
139-
@media screen and (max-width: 640px) {
140-
.qrcodeContainer {
141-
width: 50%;
142-
}
143-
144-
.qrcodeContainer img {
145-
width: 100%;
146-
height: auto;
147-
}
148-
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.waitingText {
2+
margin-top: 0;
3+
margin-bottom: var(--space-half);
4+
font-size: var(--size-subheader);
5+
font-weight: 400;
6+
text-align: center;
7+
}

frontends/web/src/routes/device/waiting.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { AppLogo, AppLogoInverted, SwissMadeOpenSource, SwissMadeOpenSourceDark
3434
import { Footer, GuidedContent, GuideWrapper, Header, Main } from '@/components/layout';
3535
import { View, ViewContent } from '@/components/view/view';
3636
import { OutlinedSettingsButton } from '@/components/settingsButton/outlined-settings-button';
37-
import style from './bitbox01/bitbox01.module.css';
37+
import style from './waiting.module.css';
3838

3939
export const Waiting = () => {
4040
const { t } = useTranslation();
@@ -69,13 +69,12 @@ export const Waiting = () => {
6969
<OutlinedSettingsButton />
7070
</Header>
7171
<View verticallyCentered width="550px" fitContent>
72-
<ViewContent>
72+
<ViewContent textAlign="center">
7373
<div>
7474
{isDarkMode ? (<AppLogoInverted />) : (<AppLogo />)}
75-
<div className="box large">
76-
<h3 className={style.waitingText}>{t('welcome.insertDevice')}</h3>
77-
<p className={style.waitingDescription}>{t('welcome.insertBitBox02')}</p>
78-
</div>
75+
<p className={style.waitingText}>
76+
{t('welcome.message')}
77+
</p>
7978
<Bluetooth />
8079
</div>
8180
</ViewContent>

0 commit comments

Comments
 (0)