Merge pull request #47 from ananjaemin/37-전체-페이지-반응형-작업

37 전체 페이지 반응형 작업
tempfiles-team · Nov 10, 2022 · 5359fc5 · 5359fc5
2 parents a8be451 + f4e5bff
commit 5359fc5
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 39 deletions.
diff --git a/src/components/common/Button/styled.ts b/src/components/common/Button/styled.ts
@@ -2,15 +2,15 @@ import styled from '@emotion/styled';
 
 export const ButtonContainer = styled.input<{ bgColor: string }>`
   background-color: ${(props) => props.bgColor};
-  border-radius: 8px;
+  border-radius: 0.8rem;
   outline: none;
   font-size: 2rem;
   font-weight: 700;
   width: 14rem;
   height: 6rem;
   border: 0;
   color: var(--color-text-primary);
-  margin: 0px 10px 0px 10px;
+  margin: 0px 1rem 0px 1rem;
 `;
 
 ButtonContainer.defaultProps = { type: 'button' };
diff --git a/src/components/common/CheckBox/styled.ts b/src/components/common/CheckBox/styled.ts
@@ -3,15 +3,15 @@ import styled from '@emotion/styled';
 export const CheckBoxContainer = styled.div`
   display: flex;
   align-items: center;
-  margin-right: 40px;
+  margin-right: 4rem;
 `;
 
 export const CheckBoxObject = styled.div<{ isCheck: boolean }>`
   width: 2.4rem;
   height: 2.4rem;
-  padding: 5px;
-  margin: 5px 12px 5px 5px;
-  border-radius: 3px;
+  padding: 0.5rem;
+  margin: 0.5rem 1.2rem 0.5rem 0.5rem;
+  border-radius: 0.3rem;
   background-color: ${(props) =>
     props.isCheck ? 'var(--color-check-true-background)' : 'var(--color-check-false-background)'};
 `;

diff --git a/src/components/common/FileBox/index.ts b/src/components/common/FileBox/index.ts
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 export const FileBox = styled.div`
   background-color: var(--color-backgorund-filelistbox);
   color: var(--color-text-tertiary);
-  border-radius: 10px;
+  border-radius: 1rem;
   padding: 1.2rem 1.2rem 1.2rem 1.2rem;
   display: flex;
   flex-direction: row;

diff --git a/src/components/common/FileFind/styled.ts b/src/components/common/FileFind/styled.ts
@@ -3,23 +3,28 @@ import styled from '@emotion/styled';
 export const FileFindContainer = styled.div`
   width: 100%;
   display: flex;
+<<<<<<< HEAD
+  align-items: center;
+  margin-top: 2rem;
+=======
   justify-content: space-between;
   align-items: center;
   margin-top: 20px;
+>>>>>>> 77ddbc7a3a9b1269418467b444928a8b76b6fe20
 `;
 
 export const FileFindTextBox = styled.div`
-  border: 4px solid var(--color-border);
-  border-radius: 10px;
+  border: 0.4rem solid var(--color-border);
+  border-radius: 1rem;
   width: 45rem;
   height: 4.2rem;
   background-color: var(--color-backgorund-black);
   color: var(--color-text-placeholder);
   display: flex;
   align-items: center;
   white-space: nowrap;
-  padding-left: 12px;
-  padding-right: 12px;
+  padding-left: 1.2rem;
+  padding-right: 1.2rem;
   font-size: 1.8rem;
   font-weight: 700;
   overflow: auto;

diff --git a/src/components/common/FileListBox/styled.ts b/src/components/common/FileListBox/styled.ts
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 export const FileListBoxContainer = styled.div`
   background-color: var(--color-backgorund-filelistbox);
   color: var(--color-text-tertiary);
-  border-radius: 10px;
+  border-radius: 1rem;
   padding: 1.2rem 1.2rem 1.2rem 1.2rem;
   display: flex;
   flex-direction: row;

diff --git a/src/components/common/Navbar/styled.ts b/src/components/common/Navbar/styled.ts
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 export const NavbarContainer = styled.nav`
   width: 32rem;
   min-width: 250px;
-  margin: 30px auto 30px auto;
+  margin: 3rem auto 3rem auto;
   display: flex;
   justify-content: space-between;
   z-index: 99;

diff --git a/src/components/common/PasswordInput/index.ts b/src/components/common/PasswordInput/index.ts
@@ -1,17 +1,17 @@
 import styled from '@emotion/styled';
 
 export const PasswordInput = styled.input`
-  border: 4px solid var(--color-border);
+  border: 0.4rem solid var(--color-border);
   background-color: var(--color-backgorund-black);
   color: var(--color-text-placeholder);
-  border-radius: 10px;
+  border-radius: 1rem;
   outline: none;
   width: 100%;
   height: 5rem;
-  padding-left: 12px;
+  padding-left: 1.2rem;
   font-size: 1.8rem;
   font-weight: 700;
-  margin-top: 20px;
+  margin-top: 2rem;
   &::-webkit-input-placeholder {
     color: var(--color-text-placeholder);
   }

diff --git a/src/components/common/Progress/styled.ts b/src/components/common/Progress/styled.ts
@@ -11,14 +11,14 @@ export const ProgressBar = styled.div<{ width: number }>`
   min-width: 70rem;
   min-height: 5.6rem;
   background: var(--color-backgorund-progressbar);
-  border-radius: 15px;
+  border-radius: 1.5rem;
   overflow: hidden;
   &::before {
     content: ' ';
     transition: all 1s;
     width: ${(props) => props.width}%;
     height: auto;
-    border-radius: 15px;
+    border-radius: 1.5rem;
     background: #373c62;
   }
 `;
@@ -33,5 +33,5 @@ export const ProgressAnimationBox = styled.div`
   width: 20rem;
   height: 20rem;
   overflow: hidden;
-  margin-bottom: 10px;
+  margin-bottom: 1rem;
 `;
diff --git a/src/components/common/RangeSlider/index.ts b/src/components/common/RangeSlider/index.ts
@@ -5,7 +5,7 @@ export const RangeSlider = styled.input`
   padding: 0;
   width: 100%;
   height: 4rem;
-  border-radius: 4px;
+  border-radius: 0.4rem;
   -webkit-appearance: none;
   -moz-appearance: none;
   outline: none;
@@ -22,7 +22,7 @@ export const RangeSlider = styled.input`
     background-color: var(--color-text-primary);
     height: 2rem;
     width: 1rem;
-    border-radius: 4px;
+    border-radius: 0.4rem;
   }
   //Firefox
   &::-moz-range-thumb {
@@ -31,7 +31,7 @@ export const RangeSlider = styled.input`
     background-color: var(--color-text-primary);
     height: 2rem;
     width: 1rem;
-    border-radius: 4px;
+    border-radius: 0.4rem;
   }
 `;
 

diff --git a/src/components/common/SkeletonUIBox/index.ts b/src/components/common/SkeletonUIBox/index.ts
@@ -1,8 +1,9 @@
 import styled from '@emotion/styled';
+//나중에 loading애니메이션 변수화하기
 export const SkeletonUIBox = styled.div<{ randomWitdh: string }>`
   display: flex;
   background-color: var(--color-backgorund-filelistbox);
-  border-radius: 10px;
+  border-radius: 1rem;
   margin-bottom: 1.5rem;
   min-height: 4.6rem;
   min-width: ${(props) => props.randomWitdh}rem;
@@ -12,7 +13,7 @@ export const SkeletonUIBox = styled.div<{ randomWitdh: string }>`
     width: 100%;
     height: auto;
     animation: loading 2s infinite;
-    box-shadow: 0 0 30px 30px rgba(255, 255, 255, 0.3);
+    box-shadow: 0 0 3rem 3rem rgba(255, 255, 255, 0.3);
   }
   @keyframes loading {
     0% {
@@ -41,14 +42,14 @@ export const SkeletonUI = styled.div<{
   min-height: ${(props) => props.height};
   margin: ${(props) => props.margin};
   background: var(--color-backgorund-filelistbox);
-  border-radius: 10px;
+  border-radius: 1rem;
   overflow: hidden;
   &::before {
     content: ' ';
     width: 100%;
     height: auto;
     animation: loading 2s infinite;
-    box-shadow: 0 0 30px 30px rgba(255, 255, 255, 0.3);
+    box-shadow: 0 0 3rem 3rem rgba(255, 255, 255, 0.3);
   }
   @keyframes loading {
     0% {

diff --git a/src/components/common/UpLoadButton/index.ts b/src/components/common/UpLoadButton/index.ts
@@ -2,14 +2,14 @@ import styled from '@emotion/styled';
 
 export const UpLoadButton = styled.input`
   outline: none;
-  border-radius: 15px;
+  border-radius: 1.5rem;
   border: 0;
   width: 15rem;
   height: 5rem;
   font-size: 2rem;
   font-weight: 900;
   background-color: var(--color-background-secondary);
-  margin-top: 30px;
+  margin-top: 3rem;
   color: var(--color-text-primary);
   text-align: center;
 `;
diff --git a/src/pages/api/styled.ts b/src/pages/api/styled.ts
@@ -20,7 +20,7 @@ export const ApiListSection = styled.div`
 export const ApiListBox = styled.div`
   background-color: var(--color-backgorund-filelistbox);
   color: var(--color-text-tertiary);
-  border-radius: 10px;
+  border-radius: 1rem;
   padding: 2rem 1.4rem 2rem 1.4rem;
   margin: 1rem;
   display: flex;

diff --git a/src/pages/checkpw/styled.ts b/src/pages/checkpw/styled.ts
@@ -13,12 +13,12 @@ export const PasswordInputSection = styled.div`
 `;
 
 export const CheckPasswordInput = styled.input`
-  border: 4px solid var(--color-border);
-  border-radius: 10px;
+  border: 0.4rem solid var(--color-border);
+  border-radius: 1rem;
   outline: none;
   width: 50rem;
   height: 6rem;
-  padding-left: 12px;
+  padding-left: 1.2rem;
   font-size: 1.8rem;
   font-weight: 700;
 `;
diff --git a/src/pages/delete/styled.ts b/src/pages/delete/styled.ts
@@ -14,5 +14,5 @@ export const DeletePagePageLabel = styled.div`
   font-size: 3rem;
   font-weight: 700;
   color: var(--color-text-primary);
-  margin: 30px;
+  margin: 3rem;
 `;
diff --git a/src/pages/filelist/styled.ts b/src/pages/filelist/styled.ts
@@ -15,6 +15,6 @@ export const FileListPageBoxShoadow = styled.div`
   width: 100%;
   height: 6rem;
   position: relative;
-  top: -25px;
+  top: -2.5rem; //-25px
   background: linear-gradient(180deg, rgba(40, 42, 58, 0) 0%, #282a3a 45.31%);
 `;
diff --git a/src/pages/postApi/styled.ts b/src/pages/postApi/styled.ts
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 export const ApiBox = styled.div`
   background-color: var(--color-backgorund-filelistbox);
   color: var(--color-text-tertiary);
-  border-radius: 10px;
+  border-radius: 1rem;
   padding: 2rem 1.4rem 2rem 1.4rem;
   margin: 1rem;
   display: flex;

diff --git a/src/styles/globalStyle.ts b/src/styles/globalStyle.ts
@@ -28,8 +28,14 @@ export const globalStyle = css`
 
     --color-button-primary: var(--color-border);
     --color-button-secondary: #aa75ab;
+
+    --small-mobile-breakpoint: 575px;
+    --mobile-breakpoint: 767px;
+    --tablet-breakpoint: 991px;
+    --desktop-breakpoint: 1200px;
   }
   html {
+    text-size-adjust: 100%;
     font-size: 10px;
   }
   body {
@@ -47,14 +53,14 @@ export const globalStyle = css`
   .MainLogoText {
     font-size: 6rem;
     font-weight: 900;
-    margin: 18px;
-    margin-top: 50px;
+    margin: 1.8rem;
+    margin-top: 5rem;
     color: var(--color-text-primary);
   }
   .MainLogoSubText {
     font-size: 2.5rem;
     font-weight: 700;
-    margin-bottom: 35px;
+    margin-bottom: 3.5rem;
     color: var(--color-text-primary);
   }
 `;