update

cybercongress · May 29, 2024 · 7247578 · 7247578
1 parent cbd5be2
commit 7247578
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/front/src/assets/fonts/Play-Regular.ttf → front/public/fonts/Play-Regular.ttf b/front/src/assets/fonts/Play-Regular.ttf → front/public/fonts/Play-Regular.ttf
diff --git a/front/src/components/Input/Input.module.scss b/front/src/components/Input/Input.module.scss
@@ -24,7 +24,8 @@
     text-transform: initial;
 
     &::placeholder {
-      color: #272343;
+      // color: #272343;
+
       opacity: 0.5;
       text-transform: lowercase;
     }

diff --git a/front/src/components/common/Header.tsx b/front/src/components/common/Header.tsx
@@ -75,6 +75,7 @@ const HeaderWrapper = styled.header<{
   display: flex;
   justify-content: space-between;
   align-items: center;
+  z-index: 100;
 
   width: 100%;
   padding: 2rem 1.5rem;
@@ -156,7 +157,7 @@ const HeaderTitle = styled.div`
   display: flex;
   align-items: center;
   gap: 0.6rem;
-  color: #2c3542;
+  /* color: #2c3542; */
   ${({ theme }) => theme.fonts.Nexton_Title_Medium};
 
   cursor: pointer;

diff --git a/front/src/pages/Main/Main.tsx b/front/src/pages/Main/Main.tsx
@@ -11,6 +11,7 @@ import Button from "@/components/main/btnGrd";
 import Display from "@/components/common/containerGradient/Display/Display";
 import MainContainer from "@/components/MainContainer";
 import { Input } from "@/components/Input";
+import DisplayTitle from "@/components/common/containerGradient/DisplayTitle/DisplayTitle";
 
 const tele = (window as any).Telegram.WebApp;
 
@@ -77,7 +78,7 @@ const Main = () => {
         </Display> */}
         <Header isOpen={false} text="CYBER-TON" backgroundType={false} />
 
-        <Display>
+        <Display title={<DisplayTitle title="Message" />}>
           <Input
             placeholder="enter message..."
             value={message}
@@ -103,7 +104,7 @@ const Main = () => {
           )}
         </Display>
 
-        <Display>
+        <Display title={<DisplayTitle title="Passport" />}>
           <Input
             value={nickname}
             placeholder="enter passport..."

diff --git a/front/src/styles/globalStyles.ts b/front/src/styles/globalStyles.ts
@@ -87,7 +87,7 @@ export const reset = css`
     margin: 0;
     padding: 0;
     border: 0;
-    font-size: 62.5%;
+
     vertical-align: baseline;
   }
 
@@ -134,6 +134,7 @@ export const reset = css`
     border-spacing: 0;
   }
   button {
+    padding: 0;
     cursor: pointer;
   }
 `;
@@ -177,7 +178,7 @@ ${reset}
 
     @font-face {
   font-family: 'Play';
-  src: url('../assets/fonts/Play-Regular.ttf');
+  src: url('./fonts/Play-Regular.ttf');
   font-weight: 400;
   font-style: normal;
 }