Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix connect dialog formatting #50

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Fix connect dialog formatting #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc3f34
Fix connect dialog formatting
micque01 Dec 7, 2023
37c7bc6
Merge remote-tracking branch 'origin/main' into fix-connect-dialog-fo…
micque01 Dec 11, 2023
1d85e49
Merge remote-tracking branch 'origin/main' into fix-connect-dialog-fo…
micque01 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/components/connection-prompt/bluetooth/SelectMicrobitDialogBluetooth.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@

<main>
<div class="w-180 leading-10 pb-5">
<p class="font-bold text-2xl text-left">
<h2 class="font-bold text-2xl">
{$t('connectMB.webPopup')}
</p>
<img
src=""
alt="Instructions on how to choose microbit from web popup via bluetooth"
class="left-0 pt-5" />
<p class="absolute left-3/4 transform -translate-x-1/2 top-1/2 -translate-y-28">
{$t('connectMB.webPopup.instruction1')}
</p>
<p class="absolute left-3/4 transform -translate-x-1/2 -translate-y-13">
{$t('connectMB.webPopup.instruction2')}
</p>
</h2>
<div class="flex mt-5">
<img
src=""
alt="Screenshot of the browser window that will appear next. Your connected micro:bit will be listed. Choose your micro:bit then select the Connect button." />
<div class="flex flex-col w-full px-5">
<h3 class="font-bold text-lg mb-5">
{$t('connectMB.webPopup.instruction.heading')}:
</h3>
<ol class="list-decimal list-inside">
<li>{$t('connectMB.webPopup.instruction1')}</li>
<li>{$t('connectMB.webPopup.instruction2')}</li>
</ol>
</div>
</div>
</div>
<div class="justify-end flex flex-space-10 gap-x-5">
<StandardButton position="right" onClick={onBackClick}
Expand Down
37 changes: 0 additions & 37 deletions src/components/connection-prompt/radio/SelectMicrobitDialogSerial.svelte
View file
Open in desktop

This file was deleted.

28 changes: 16 additions & 12 deletions src/components/connection-prompt/usb/SelectMicrobitDialogUsb.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,23 @@

<main>
<div class="w-180 leading-10 pb-5">
<p class="font-bold text-2xl text-left">
<h2 class="font-bold text-2xl">
{$t('connectMB.webPopup')}
</p>
<img
src={selectMicrobitImage}
alt="Screenshot of the browser window that will appear next. Your connected micro:bit will be listed. Choose your micro:bit then select the Connect button."
class="left-0 pt-5" />
<p class="absolute left-3/4 transform -translate-x-1/2 top-1/2 -translate-y-28">
{$t('connectMB.webPopup.instruction1')}
</p>
<p class="absolute left-3/4 transform -translate-x-1/2 -translate-y-13">
{$t('connectMB.webPopup.instruction2')}
</p>
</h2>
<div class="flex mt-5">
<img
src={selectMicrobitImage}
alt="Screenshot of the browser window that will appear next. Your connected micro:bit will be listed. Choose your micro:bit then select the Connect button." />
<div class="flex flex-col w-full px-5">
<h3 class="font-bold text-lg mb-5">
{$t('connectMB.webPopup.instruction.heading')}:
</h3>
<ol class="list-decimal list-inside">
<li>{$t('connectMB.webPopup.instruction1')}</li>
<li>{$t('connectMB.webPopup.instruction2')}</li>
</ol>
</div>
</div>
</div>
<div class="justify-end flex flex-space-10 gap-x-5">
<StandardButton position="right" onClick={onBackClick}
Expand Down
4 changes: 2 additions & 2 deletions src/components/connection-prompt/usb/manual/ManualInstallTutorial.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
(c) 2023, Center for Computational Thinking and Design at Aarhus University and contributors

SPDX-License-Identifier: MIT
-->

Expand Down Expand Up @@ -71,7 +71,7 @@
</div>
</div>
<div class="grid grid-cols-1 place-items-center w-full">
<StandardButton onClick={onConnectBluetoothClick}
<StandardButton type="primary" onClick={onConnectBluetoothClick}
>{$t('connectMB.usb.manual.done')}</StandardButton>
</div>
</main>
2 changes: 2 additions & 0 deletions src/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ export const translations: TranslationMap = {

// SELECT MICROBIT FROM WEB POPUP
"connectMB.webPopup": TRANSLATION_NEEDED,
"connectMB.webPopup.instruction.heading": TRANSLATION_NEEDED,
"connectMB.webPopup.instruction1": TRANSLATION_NEEDED,
"connectMB.webPopup.instruction2": TRANSLATION_NEEDED,

Expand Down Expand Up @@ -453,6 +454,7 @@ export const translations: TranslationMap = {

// SELECT MICROBIT FROM WEB POPUP
"connectMB.webPopup":"Select micro:bit",
"connectMB.webPopup.instruction.heading": "In the next popup",
"connectMB.webPopup.instruction1": "Choose your micro:bit",
"connectMB.webPopup.instruction2": "Select 'Connect'",

Expand Down