Merge pull request #64 from 2-guys-Javascript/dev

�CSS 조정 사항 배포환경 적용
2-guys-Javascript · Nov 1, 2023 · bde9a6d · bde9a6d
2 parents e0de1d5 + d8093fc
commit bde9a6d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 13 deletions.
diff --git a/src/components/Japan/JapanDefaultLayout.css b/src/components/Japan/JapanDefaultLayout.css
@@ -54,22 +54,22 @@
 }
 
 .jp-weather-text1 {
-  color: #ffa7fce7;
-  font-size: 30px;
+  color: #000000;
+  font-size: 26px;
   font-weight: 400;
   margin-top: 40px;
   margin-bottom: 0;
 }
 
 .jp-weather-text2 {
-  color: #0000009e;
+  color: #00000088;
   font-size: 18px;
   font-weight: 500;
   margin-top: 5px;
 }
 
 .jp-where {
-  color: #ff8cdcf8;
+  color: #000000;
   font-weight: 400;
   text-align: center;
 }

diff --git a/src/components/Korea/KoreaDefaultLayout.css b/src/components/Korea/KoreaDefaultLayout.css
@@ -52,22 +52,22 @@
 }
 
 .kr-weather-text1 {
-  color: #087953e9;
-  font-size: 30px;
+  color: #000000;
+  font-size: 26px;
   font-weight: 400;
   margin-top: 40px;
   margin-bottom: 0;
 }
 
 .kr-weather-text2 {
-  color: #0000009e;
+  color: #00000088;
   font-size: 18px;
   font-weight: 500;
   margin-top: 5px;
 }
 
 .kr-where {
-  color: #008138c1;
+  color: #000000;
   font-weight: 400;
   text-align: center;
 }
diff --git a/src/components/Maps/LoginMap.css b/src/components/Maps/LoginMap.css
@@ -51,14 +51,19 @@
   align-items: center;
 }
 
-.marker-info button {
+.marker-info-closeDelete button {
   box-shadow: 0 0 3px #00000055;
   border: 0;
   border-radius: 17px;
   margin-top: 10px;
   font-size: 20px;
   padding: 7px 13px;
-  background-color: #ffffff;
+  background-color: #000000;
+  color: #ffffff;
+}
+
+.marker-info-closeDelete :nth-child(2) {
+  background-color: #a80e0e;
 }
 
 .marker-info-closeDelete {
@@ -83,6 +88,7 @@
 }
 
 .react-calendar__navigation button {
+  color: #000000;
   background-color: #ffffff;
   border: 0;
   font-size: 18px;
@@ -176,6 +182,12 @@ abbr {
 
 .title-box {
   margin: 20px 0;
+  max-width: 460px;
+  width: 90vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
 }
 
 .title-box label {

diff --git a/src/components/Maps/LoginMap.jsx b/src/components/Maps/LoginMap.jsx
@@ -379,6 +379,7 @@ function LoginMap({ isLoggedIn, onChangeIsLoggedIn, userId, onChangeUserId, disp
           {selectedNearByPlace && (
             <InfoWindow
               position={selectedNearByPlace.geometry.location}
+              options={{ pixelOffset: new window.google.maps.Size(0, -35) }}
               onCloseClick={() => SetSelectedNearByPlace(null)}
             >
               <div>{selectedNearByPlace.name}</div>

diff --git a/src/components/Maps/NonLoginMap.css b/src/components/Maps/NonLoginMap.css
@@ -61,7 +61,7 @@
   text-align: start;
   border: 1px solid #00000055;
   box-shadow: 0 0 3px #00000033;
-  font-size: 0.7rem;
+  font-size: 10px;
   margin-top: 10px;
   border-radius: 15px;
   /* box-sizing: border-box; */

diff --git a/src/index.css b/src/index.css
@@ -40,7 +40,7 @@ body {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 0 0 20vh;
+  padding: 70px 0 20vh;
 }
 
 /* 아래의 두 설정은 scroll-box 라는 클래스를 가진 요소들에게 스크롤은 되지만, 스크롤 바는 없애는 설정이다 */
@@ -96,6 +96,8 @@ body {
   list-style-type: none;
   border-radius: 15px;
   box-shadow: 0 0 5px #00000033;
+  max-width: 460px;
+  width: 90vw;
 }
 
 .weather-hourly li {
@@ -105,6 +107,8 @@ body {
   align-items: center;
   flex: 0 0 auto;
   margin: 10px;
+  color: #000000;
+  font-size: 12px;
 }
 
 .weather-hourly p {
@@ -127,6 +131,9 @@ body {
   flex-direction: column;
   border-radius: 15px;
   box-shadow: 0 0 5px #00000033;
+  font-size: 14px;
+  max-width: 460px;
+  width: 90vw;
 }
 
 .forecast li {
@@ -166,7 +173,7 @@ body {
 .weather-city {
   background-color: #ffffff;
   text-align: center;
-  font-size: 20px;
+  font-size: 14px;
   font-weight: 300;
   color: #000000;
   border-radius: 18px;