diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/src/App.tsx b/src/App.tsx index f32cdc0..2411a3c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,24 +1,40 @@ import React from "react"; import ProgressIndicator from "./stories/ProgressIndicator"; + import Header1 from "./stories/Header1"; import Header2 from "./stories/Header2"; + import Button from "./stories/Button"; +import Label from "./stories/Label"; + import CenteredContainer from "./stories/CenteredContainer"; import SpaceBetweenContainer from "./stories/SpaceBetweenContainer"; import Spacer from "./stories/Spacer"; +import TextAlignWrapper from "./stories/TextAlignWrapper"; function App() { return ( - + - Securely Share Your Secrets + {/* Securely Share Your Secrets */} Tell someone - + + + + + + + + + + + + diff --git a/src/shared/global.js b/src/shared/global.js index 00c6a2c..c03d50e 100644 --- a/src/shared/global.js +++ b/src/shared/global.js @@ -29,6 +29,7 @@ export const GlobalStyle = createGlobalStyle` body { margin: 0; + color: white; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); diff --git a/src/stories/Label.tsx b/src/stories/Label.tsx new file mode 100644 index 0000000..f229917 --- /dev/null +++ b/src/stories/Label.tsx @@ -0,0 +1,29 @@ +import React, { FC, ReactNode } from "react"; +import styled from "styled-components"; +import CSS from "csstype"; + +import { typography } from "../shared/styles"; + +export interface LabelProps { + children: ReactNode | null; + style?: CSS.Properties; + htmlFor: string; +} + +const Label: FC = ({ children, style, htmlFor }) => { + return ( + + {children} + + ); +}; + +export default Label; + +const StyledLabel = styled.label` + font-size: 1.4rem; + font-family: ${typography.regular}; + font-weight: ${typography.weight.heavy}; + + margin-bottom: 0.7rem; +`; diff --git a/src/stories/SpaceBetweenContainer.tsx b/src/stories/SpaceBetweenContainer.tsx index 1a08ef3..9a8a5e9 100644 --- a/src/stories/SpaceBetweenContainer.tsx +++ b/src/stories/SpaceBetweenContainer.tsx @@ -11,7 +11,7 @@ interface SpaceBetweenContainerProps { const SpaceBetweenContainer: FC = ({ children, style, - width100pct, + width100pct = true, }) => { return ( diff --git a/src/stories/Spacer.tsx b/src/stories/Spacer.tsx index c56deaa..af7df0b 100644 --- a/src/stories/Spacer.tsx +++ b/src/stories/Spacer.tsx @@ -1,4 +1,4 @@ -import React, { FC, ReactNode } from "react"; +import React, { FC } from "react"; import styled from "styled-components"; import CSS from "csstype"; diff --git a/src/stories/TextAlignWrapper.tsx b/src/stories/TextAlignWrapper.tsx new file mode 100644 index 0000000..f61a713 --- /dev/null +++ b/src/stories/TextAlignWrapper.tsx @@ -0,0 +1,36 @@ +import React, { FC, ReactNode } from "react"; +import styled, { css } from "styled-components"; +import CSS from "csstype"; + +interface TextAlignWrapperProps { + children: ReactNode | null; + style?: CSS.Properties; + align: "left" | "center" | "right"; + marginBottom?: boolean; +} + +const TextAlignWrapper: FC = ({ + children, + style, + align = "left", + marginBottom = true, +}) => { + return ( + + {children} + + ); +}; + +export default TextAlignWrapper; + +const StyledDiv = styled.div` + text-align: ${(props) => props.align}; + width: 100%; + + ${(props) => + props.marginBottom && + css` + margin-bottom: 0.7rem; + `} +`;