From 555653a370a20d3294ef258411437eaf9e3fb14c Mon Sep 17 00:00:00 2001 From: simeunseo Date: Tue, 10 Oct 2023 04:39:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?style:=20theme=EC=97=90=20dim=20gradient=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index ec9876a0..70ae18ec 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -32,6 +32,8 @@ const colors = { level3: 'rgba(50, 83, 255, 0.5)', level2: 'rgba(50, 83, 255, 0.3)', level1: 'rgba(50, 83, 255, 0.1)', + + dim_gradient: 'linear-gradient(1deg, #141414 56.25%, rgba(20, 20, 20, 0) 95.89%)', }; export type ColorsTypes = typeof colors; From 84e63f3ff10e6898be2d805c53ca78009bf916fc Mon Sep 17 00:00:00 2001 From: simeunseo Date: Tue, 10 Oct 2023 04:39:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?design:=20cta=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=95=98=EB=8B=A8=20=EC=97=AC=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atomComponents/Button.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/atomComponents/Button.tsx b/src/components/atomComponents/Button.tsx index 16f47155..9352860b 100644 --- a/src/components/atomComponents/Button.tsx +++ b/src/components/atomComponents/Button.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { styled, css } from 'styled-components'; +import { css, styled } from 'styled-components'; interface ButtonProps { children: React.ReactNode; @@ -23,6 +23,7 @@ const buttonDefaultCSS = { display: flex; align-items: center; justify-content: center; + margin-bottom: 4.4rem; border-radius: 0.8rem; padding: 1.6rem; width: 33.5rem; From fe8f00ebd31cc594aaec6a5b2c367f154a4d73e8 Mon Sep 17 00:00:00 2001 From: simeunseo Date: Tue, 10 Oct 2023 04:40:22 +0900 Subject: [PATCH 3/4] =?UTF-8?q?design:=20cta=20=EB=B2=84=ED=8A=BC=20dim=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/SelectSchedulePage.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/selectSchedule/SelectSchedulePage.tsx b/src/pages/selectSchedule/SelectSchedulePage.tsx index 83928cdb..427fdf5a 100644 --- a/src/pages/selectSchedule/SelectSchedulePage.tsx +++ b/src/pages/selectSchedule/SelectSchedulePage.tsx @@ -254,9 +254,15 @@ const TitleWrapper = styled.div` `; const StyledBtnSection = styled.section` + display: flex; position: fixed; - bottom: 1.2rem; - border-radius: 50%; + bottom: 0; + align-items: end; + justify-content: center; + background: ${({ theme }) => theme.colors.dim_gradient}; + + width: 100%; + height: 16.4rem; `; export default SelectSchedulePage; From 4b94275abada8396888eafd49f9ffa13b9ec2a50 Mon Sep 17 00:00:00 2001 From: simeunseo Date: Tue, 10 Oct 2023 05:02:11 +0900 Subject: [PATCH 4/4] =?UTF-8?q?design:=20button=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EC=97=AC=EB=B0=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atomComponents/Button.tsx | 1 - src/pages/selectSchedule/SelectSchedulePage.tsx | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/atomComponents/Button.tsx b/src/components/atomComponents/Button.tsx index 9352860b..1750f2c8 100644 --- a/src/components/atomComponents/Button.tsx +++ b/src/components/atomComponents/Button.tsx @@ -23,7 +23,6 @@ const buttonDefaultCSS = { display: flex; align-items: center; justify-content: center; - margin-bottom: 4.4rem; border-radius: 0.8rem; padding: 1.6rem; width: 33.5rem; diff --git a/src/pages/selectSchedule/SelectSchedulePage.tsx b/src/pages/selectSchedule/SelectSchedulePage.tsx index 427fdf5a..ff144bf9 100644 --- a/src/pages/selectSchedule/SelectSchedulePage.tsx +++ b/src/pages/selectSchedule/SelectSchedulePage.tsx @@ -261,6 +261,8 @@ const StyledBtnSection = styled.section` justify-content: center; background: ${({ theme }) => theme.colors.dim_gradient}; + padding-bottom: 2.9rem; + width: 100%; height: 16.4rem; `;