Merge pull request #4 from zoe-lindqvist/Typography

Typography
zoe-lindqvist · Nov 5, 2024 · fac2642 · fac2642
2 parents c5a57cb + 91e5cd7
commit fac2642
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 3 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,9 +1,11 @@
-import GlobalStyles from './GlobalStyles'
+import GlobalStyles from "./styles/GlobalStyles";
+import { Typography } from "./ui/Typography";
 
 export const App = () => {
   return (
     <>
       <GlobalStyles />
+      <Typography />
     </>
-  )
-}
+  );
+};
diff --git a/src/components/About.jsx b/src/components/About.jsx
diff --git a/src/components/Apply.jsx b/src/components/Apply.jsx
diff --git a/src/components/Contact.jsx b/src/components/Contact.jsx
diff --git a/src/components/Dogs.jsx b/src/components/Dogs.jsx
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
diff --git a/src/components/Header.jsx b/src/components/Header.jsx
diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
diff --git a/src/components/ImageCarousel.jsx b/src/components/ImageCarousel.jsx
diff --git a/src/GlobalStyles.js → src/styles/GlobalStyles.js b/src/GlobalStyles.js → src/styles/GlobalStyles.js
diff --git a/src/ui/Button.jsx b/src/ui/Button.jsx
diff --git a/src/ui/Grid.jsx b/src/ui/Grid.jsx
diff --git a/src/ui/Typography.jsx b/src/ui/Typography.jsx
@@ -0,0 +1,31 @@
+import styled from "styled-components";
+
+export const StyledH1 = styled.h1`
+  color: #331709;
+  text-align: center;
+  font-family: Italiana;
+  font-size: 2.25rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 150%; /* 3.375rem */
+  letter-spacing: -0.02475rem;
+`;
+
+export const StyledH2 = styled.h2`
+  color: var(--Labels-Primary, #000);
+  text-align: center;
+  font-family: Poppins;
+  font-size: 1.5rem;
+  font-style: normal;
+  font-weight: 400;
+`;
+
+export const StyledBody = styled.p`
+  color: var(--Labels-Primary, #000);
+  text-align: center;
+  font-family: Poppins;
+  font-size: 1rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+`;