From e95bb92c1d5051b0382bc80b9579a4d43b1ed2ae Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 15:25:58 +0900 Subject: [PATCH 01/10] update checkbox color --- src/assets/checkbox-active.svg | 6 ++++-- src/assets/checkbox-default.svg | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/assets/checkbox-active.svg b/src/assets/checkbox-active.svg index ed3d508..ffb8fe6 100644 --- a/src/assets/checkbox-active.svg +++ b/src/assets/checkbox-active.svg @@ -1,4 +1,6 @@ - - + + diff --git a/src/assets/checkbox-default.svg b/src/assets/checkbox-default.svg index c25dece..61c9fb4 100644 --- a/src/assets/checkbox-default.svg +++ b/src/assets/checkbox-default.svg @@ -1,4 +1,4 @@ - - + + From db235e11a9581843b1b0d5c92117fee28ca8744f Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 15:51:30 +0900 Subject: [PATCH 02/10] update input color --- src/components/ZInput.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ZInput.vue b/src/components/ZInput.vue index 9593d26..cdff47b 100644 --- a/src/components/ZInput.vue +++ b/src/components/ZInput.vue @@ -47,7 +47,7 @@ const style = cva( variants: { filled: { true: '', - false: 'border-dark-green', + false: 'border-transBlack-15', }, disabled: { true: 'bg-[#D4FFE6] border-dark-green text-dark-gray', From a663e28bdc64ec64c7f8de134357252166995aab Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 16:13:03 +0900 Subject: [PATCH 03/10] update button color --- src/components/button/ZButton.vue | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/button/ZButton.vue b/src/components/button/ZButton.vue index 0d67e22..df6657a 100644 --- a/src/components/button/ZButton.vue +++ b/src/components/button/ZButton.vue @@ -1,19 +1,19 @@ From c62b91e6643aa20056f82223c8928cc83ef01fae Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 16:13:49 +0900 Subject: [PATCH 04/10] hide number input arrow --- src/components/ZInput.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/components/ZInput.vue b/src/components/ZInput.vue index cdff47b..2921959 100644 --- a/src/components/ZInput.vue +++ b/src/components/ZInput.vue @@ -57,3 +57,15 @@ const style = cva( }, ) + From 5e883cff28558b652623453fb9b20b2285dc9d19 Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 16:21:30 +0900 Subject: [PATCH 05/10] update event ui 2.0 --- src/assets/event-zzio.svg | 13 ++ src/pages/play/PlayPage.vue | 2 +- src/pages/play/_components/GameOver.vue | 203 ------------------ src/pages/play/game-over/GameOver.vue | 100 +++++++++ .../game-over/_components/EventDropDown.vue | 119 ++++++++++ .../play/game-over/_components/RankBanner.vue | 10 + tailwind.config.js | 24 ++- 7 files changed, 256 insertions(+), 215 deletions(-) create mode 100644 src/assets/event-zzio.svg delete mode 100644 src/pages/play/_components/GameOver.vue create mode 100644 src/pages/play/game-over/GameOver.vue create mode 100644 src/pages/play/game-over/_components/EventDropDown.vue create mode 100644 src/pages/play/game-over/_components/RankBanner.vue diff --git a/src/assets/event-zzio.svg b/src/assets/event-zzio.svg new file mode 100644 index 0000000..4e0837d --- /dev/null +++ b/src/assets/event-zzio.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/pages/play/PlayPage.vue b/src/pages/play/PlayPage.vue index 4110891..ee33752 100644 --- a/src/pages/play/PlayPage.vue +++ b/src/pages/play/PlayPage.vue @@ -29,7 +29,7 @@ diff --git a/src/pages/play/game-over/GameOver.vue b/src/pages/play/game-over/GameOver.vue new file mode 100644 index 0000000..7976b45 --- /dev/null +++ b/src/pages/play/game-over/GameOver.vue @@ -0,0 +1,100 @@ + + diff --git a/src/pages/play/game-over/_components/EventDropDown.vue b/src/pages/play/game-over/_components/EventDropDown.vue new file mode 100644 index 0000000..86cc46a --- /dev/null +++ b/src/pages/play/game-over/_components/EventDropDown.vue @@ -0,0 +1,119 @@ + + diff --git a/src/pages/play/game-over/_components/RankBanner.vue b/src/pages/play/game-over/_components/RankBanner.vue new file mode 100644 index 0000000..01bdabf --- /dev/null +++ b/src/pages/play/game-over/_components/RankBanner.vue @@ -0,0 +1,10 @@ + + diff --git a/tailwind.config.js b/tailwind.config.js index a982123..8e457de 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,50 +10,50 @@ export default { 'title': [ '2.25rem', { lineHeight: '2.25rem', - fontWeight: '900' - } + fontWeight: '900', + }, ], 'subtitle': [ '1.125rem', { lineHeight: '', - fontWeight: '700' - } + fontWeight: '700', + }, ], 'body-r': [ '1rem', // 16px { lineHeight: '24px', - fontWeight: '400' + fontWeight: '400', }], 'body-b': [ '1rem', // 16px { lineHeight: '24px', - fontWeight: '700' + fontWeight: '700', }], 'caption-r': [ '0.75rem', // 12px { lineHeight: '', - fontWeight: '400' + fontWeight: '400', }], 'caption-b': [ '0.75rem', // 12px { lineHeight: '', - fontWeight: '700' + fontWeight: '700', }], 'banner-r': [ '0.875rem', // 12px { lineHeight: '', - fontWeight: '500' + fontWeight: '500', }], 'banner-b': [ '0.875rem', // 12px { lineHeight: '', - fontWeight: '900' + fontWeight: '900', }], }, colors: { @@ -65,12 +65,14 @@ export default { gray: '#CDCDCD', 'dark-gray': '#7E7E7E', transBlack: { + '10': 'rgba(0, 0, 0, 0.1)', '15': 'rgba(0, 0, 0, 0.15)', '50': 'rgba(0, 0, 0, 0.5)', + '90': 'rgba(0, 0, 0, 0.9)', }, 'gradient-yellow': '#FFEC45', 'gradient-pink': '#FF8181', - } + }, }, }, plugins: [], From d5cb884bdf1604ac9f3db070b9fb15ae367bc123 Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 16:22:16 +0900 Subject: [PATCH 06/10] add event open check --- src/pages/play/game-over/GameOver.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/play/game-over/GameOver.vue b/src/pages/play/game-over/GameOver.vue index 7976b45..5b61a66 100644 --- a/src/pages/play/game-over/GameOver.vue +++ b/src/pages/play/game-over/GameOver.vue @@ -26,6 +26,7 @@ From c3a73987b15fc925578ae24000061878915b4506 Mon Sep 17 00:00:00 2001 From: da-in Date: Sat, 13 Apr 2024 17:06:12 +0900 Subject: [PATCH 07/10] fix game-over scroll --- src/pages/play/game-over/GameOver.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/play/game-over/GameOver.vue b/src/pages/play/game-over/GameOver.vue index 5b61a66..4ebaa12 100644 --- a/src/pages/play/game-over/GameOver.vue +++ b/src/pages/play/game-over/GameOver.vue @@ -1,9 +1,9 @@ diff --git a/src/pages/play/game-over/_components/RankBanner.vue b/src/pages/play/game-over/_components/RankBanner.vue index 01bdabf..97176c7 100644 --- a/src/pages/play/game-over/_components/RankBanner.vue +++ b/src/pages/play/game-over/_components/RankBanner.vue @@ -1,6 +1,6 @@