Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine dapp styling and spacing #53

Merged
merged 5 commits into from
Jul 24, 2020

Conversation

chrismaree
Copy link
Member

@chrismaree chrismaree commented Jul 23, 2020

This PR refines the dapp styling, spacing and general wording to be more consistent and "clean". Pretty much every page in the dapp has some kind of change implemented. Please see the preview to see these changes effectively.

@vercel
Copy link

vercel bot commented Jul 23, 2020

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/uma/emp-tools/pkxmp3pew
✅ Preview: https://emp-tools-git-chrismaree-refine-styling-and-spacing.uma.vercel.app

@mrice32
Copy link
Member

mrice32 commented Jul 23, 2020

@nicholaspai can you take a look at this?

@chrismaree Looks great to me (although I don't really have an eye for this sorta stuff). One thing I noticed was that a lot of things went from top-bottom to being side-to-side. Just curious why you made that decision? I could see someone arguing that top-bottom is better for entering numbers because it feels more "mathy". But once again, I'm not super opinionated -- more curious.

<Typography variant="h4">
<i>EMP Tools</i>
</Typography>
<Typography variant="h4">⚒️⚡️EMP Tools</Typography>
Copy link
Member

Choose a reason for hiding this comment

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

+9999

Copy link
Member

Choose a reason for hiding this comment

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

@mrice32 @kendricktan @adrianmcli @daywiss Please suggest other emoji's here or forever hold your peace! (until the next PR).

Copy link
Member Author

Choose a reason for hiding this comment

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

so you guys can see it more easily it looks like this now:
image

@@ -42,6 +42,7 @@ const Manager = () => {
{method === "deposit" && <Deposit />}
{method === "withdraw" && <Withdraw />}
{method === "redeem" && <Redeem />}
{method === "transfer" && <FalseDoor />}
Copy link
Member

Choose a reason for hiding this comment

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

I think we should just remove this option. Here and in ManagePosition/MethodSelector

Copy link
Member Author

Choose a reason for hiding this comment

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

We do actually want it though, no? I've created an issue to track this: #63

Copy link
Member

Choose a reason for hiding this comment

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

Yes eventually but for now why not just remove it?

@@ -130,7 +128,7 @@ const Deposit = () => {
: startingCR;
const resultingCRBelowGCR = resultingCR && gcr ? resultingCR < gcr : null;
const fastWithdrawableCollateral =
collateral && tokens && gcr ? (collateral - gcr * tokens).toFixed(2) : null;
collateral && tokens && gcr ? (gcr * tokens - collateral).toFixed(2) : null;
Copy link
Member

Choose a reason for hiding this comment

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

Is this correct?

Copy link
Member Author

Choose a reason for hiding this comment

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

previously the fastWithdrawableCollateral was showing me a negative value. see screenshot
image

so I swapped it around.

Thinking about this again now this is because my position is below the GCR! that's why it's negative. there is 0 that I can fast withdrawal. I'll change this to say if < 0 then it should = 0 so there is no negative case.

Copy link
Member

Choose a reason for hiding this comment

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

Yes I agree. This should be changed to:

  const fastWithdrawableCollateral =
    collateral !== null && tokens !== null && gcr !== null
      ? (collateral < gcr * tokens ? 0 : (collateral - gcr * tokens).toFixed(2))
      : null;

features/weth/Weth.tsx Outdated Show resolved Hide resolved
@chrismaree chrismaree closed this Jul 24, 2020
Signed-off-by: Christopher Maree <[email protected]>
@chrismaree chrismaree reopened this Jul 24, 2020
@chrismaree
Copy link
Member Author

@nicholaspai can you take a look at this?

@chrismaree Looks great to me (although I don't really have an eye for this sorta stuff). One thing I noticed was that a lot of things went from top-bottom to being side-to-side. Just curious why you made that decision? I could see someone arguing that top-bottom is better for entering numbers because it feels more "mathy". But once again, I'm not super opinionated -- more curious.

Mainly because it felt like a more consistent and clean use of space. I tried to make all inputs looks the same throughout the app and to my eye it looks a fair amount better.

@chrismaree
Copy link
Member Author

@nicholaspai I've implemented your nits and added some additional cleanups. Some things I have chosen to leave for later PRs.

Copy link
Member

@nicholaspai nicholaspai left a comment

Choose a reason for hiding this comment

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

Looks great! I resolved all comments you addressed. Please just address any nit/spelling ones I have remaining.

Signed-off-by: Christopher Maree <[email protected]>
@nicholaspai
Copy link
Member

@nicholaspai can you take a look at this?
@chrismaree Looks great to me (although I don't really have an eye for this sorta stuff). One thing I noticed was that a lot of things went from top-bottom to being side-to-side. Just curious why you made that decision? I could see someone arguing that top-bottom is better for entering numbers because it feels more "mathy". But once again, I'm not super opinionated -- more curious.

Mainly because it felt like a more consistent and clean use of space. I tried to make all inputs looks the same throughout the app and to my eye it looks a fair amount better.

I personally like the horizontal layout but have no reason why besides aesthetics

@chrismaree chrismaree merged commit a99a4a9 into develop Jul 24, 2020
@chrismaree chrismaree deleted the chrismaree/refine-styling-and-spacing branch July 24, 2020 12:51
chrismaree added a commit that referenced this pull request Jul 25, 2020
* Add dynamic links to exchanges to buy collateral or synthetic tokens (#50)

Signed-off-by: Nick Pai <[email protected]>

* Distinguish between Staging and Prod sites (#59)

* Refine dapp styling and spacing (#53)

* Updated styling

* nits

Signed-off-by: Christopher Maree <[email protected]>

* Updated favicon

* Fixed nits

Signed-off-by: Christopher Maree <[email protected]>

* Fix EMP Management features (#55)

Signed-off-by: Nick Pai <[email protected]>

Co-authored-by: Chris Maree <[email protected]>
@nicholaspai nicholaspai mentioned this pull request Jul 26, 2020
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