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

[FE] 街の領域に色を付けるように #608

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

popunbom
Copy link
Contributor

@popunbom popunbom commented Dec 4, 2024

relates: #241

こちらに対応しました

チェアタウン/コシカケシティに色をつける

city_01 city_02

@popunbom
Copy link
Contributor Author

popunbom commented Dec 4, 2024

@narirou @imamiya-masaki レビューお願いいたします。

@popunbom popunbom force-pushed the frontend/decolate-city-color branch from b196bc2 to dcb7533 Compare December 4, 2024 09:39
@popunbom popunbom force-pushed the frontend/decolate-city-color branch from dcb7533 to 4b09ca2 Compare December 4, 2024 09:42
@popunbom popunbom mentioned this pull request Dec 4, 2024
23 tasks
@narirou
Copy link
Contributor

narirou commented Dec 4, 2024

@popunbom
色なんですが、以下でお願いします

  • チェアタウン: #FF3600
  • コシカケシティ: #0089A2

@@ -3,4 +3,5 @@ import type { Config } from "tailwindcss";
export default {
content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
plugins: [],
safelist: [{ pattern: /bg-.+-600/ }, { pattern: /border-.+-500/ }],
Copy link
Contributor

Choose a reason for hiding this comment

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

色指定があるので、styleプロパティでやってtailwindでの対応は実施しないようにお願いします

@@ -282,7 +282,7 @@ const TownLayer = memo(function TownLayer() {
>
<div
role="presentation"
className="absolute rounded-full bg-neutral-100 bg-opacity-40 border-2 border-neutral-200"
className={`absolute rounded-full bg-neutral-300 bg-opacity-40 border-4 border-${color}-500`}
Copy link
Contributor

Choose a reason for hiding this comment

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

ここも可能であればbgは100でお願いしたいです
初期の見た目がグレーになってしまうためmm

@popunbom
Copy link
Contributor Author

popunbom commented Dec 4, 2024

@narirou レビューありがとうございます。
色指定と背景色について修正しました (8f85f3c)。

@@ -11,6 +11,7 @@ type TextProps = PropsWithChildren<{
size?: Size;
variant?: Variant;
className?: string;
style?: React.CSSProperties;
Copy link
Contributor

Choose a reason for hiding this comment

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

こちら不要そうです

@narirou
Copy link
Contributor

narirou commented Dec 4, 2024

一旦マージして私の方で揃えてみます!

@narirou narirou merged commit 2f5261e into main Dec 4, 2024
2 checks passed
@narirou narirou deleted the frontend/decolate-city-color branch December 4, 2024 10:59
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.

2 participants