Merge pull request #33 from JAVACAFE-STUDY/develop

Develop to Master
JAVACAFE-STUDY · Oct 12, 2019 · d36bba5 · d36bba5
2 parents 97a2786 + 2137ee3
commit d36bba5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainity-ladning",
-  "version": "0.8.0",
+  "version": "0.8.3",
   "description": "Chainity welcome pages",
   "private": true,
   "main": "dist/index.js",

diff --git a/public/index.html b/public/index.html
@@ -28,6 +28,7 @@
       href="https://use.fontawesome.com/releases/v5.0.10/css/all.css"
       rel="stylesheet"
     />
+    <link href="https://fonts.googleapis.com/css?family=Noto+Sans+KR&display=swap" rel="stylesheet">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/src/assets/jss/material-kit-react.jsx b/src/assets/jss/material-kit-react.jsx
@@ -64,7 +64,7 @@ const card = {
 };
 
 const defaultFont = {
-  fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
+  fontFamily: '"Noto Sans KR", "Roboto", "Helvetica", "Arial", sans-serif',
   fontWeight: "300",
   lineHeight: "1.5em"
 };
@@ -160,7 +160,7 @@ const title = {
   margin: "1.75rem 0 0.875rem",
   textDecoration: "none",
   fontWeight: "700",
-  fontFamily: `"Roboto Slab", "Times New Roman", serif`
+  fontFamily: `'Noto Sans KR', "Roboto Slab", "Times New Roman", serif`
 };
 
 const cardTitle = {

diff --git a/src/assets/jss/material-kit-react/views/landingPage.jsx b/src/assets/jss/material-kit-react/views/landingPage.jsx
@@ -8,18 +8,20 @@ const landingPageStyle = {
   },
   title: {
     ...title,
+    fontSize: "1.82em",
     display: "inline-block",
     position: "relative",
-    marginTop: "30px",
-    minHeight: "32px",
     color: "#FFFFFF",
-    textDecoration: "none"
+    textDecoration: "none",
+    marginBottom: '1.5em',
+    lineHeight: "1.2em"
   },
   subtitle: {
     fontSize: "1.313rem",
-    maxWidth: "500px",
-    margin: "10px auto 0"
-  },
+    margin: "0 1.5em 1.5em 0",
+    maxWidth: '455px',
+    lineHeight: "1.2em"
+},
   main: {
     background: "#FFFFFF",
     position: "relative",

diff --git a/src/assets/jss/material-kit-react/views/landingPageSections/productStyle.jsx b/src/assets/jss/material-kit-react/views/landingPageSections/productStyle.jsx
@@ -2,11 +2,12 @@ import { title } from "assets/jss/material-kit-react.jsx";
 
 const productStyle = {
   section: {
-    padding: "70px 0",
+    padding: "0.5em 0",
     textAlign: "center"
   },
   title: {
     ...title,
+    fontSize: "1.7em",
     marginBottom: "1rem",
     marginTop: "30px",
     minHeight: "32px",

diff --git a/src/assets/scss/core/_misc.scss b/src/assets/scss/core/_misc.scss
@@ -12,7 +12,7 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+  font-family: "Noto Sans KR", "Roboto", "Helvetica", "Arial", sans-serif;
   font-weight: 300;
   line-height: 1.5em;
 }

diff --git a/src/views/LandingPage/LandingPage.jsx b/src/views/LandingPage/LandingPage.jsx
@@ -55,12 +55,12 @@ class LandingPage extends React.Component {
           <div className={classes.container}>
             <GridContainer>
               <GridItem xs={12} sm={12} md={6}>
-                <h1 className={classes.title}>Blockchain과 Community가 만나다!</h1>
-                <h4>
-                  <b>Chainity</b>는 Blockchain + Community의 합성어로
-                  <br />
-                  <b>블록체인 기반의 커뮤니티 활동 보상 플랫폼</b> 입니다.
-                </h4>
+                  <div className={classes.title}>
+                      Blockchain과 <br/> Community가 만나다!
+                  </div>
+                <div className={classes.subtitle}>
+                  <b>Chainity</b>는 Blockchain + Community의 합성어로 <b>블록체인 기반의 커뮤니티 활동 보상 플랫폼</b> 입니다.
+                </div>
                 <Button
                   color="success"
                   size="lg"

diff --git a/src/views/LandingPage/Sections/ProductSection.jsx b/src/views/LandingPage/Sections/ProductSection.jsx
@@ -20,7 +20,7 @@ class ProductSection extends React.Component {
       <div className={classes.section}>
         <GridContainer justify="center">
           <GridItem xs={12} sm={12} md={8}>
-            <h2 className={classes.title}>Let's talk product</h2>
+            <div className={classes.title}>Let's talk product</div>
             <h5 className={classes.description}>
               커뮤니티 멤버의 활동 또는 참여를 독려하기 위한 핵심 요소는 각 커뮤니티 멤버의 기여도를 일관되게 반영할 수 있는 공정한 회계 제도입니다. CHAINITY는 커뮤니티 활동에 대한 개인 기여도를 정확하고 투명하게 보상하고자 블록체인 기반으로 제공되는 서비스입니다.
             </h5>