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: address header wrapping issues #504

Merged
merged 2 commits into from
Dec 2, 2021
Merged

fix: address header wrapping issues #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbfd5f0
style: fix header wrapping issue
jacobvenable Dec 2, 2021
b482743
chore: remove unused imports in TranslationSelecT
jacobvenable Dec 2, 2021
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
36 changes: 24 additions & 12 deletions packages/web/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,35 @@ const Header = () => {
<AppBar color="transparent" elevation={0} position="static">
<Toolbar disableGutters>
<Container>
<Grid alignItems="center" container wrap="nowrap">
<Grid item>
<IconButton edge="start" onClick={() => setIsMenuOpen(true)}>
<Typography variant="srOnly">{t("menu")}</Typography>
<MenuIcon />
</IconButton>
</Grid>
<Grid alignItems="center" justify="flex-start" container item>
<Grid
alignItems="center"
container
justify="space-between"
wrap="nowrap"
>
<Grid alignItems="center" container item wrap="nowrap" xs={5}>
<Grid item>
<IconButton edge="start" onClick={() => setIsMenuOpen(true)}>
<Typography variant="srOnly">{t("menu")}</Typography>
<MenuIcon />
</IconButton>
</Grid>
<Grid item>
<Link to="/">
<Box component={Logo} height={40} width="auto" />
<Box component={Logo} height={40} maxWidth="100%" />
</Link>
</Grid>
</Grid>
<Grid alignItems="center" justify="flex-end" container item>
<Grid item component={Temperature} xs={6} />
<Grid item xs={6}>
<Grid
alignItems="center"
container
item
justify="flex-end"
wrap="nowrap"
xs={7}
>
<Grid item component={Temperature} />
<Grid item>
<TranslationSelect />
</Grid>
</Grid>
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/Temperature.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const useStyles = makeStyles((theme: Theme) => ({
flexDirection: "column",
marginRight: "12px",
padding: "5px 10px",
textAlign: "right",
},
degrees: {
fontSize: font.helpers.convertPixelsToRems(18),
Expand Down
36 changes: 8 additions & 28 deletions packages/web/src/components/TranslationSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
import { createStyles, makeStyles } from "@material-ui/core/styles";
import FormControl from "@material-ui/core/FormControl";
import MenuItem from "@material-ui/core/MenuItem";
import React from "react";
import Select from "@material-ui/core/Select";
import { Theme } from "@material-ui/core/styles";
import i18n from "../i18n";
import { useTranslation } from "react-i18next";

const useStyles = makeStyles((theme: Theme) =>
createStyles({
formControl: {
margin: theme.spacing(1),
minWidth: 120,
},
selectEmpty: {
marginTop: theme.spacing(2),
},
})
);

const TranslationSelect = () => {
const { t } = useTranslation("glossary");
const classes = useStyles();
const [translationUsed, setTranslationUsed] = React.useState("en");

const changeTranslation = (translation: string) => {
Expand All @@ -35,18 +19,14 @@ const TranslationSelect = () => {
};

return (
<div>
<FormControl className={classes.formControl}>
<Select
value={translationUsed}
onChange={handleChange}
aria-label={t("selectLanguage")}
>
<MenuItem value="en">English</MenuItem>
<MenuItem value="es">Español</MenuItem>
</Select>
</FormControl>
</div>
<Select
value={translationUsed}
onChange={handleChange}
aria-label={t("selectLanguage")}
>
<MenuItem value="en">English</MenuItem>
<MenuItem value="es">Español</MenuItem>
</Select>
);
};

Expand Down