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

Jump to bottom

add responsive for welcome screen #277

Merged
merged 1 commit into from
Aug 29, 2020
Merged

add responsive for welcome screen #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions src/components/StartingPage/index.js
View file
Open in desktop
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