Skip to content

Commit

Permalink
fix: Merge pull request #277 from congdv/master
Browse files Browse the repository at this point in the history
add responsive for welcome screen
  • Loading branch information
seveibar committed Aug 29, 2020
2 parents e22aab3 + bbed093 commit 0d2c881
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions src/components/StartingPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Select from "react-select"
import { useTranslation } from "react-i18next"
import getEmbedYoutubeUrl from "./get-embed-youtube-url.js"

const useStyles = makeStyles({
const useStyles = makeStyles((theme) => ({
container: {
display: "flex",
flexDirection: "column",
Expand All @@ -44,7 +44,14 @@ const useStyles = makeStyles({
flexDirection: "column",
textAlign: "center",
},
})
languageSelectionBox: {
display: "flex",
paddingTop: 24,
[theme.breakpoints.up("sm")]: {
justifyContent: "flex-end",
},
},
}))

const ContentContainer = styled("div")(({ theme }) => ({
display: "flex",
Expand Down Expand Up @@ -244,12 +251,12 @@ export default ({
<ContentContainer>
<Content>
<Grid container>
<Grid xs={6} item>
<Grid xs={12} sm={6} item>
<Title>Universal Data Tool</Title>
<Subtitle>{t("universaldatatool-description")}</Subtitle>
</Grid>
<Grid xs={6}>
<Box display="flex" justifyContent="flex-end" paddingTop={3}>
<Grid xs={12} sm={6} item>
<Box className={c.languageSelectionBox}>
<Box
width="100%"
maxWidth={200}
Expand All @@ -264,7 +271,7 @@ export default ({
</Box>
</Box>
</Grid>
<Grid xs={6} item>
<Grid xs={12} sm={6} item>
<ActionList>
<ActionTitle>Start</ActionTitle>
<Action
Expand Down Expand Up @@ -337,7 +344,7 @@ export default ({
</Action> */}
</ActionList>
</Grid>
<Grid xs={6} item>
<Grid xs={12} sm={6} item>
<ActionList>
<ActionTitle>About</ActionTitle>
<ActionText>
Expand Down Expand Up @@ -366,9 +373,9 @@ export default ({
height="178"
// src="https://www.youtube.com/embed/QW-s4XVK3Ok"
src={latestCommunityUpdate.embedYTLink}
frameborder="0"
frameBorder="0"
allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen="true"
allowFullScreen
></iframe>
</>
)}
Expand All @@ -383,7 +390,7 @@ export default ({
</ActionText> */}
</ActionList>
</Grid>
<Grid xs={12} item>
<Grid xs={12} sm={6} item>
<BottomSpacer />
</Grid>
</Grid>
Expand Down

0 comments on commit 0d2c881

Please sign in to comment.