Skip to content

Landing page #29

Open
fuelupeducation wants to merge 2 commits intomasterfrom
feature/landing-layout
Open

Landing page #29
fuelupeducation wants to merge 2 commits intomasterfrom
feature/landing-layout

Conversation

@fuelupeducation
Copy link
Contributor

No description provided.

@fuelupeducation
Copy link
Contributor Author

Conflict you can check kindly solve it

@@ -0,0 +1,21 @@
.AppStore {
& p {
color: #978fb6;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we have colors declarations globally, this will help us to use the strict color palette

@@ -0,0 +1,29 @@
.Button {
border-radius: 2rem;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see 2rem is getting used often can we create a global variable for it?

@ArchitW
Copy link

ArchitW commented Apr 9, 2021

Please resolve conflicts

@KhanhVanCong
Copy link
Contributor

I have pushed the code to refactor. @ArchitW Could you help me to review them?

@ArchitW
Copy link

ArchitW commented Apr 10, 2021

can you please help me to resolve conflicts?

@KhanhVanCong
Copy link
Contributor

Hi @ArchitW, During resolve the conflict, I found we have two main Page in the src/pages/Landing/Landing.jsx and we have no other route for the Landing page, so what should I do now?

@ArchitW
Copy link

ArchitW commented Apr 12, 2021

Hi @ArchitW, During resolve the conflict, I found we have two main Page in the src/pages/Landing/Landing.jsx and we have no other route for the Landing page, so what should I do now?

we should have only one main page

@KhanhVanCong
Copy link
Contributor

KhanhVanCong commented Apr 12, 2021

Hi @ArchitW, During resolve the conflict, I found we have two main Page in the src/pages/Landing/Landing.jsx and we have no other route for the Landing page, so what should I do now?

we should have only one main page

Which page will be used? page in master or my branch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants