From 0caebd0993f2470018a75db9ff8e893d5ec5130b Mon Sep 17 00:00:00 2001 From: You-j Date: Mon, 23 Aug 2021 10:28:03 +0900 Subject: [PATCH 1/6] fix styled button style issue --- app/lib/pages/signin/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/pages/signin/index.tsx b/app/lib/pages/signin/index.tsx index 640fa61d..c6062338 100644 --- a/app/lib/pages/signin/index.tsx +++ b/app/lib/pages/signin/index.tsx @@ -217,13 +217,15 @@ function fetchUserProfile(): { const StyledButton = styled.button` ${ButtonStyle} - width: calc(100vw - 54px); + // 58 is body margin 8*2 + parent padding 21*2 + width: calc(100vw - 58px); font-weight: bold; font-size: 14px; line-height: 17px; color: #ffffff; background: #2562ff; margin-bottom: 53px; + border: 0; `; export default Signin; From a0cfd2941b1af81241526181be7dcf5465e7b2d2 Mon Sep 17 00:00:00 2001 From: You-j Date: Mon, 23 Aug 2021 10:33:20 +0900 Subject: [PATCH 2/6] remove commit From bc4d6a6c29b8ad43fdcf61208d4a9950aa29152a Mon Sep 17 00:00:00 2001 From: You-j Date: Mon, 23 Aug 2021 10:35:55 +0900 Subject: [PATCH 3/6] remove style --- app/lib/pages/signin/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/lib/pages/signin/index.tsx b/app/lib/pages/signin/index.tsx index c6062338..66c1e8fd 100644 --- a/app/lib/pages/signin/index.tsx +++ b/app/lib/pages/signin/index.tsx @@ -217,15 +217,13 @@ function fetchUserProfile(): { const StyledButton = styled.button` ${ButtonStyle} - // 58 is body margin 8*2 + parent padding 21*2 - width: calc(100vw - 58px); + width: calc(100vw - 52px); font-weight: bold; font-size: 14px; line-height: 17px; color: #ffffff; background: #2562ff; margin-bottom: 53px; - border: 0; `; export default Signin; From a1b2ae8d4bc20ac1e056ae6c0db409fe07305623 Mon Sep 17 00:00:00 2001 From: You-j Date: Mon, 23 Aug 2021 17:17:25 +0900 Subject: [PATCH 4/6] add comming soon template --- .../pages/resource/comming-soon-template.tsx | 55 +++++++++++++++++++ app/lib/pages/resource/index.ts | 1 + 2 files changed, 56 insertions(+) create mode 100644 app/lib/pages/resource/comming-soon-template.tsx create mode 100644 app/lib/pages/resource/index.ts diff --git a/app/lib/pages/resource/comming-soon-template.tsx b/app/lib/pages/resource/comming-soon-template.tsx new file mode 100644 index 00000000..2c38b8a2 --- /dev/null +++ b/app/lib/pages/resource/comming-soon-template.tsx @@ -0,0 +1,55 @@ +import styled from "@emotion/styled"; +import React, { ReactNode } from "react"; +import { BlackButton } from "../../components/style/global-style"; + +interface Props { + coverImage?: string; + content: ReactNode; + buttonText: string; + onClick: () => void; +} + +export function CommingSoonTemplate(props: Props) { + return ( + + {props.coverImage && ( + + + + )} + + {props.content} + + + + + ); +} + +const Wrapper = styled.div` + /* -8 is for reset body margin */ + margin: 0 -8px; +`; + +const ImageBox = styled.div``; + +const Image = styled.img` + width: 100vw; + height: auto; +`; + +const Content = styled.div<{ hasImage: boolean }>` + margin-top: ${(props) => (props.hasImage ? "27px" : "36px")}; + padding: 0 16px; +`; + +const ButtonWrapper = styled.div` + position: absolute; + bottom: 12px; + margin: 0 16px; +`; + +const Button = styled.button` + ${BlackButton} + width: calc(100vw - 32px); +`; diff --git a/app/lib/pages/resource/index.ts b/app/lib/pages/resource/index.ts new file mode 100644 index 00000000..9a2860fe --- /dev/null +++ b/app/lib/pages/resource/index.ts @@ -0,0 +1 @@ +export * from "./comming-soon-template"; From 369ac212e1680dd9a9f927a62b0daa54db4a593c Mon Sep 17 00:00:00 2001 From: You-j Date: Mon, 23 Aug 2021 17:19:19 +0900 Subject: [PATCH 5/6] remove comming soon template to component --- .../{pages/resource => components}/comming-soon-template.tsx | 2 +- app/lib/pages/resource/index.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename app/lib/{pages/resource => components}/comming-soon-template.tsx (94%) delete mode 100644 app/lib/pages/resource/index.ts diff --git a/app/lib/pages/resource/comming-soon-template.tsx b/app/lib/components/comming-soon-template.tsx similarity index 94% rename from app/lib/pages/resource/comming-soon-template.tsx rename to app/lib/components/comming-soon-template.tsx index 2c38b8a2..dbe21cd7 100644 --- a/app/lib/pages/resource/comming-soon-template.tsx +++ b/app/lib/components/comming-soon-template.tsx @@ -1,6 +1,6 @@ import styled from "@emotion/styled"; import React, { ReactNode } from "react"; -import { BlackButton } from "../../components/style/global-style"; +import { BlackButton } from "./style/global-style"; interface Props { coverImage?: string; diff --git a/app/lib/pages/resource/index.ts b/app/lib/pages/resource/index.ts deleted file mode 100644 index 9a2860fe..00000000 --- a/app/lib/pages/resource/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./comming-soon-template"; From 365650222381598dc3aaa6408aa403840cda84ed Mon Sep 17 00:00:00 2001 From: Universe Date: Sun, 4 Dec 2022 20:56:58 +0900 Subject: [PATCH 6/6] manually revert changes --- app/lib/components/comming-soon-template.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/lib/components/comming-soon-template.tsx b/app/lib/components/comming-soon-template.tsx index dbe21cd7..bccb3e4e 100644 --- a/app/lib/components/comming-soon-template.tsx +++ b/app/lib/components/comming-soon-template.tsx @@ -1,6 +1,6 @@ import styled from "@emotion/styled"; import React, { ReactNode } from "react"; -import { BlackButton } from "./style/global-style"; +import { BlackButtonStyle } from "@ui/core/button-style"; interface Props { coverImage?: string; @@ -26,10 +26,7 @@ export function CommingSoonTemplate(props: Props) { ); } -const Wrapper = styled.div` - /* -8 is for reset body margin */ - margin: 0 -8px; -`; +const Wrapper = styled.div``; const ImageBox = styled.div``; @@ -50,6 +47,6 @@ const ButtonWrapper = styled.div` `; const Button = styled.button` - ${BlackButton} + ${BlackButtonStyle} width: calc(100vw - 32px); `;