Skip to content

Commit

Permalink
things I got pinged about to fix (#803)
Browse files Browse the repository at this point in the history
  • Loading branch information
ImUrX authored Aug 3, 2023
1 parent 06520b9 commit 93c910b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions gui/public/i18n/en/translation.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -783,9 +783,9 @@ onboarding-automatic_proportions-check_height-fetch_height = I'm standing!
# Context is that the height is unknown
onboarding-automatic_proportions-check_height-unknown = Unknown
# Shows an element below it
onboarding-automatic_proportions-check_height-height = Your height is
onboarding-automatic_proportions-check_height-hmd_height1 = Your HMD height is
# Shows an element below it
onboarding-automatic_proportions-check_height-hmd_height = And HMD height is
onboarding-automatic_proportions-check_height-height1 = so your actual height is
onboarding-automatic_proportions-check_height-next_step = They are fine
onboarding-automatic_proportions-start_recording-title = Get ready to move
onboarding-automatic_proportions-start_recording-description = We're now going to record some specific poses and moves. These will be prompted in the next screen. Be ready to start when the button is pressed!
Expand Down
2 changes: 1 addition & 1 deletion gui/src/components/commons/NumberSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function NumberSelector({
render={({ field: { onChange, value } }) => (
<div className="flex flex-col gap-1 w-full">
<Typography bold>{label}</Typography>
<div className="flex gap-2 bg-background-60 p-2 rounded-lg">
<div className="flex gap-5 bg-background-60 p-2 rounded-lg">
<div className="flex">
<Button
variant="tertiary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ export function CheckHeight({
<form className="flex flex-col self-center items-center justify-center">
<NumberSelector
control={control}
name="height"
name="hmdHeight"
label={l10n.getString(
'onboarding-automatic_proportions-check_height-height'
'onboarding-automatic_proportions-check_height-hmd_height1'
)}
valueLabelFormat={(value) =>
isNaN(value)
Expand All @@ -131,12 +131,13 @@ export function CheckHeight({
min={MIN_HEIGHT}
max={4}
step={0.01}
disabled={true}
/>
<NumberSelector
control={control}
name="hmdHeight"
name="height"
label={l10n.getString(
'onboarding-automatic_proportions-check_height-hmd_height'
'onboarding-automatic_proportions-check_height-height1'
)}
valueLabelFormat={(value) =>
isNaN(value)
Expand All @@ -148,7 +149,6 @@ export function CheckHeight({
min={MIN_HEIGHT}
max={4}
step={0.01}
disabled={true}
/>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion gui/src/components/settings/pages/Serial.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export function Serial() {
</div>
<div className="" ref={toolbarRef}>
<div className="border-t-2 pt-2 border-background-60 border-solid m-2 gap-2 flex flex-row">
<div className="flex flex-grow gap-2 mobile:grid mobile:grid-cols-2 mobile:grid-rows-2">
<div className="flex flex-grow flex-wrap gap-2 mobile:grid mobile:grid-cols-2 mobile:grid-rows-2">
<Button variant="quaternary" onClick={reboot}>
{l10n.getString('settings-serial-reboot')}
</Button>
Expand Down
1 change: 1 addition & 0 deletions gui/src/components/tracker/TrackerBattery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export function TrackerBattery({
});
const voltageFormatter = new Intl.NumberFormat(currentLocales, {
maximumFractionDigits: 2,
minimumFractionDigits: 2,
});

return (
Expand Down

0 comments on commit 93c910b

Please sign in to comment.