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

palette.gray調整 #154

Merged
merged 2 commits into from
Aug 6, 2020
Merged

palette.gray調整 #154

merged 2 commits into from
Aug 6, 2020

Conversation

youchann
Copy link
Contributor

@youchann youchann commented Aug 6, 2020

@youchann youchann self-assigned this Aug 6, 2020
Comment on lines 78 to +81
gray: {
deepDark: colors.basic[700],
dark: colors.basic[600],
main: colors.basic[500],
deepDark: colors.basic[600],
dark: colors.basic[500],
main: colors.basic[300],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • 今のdeepDark消す
  • その分色を繰り上げて、mainにbasic[300]を差し込む

Comment on lines 23 to +24
background-color: ${({ active, theme }) =>
active ? colors.basic[100] : theme.palette.primary.highlight};
active ? theme.palette.gray.highlight : theme.palette.primary.highlight};
Copy link
Contributor Author

Choose a reason for hiding this comment

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

おそらく背景色にはpalette.backgroundで指定したかったので直打ちをしていたのだと思う。
けれど、他の実装を見るとpalette.primary....を背景色に指定しているので、そちらの方に合わせた。

@youchann
Copy link
Contributor Author

youchann commented Aug 6, 2020

コンポーネント自体に変化はないので、testファイルが変わっていない。

@youchann
Copy link
Contributor Author

youchann commented Aug 6, 2020

今回の変更でbasic[400]以外はpalette経由で定義されるようになった。

Copy link
Contributor

@maktak1995 maktak1995 left a comment

Choose a reason for hiding this comment

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

LGTMです!

@youchann youchann merged commit 2d33222 into master Aug 6, 2020
@youchann youchann deleted the modify-palette-gray branch August 6, 2020 02:49
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