DONE

calblueprint · Apr 21, 2024 · 1a4f70b · 1a4f70b
1 parent 3f78b40
commit 1a4f70b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx
@@ -35,9 +35,9 @@ import {
   InformationField,
   Label,
   Input,
-  Heading4Bold,
   ForceColumnDiv,
 } from './styles';
+import { Heading1Bold } from '../../styles/fonts';
 
 export default function App() {
   const [numberOfItems, setNumberOfItems] = useState(0);
@@ -70,9 +70,9 @@ export default function App() {
               <BackButton destination="/storefront" />
             </BackButtonDiv>
 
-            <Heading4Bold style={{ marginLeft: '41px', marginTop: '20px' }}>
-              Delivery
-            </Heading4Bold>
+            <Heading1Bold style={{ marginLeft: '41px', marginTop: '20px' }}>
+              Shipping
+            </Heading1Bold>
 
             <InformationContainer>
               <Label>Name</Label>

diff --git a/src/app/delivery/styles.ts b/src/app/delivery/styles.ts
@@ -156,7 +156,7 @@ export const InformationField = styled.div`
 `;
 
 export const Label = styled.div`
-  color: var(--Black, #101010);
+  color: ${COLORS.black};
   font-family: 'Public Sans';
   font-size: 25px;
   font-style: normal;
@@ -171,7 +171,7 @@ export const Input = styled.div`
   border-radius: 4px;
   padding-left: 20px;
   font-size: 20px;
-  color: var(--Black, #101010);
+  color: ${COLORS.black};
 
   /* Body 1 - Text */
   font-family: 'Public Sans';
@@ -181,14 +181,6 @@ export const Input = styled.div`
   line-height: normal;
 `;
 
-export const Heading4Bold = styled.p`
-  font-family: 'Public Sans', sans-serif;
-  font-size: 25px;
-  font-style: normal;
-  font-weight: 700;
-  line-height: normal;
-`;
-
 export const ForceColumnDiv = styled.div`
   display: flex;
   flex-flow: column;

diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx
@@ -130,7 +130,7 @@ export default function PickUp() {
               <Heading4Bold>Time Slot</Heading4Bold>
             </div>
 
-            <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <div style={{ display: 'flex', justifyContent: 'space-between',width: "660px" }}>
               {Time.map(time => (
                 <PickupTimeButton
                   key={time.id}

diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts
@@ -8,7 +8,7 @@ import Footer from '../../components/FooterFolder/Footer';
 
 export const PickupContainer = styled.div`
   width: 730px;
-  height: 400px;
+  height: 350px;
   // padding-left: 22px;
 `;