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

Progress diamonds #16418

Merged
merged 5 commits into from
Jul 14, 2017
Merged

Progress diamonds #16418

merged 5 commits into from
Jul 14, 2017

Conversation

Bjvanminnen
Copy link
Contributor

@Bjvanminnen Bjvanminnen commented Jul 14, 2017

https://docs.google.com/document/d/11eQJ30FW48pFe7Eq7OGOr9fiQ5jj3EpJX79mrkcm5v4/edit?pli=1#heading=h.qsf3wy9ba0ro

This PR makes it so that "concept" levels will get diamonds instead of of circles. This is true on the overview page:
image

It is also true in the header, for both the current level and other levels in the stage (which will have small diamonds).
image

The next step will be changing the colors on these.

Copy link
Contributor

@islemaster islemaster left a comment

Choose a reason for hiding this comment

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

Neato.

style={{
display: 'inline-block',
width: (smallBubble ? SMALL_DOT_SIZE : DOT_SIZE) +
2 * styles.main.borderWidth + 2 * 2,
Copy link
Contributor

Choose a reason for hiding this comment

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

At the very least, should the last 2 * 2 here be simplified to 4?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was trying to make this less magical (it's essentially meant to be 2px of margin on each side). Without a comment though, it might not be any less magical. Will address in a future PR

@Bjvanminnen Bjvanminnen merged commit 3fee01f into staging Jul 14, 2017
@Bjvanminnen Bjvanminnen deleted the progressDiamonds branch July 14, 2017 21:55
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.

None yet

2 participants