From 2f38e0518abc7278d7f69ac883473bc8410f7c1b Mon Sep 17 00:00:00 2001 From: "jiwon93.son" Date: Thu, 25 Jan 2024 15:47:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC=ED=99=94=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.twin.app.shoptime/src/App/App.module.less | 1 - .../src/components/TButton/TButton.module.less | 2 +- .../src/components/TPopUp/TPopUp.module.less | 4 ++-- com.twin.app.shoptime/src/style/CommonStyle.module.less | 1 + com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx | 5 +++-- .../src/views/IntroPanel/IntroPanel.module.less | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/com.twin.app.shoptime/src/App/App.module.less b/com.twin.app.shoptime/src/App/App.module.less index 5c06eac1..056e6c0d 100644 --- a/com.twin.app.shoptime/src/App/App.module.less +++ b/com.twin.app.shoptime/src/App/App.module.less @@ -1,7 +1,6 @@ /* Reset */ * { box-sizing: border-box; - color: #1a1a1a; } body, div, diff --git a/com.twin.app.shoptime/src/components/TButton/TButton.module.less b/com.twin.app.shoptime/src/components/TButton/TButton.module.less index 7d1a5519..4e4537cf 100644 --- a/com.twin.app.shoptime/src/components/TButton/TButton.module.less +++ b/com.twin.app.shoptime/src/components/TButton/TButton.module.less @@ -65,7 +65,7 @@ width: 37px; height: 37px; } - s &:hover, + &:hover, &:active, &:focus-within, &:focus { diff --git a/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less b/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less index 95f01769..adef6e47 100644 --- a/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less +++ b/com.twin.app.shoptime/src/components/TPopUp/TPopUp.module.less @@ -47,7 +47,7 @@ font-size: 36px; font-family: @baseFontBold; color: @COLOR_BLACK; - background-color: skyblue; + background-color: @COLOR_SKYBLUE; padding: 30px 60px; } @@ -66,7 +66,7 @@ .info { width: 1066px; - background-color: #e6ebf0; + background-color: @COLOR_SKYBLUE; padding: 60px; .textLayer { diff --git a/com.twin.app.shoptime/src/style/CommonStyle.module.less b/com.twin.app.shoptime/src/style/CommonStyle.module.less index 6a3da3ab..5af479d4 100644 --- a/com.twin.app.shoptime/src/style/CommonStyle.module.less +++ b/com.twin.app.shoptime/src/style/CommonStyle.module.less @@ -37,6 +37,7 @@ @COLOR_BLACK: #000000; @COLOR_NAVY: #2c343f; +@COLOR_SKYBLUE: #e7ebef; /* BUTTON */ @BTN_MAIN_GREY: #7a808d; diff --git a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx index fdbc88b8..bf2dbc64 100644 --- a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx +++ b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx @@ -73,9 +73,10 @@ export default function IntroPanel({ children, ...rest }) {
- {`Welcome to `} + {$L(`Welcome to `)} - Shop Time ! + Sh{$L("o")} + {$L(`p Time !`)}
{description}
diff --git a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less index 87e30279..eb9e7c2a 100644 --- a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less +++ b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.module.less @@ -3,7 +3,7 @@ .introLayout { .flex(@direction: column); - background-color: #f2f6fb; + background-color: @BG_COLOR_03; font-family: @baseFont; text-align: center; width: 100%;