Charlotte/new pick up #92
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
| @@ -22,36 +23,24 @@ export const OutterFavoriteDiv = styled.div` | |||
| border-radius: 10px; | |||
| background: var(--White, #fff); | |||
| box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); | |||
| width: 800px; | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
is this a merge conflict?
| width: 250px; | ||
| height: 100%; | ||
| padding: 20px; | ||
| export const ImageDiv = styled.p` |
There was a problem hiding this comment.
why is this a p tag
| @@ -254,31 +242,41 @@ export const WhiteBackgroundDiv = styled.div` | |||
| box-shadow: 0px 4px 7px 0px rgba(0, 0, 0, 0.1); | |||
| `; | |||
|
|
|||
| export const Wrapper2 = styled.div` | |||
| display: flex; | |||
| flex-direction: col; | |||
| export const BottomColumnDiv = styled.div` | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: space-evenly; | ||
| justify-content: space-around; | ||
| width: 100%; | ||
| <<<<<<< HEAD |
| height: auto; | ||
| max-height: 100%; | ||
| padding: 36px 34px; | ||
| gap: 33px; | ||
| max-height: 100%; | ||
| margin-top: 205px; | ||
| <<<<<<< HEAD | ||
| margin-top: 75px; |
src/app/orderPage/page.tsx
Outdated
| fontSize: '16px', | ||
| }} | ||
| > | ||
| {product.quantity} |
There was a problem hiding this comment.
is there styling on this text?
src/app/orderPage/page.tsx
Outdated
| marginRight: '4px', | ||
| }} | ||
| > | ||
| Quantity: |
src/app/profileScreen/styles.ts
Outdated
| @@ -112,8 +130,16 @@ export const HeartIcon = styled(Heart)` | |||
| `; | |||
|
|
|||
| export const BackButtonDiv = styled.div` | |||
| <<<<<<< HEAD | |||
Monique/order details deliv
Monique/week 7 sprint
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's new in this PR
Description
temp PR (not fully finished)
Screenshots
How to review
Next steps
Relevant Links
Online sources
Related PRs