From c1f27b6e6e28e97697f5db57c76dc60e57695800 Mon Sep 17 00:00:00 2001 From: aaminha Date: Wed, 12 Jun 2024 14:23:25 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[#110]=20design:=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EB=81=9D=EA=B9=8C=EC=A7=80=20=EC=B1=84=EC=9B=8C?= =?UTF-8?q?=EC=A7=80=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SelectServicePage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/SelectServicePage.tsx b/src/pages/SelectServicePage.tsx index 7488f2c..fcd0e9a 100644 --- a/src/pages/SelectServicePage.tsx +++ b/src/pages/SelectServicePage.tsx @@ -89,7 +89,7 @@ const Container = styled.div` gap: 84px; - height: calc(100vh - 64px); + height: 100vh; background: ${({ theme }) => theme.colors.grayScale08}; `; @@ -102,7 +102,6 @@ const GradationContainer = styled.div` position: absolute; bottom: -35px; right: -62px; - z-index: -1; `; const CardContainer = styled.div` From 638cf6abafaa955a4cd730af5a223b5a2cce4a07 Mon Sep 17 00:00:00 2001 From: aaminha Date: Wed, 12 Jun 2024 14:24:26 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[#110]=20design:=20transition=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Card/GenerateMethodCard.tsx | 2 -- src/components/Navigation/MenuBar.tsx | 2 -- src/components/Navigation/TopNavigation.tsx | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/components/Card/GenerateMethodCard.tsx b/src/components/Card/GenerateMethodCard.tsx index 30d4bc5..de5384e 100644 --- a/src/components/Card/GenerateMethodCard.tsx +++ b/src/components/Card/GenerateMethodCard.tsx @@ -60,8 +60,6 @@ const StyledCard = styled.button` background: ${({ theme }) => theme.colors.grayScale09}; box-shadow: 0px 0px 8px 0px rgba(189, 189, 189, 0.2); - transition: all 0.5s; - &:hover { box-shadow: 0px 0px 8px 0px rgba(54, 189, 180, 0.24); diff --git a/src/components/Navigation/MenuBar.tsx b/src/components/Navigation/MenuBar.tsx index bff3a51..c676bc1 100644 --- a/src/components/Navigation/MenuBar.tsx +++ b/src/components/Navigation/MenuBar.tsx @@ -106,8 +106,6 @@ const StyledMenuButton = styled.button<{ $isActive: boolean }>` color: ${({ $isActive, theme }) => $isActive ? theme.colors.grayScale02 : theme.colors.grayScale03}; - transition: all 0.5s; - &:hover { color: ${({ theme }) => theme.colors.grayScale02}; ${StyledActiveIcon} { diff --git a/src/components/Navigation/TopNavigation.tsx b/src/components/Navigation/TopNavigation.tsx index 85e9780..1880450 100644 --- a/src/components/Navigation/TopNavigation.tsx +++ b/src/components/Navigation/TopNavigation.tsx @@ -80,8 +80,6 @@ const LogoutButton = styled.button` ${({ theme }) => theme.typography.subtitle}; color: ${({ theme }) => theme.colors.grayScale04}; - transition: all 0.5s; - &:hover { color: ${({ theme }) => theme.colors.grayScale02}; } From d9e70db083de68bbefc9fdf2f07c1c4964757b09 Mon Sep 17 00:00:00 2001 From: aaminha Date: Wed, 12 Jun 2024 14:35:03 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[#110]=20design:=20=EA=B8=80=EC=9E=90=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/LoginPage/BrandMotion.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/containers/LoginPage/BrandMotion.tsx b/src/containers/LoginPage/BrandMotion.tsx index d0d3099..5562df9 100644 --- a/src/containers/LoginPage/BrandMotion.tsx +++ b/src/containers/LoginPage/BrandMotion.tsx @@ -1,5 +1,4 @@ import { ReactComponent as Logo } from '@/assets/logo/qtudy.svg'; -import Typography from '@/components/Typography/Typography'; import styled, { keyframes } from 'styled-components'; function BrandMotion() { @@ -13,10 +12,10 @@ function BrandMotion() { function Brand() { return ( - +
AI가 생성한 퀴즈와 요약으로 효율적인 학습을 돕는 - - +
+ ); } @@ -37,6 +36,12 @@ const Wrapper = styled.div` display: flex; flex-direction: column; align-items: center; + + .description { + ${({ theme }) => theme.typography.h4}; + font-size: 18px; + color: ${({ theme }) => theme.colors.mainMintDark}; + } `; const AnimatedLogo = styled(Brand)` From 61aa2c3f0786ec57a0df804f1be01394b42a8eed Mon Sep 17 00:00:00 2001 From: aaminha Date: Wed, 12 Jun 2024 14:59:59 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[#110]=20design:=20=EA=B2=BD=EA=B3=A0=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EA=B0=80=20=EB=B3=B4=EC=9D=BC=20?= =?UTF-8?q?=EB=95=8C=20=EB=9D=BC=EB=94=94=EC=98=A4=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=EA=B0=80=20=EC=9B=80=EC=A7=81=EC=9D=B4?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/QuizGenerationForm.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/Form/QuizGenerationForm.tsx b/src/components/Form/QuizGenerationForm.tsx index e20fd2e..1d7ec8e 100644 --- a/src/components/Form/QuizGenerationForm.tsx +++ b/src/components/Form/QuizGenerationForm.tsx @@ -7,7 +7,7 @@ import useToast from '@/hooks/useToast'; import colors from '@/styles/color'; import { QuizType } from '@/types/quiz.type'; import { useEffect, useState } from 'react'; -import styled from 'styled-components'; +import styled, { css } from 'styled-components'; import DeleteIcon from '../Icon/DeleteIcon'; interface QuizFormProps { @@ -118,7 +118,10 @@ function QuizGenerationForm({ {quizContent.problemChoices.map((choice, index) => ( - + ` display: flex; gap: 12px; align-items: center; + + ${({ $warning }) => + $warning && + css` + & > input { + margin-bottom: 23px; + } + `} `;