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.

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(style): fix style issue in index page & about page #163

Merged
merged 3 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions src/pages/about.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import aboutContent from '../../README.md';
import styled from 'styled-components';

const PageWrapper = styled.div`
background-color: ${(props) =>
(props.theme.light as boolean) ? '#ffffff' : '#707070'};
`;

const Content = styled.div`
text-align: justify;
margin-left: 25%;
margin-right: 25%;
margin-top: 4%;
margin-bottom: 8%;
margin-left: 20%;
margin-right: 20%;
margin-bottom: 5%;
font-family: 'Roboto', sans-serif;
color: ${(props) => ((props.theme.light as boolean) ? '#333333' : '#c9c9c9')};
a:link {
Expand All @@ -26,9 +30,11 @@ const Content = styled.div`
export default function AboutPage(): React.ReactElement {
return (
<>
<Content>
<div dangerouslySetInnerHTML={{ __html: aboutContent as string }} />
</Content>
<PageWrapper>
<Content>
<div dangerouslySetInnerHTML={{ __html: aboutContent as string }} />
</Content>
</PageWrapper>
</>
);
// return aboutContent as React.ReactElement
Expand Down
2 changes: 1 addition & 1 deletion src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { type ModelSave } from '../services/model/modelService';
const SimulatorContainer = styled.div`
position: relative;
left: 21rem;
top: 6rem;
top: 1rem;
width: calc(100vw - 22rem);
height: calc(100vh - 7rem);
z-index: 0;
Expand Down
Loading