Merge remote-tracking branch 'origin/design' into dev

Author: gobeam

app/assets/sass/layout/_navbar.scss

@@ -27,6 +27,19 @@
 .home-page {
   .navbar{
     width: 100%;
+    .logos{
+      width: 250px;
+      @include d-y-center;
+      flex-grow: 1;
+      font-weight: 900;
+      color: $primary;
+      font-size: 24px;
+      text-shadow: #e0e0e0 1px 1px 0;
+    }
+    .header-main{
+      width: calc(100% - 250px);
+      @include d-y-center;
+    }
   }
   .ant-layout-header {
     background: #ececec;

app/assets/sass/pages/_home.scss

@@ -1,6 +1,6 @@
 @import url('https://fonts.googleapis.com/css2?family=Public+Sans:wght@100;300;400;500;60;7000&display=swap');
 .home-wrapper {
-  @include d-center;
+  @include d-x-center;
   flex-direction: column;
   background-color: $bg-color;
 }
@@ -185,7 +185,7 @@
 
 
 .layout-page-content > :nth-child(2){
-  flex: initial;
+  flex: initial !important;
 }
 
 .ant-card {
@@ -194,6 +194,9 @@
 
 .banner{
   background-color: #ececec;
+  min-height: calc(100vh - 230px);
+  display: flex;
+  align-items: center;
 }
 
 img{
@@ -265,14 +268,16 @@ img{
   background: url('assets/images/helps-bg.jpg') no-repeat center center fixed;
   background-size: cover;
   // height: 200px;
-  
+  padding: 60px 0;
+  h3{
+    margin-bottom: 50px;
+  }
   .card-inner{
     text-align: center;
     .img-wrap{
       svg{
         font-size: 50px;
-        color: #3875e3;
-        margin-bottom: 40px;
+        margin-bottom: 20px;
       }
     }
     h4{
@@ -290,19 +295,23 @@ img{
   .ant-card{
     background-color: rgb(244, 246, 248);
     padding: 25px;
+    box-shadow: rgba(145, 158, 171, 0.40) -6px 7px 20px 0px;
+    margin-bottom: 40px;
+    .img-wrap{
+      svg{
+        color: $primary;
+      }
+    }
+    min-height: 350px;
   }
   .card-one{
 
-    margin-top: -40px;
+    // margin-top: -40px;
   }
   .card-two{
     background-color: rgb(255, 255, 255);
     box-shadow: rgba(145, 158, 171, 0.40) -6px 7px 20px 0px;
-    .img-wrap{
-      svg{
-        color: $primary;
-      }
-    }
+    
   }
   .card-three{
     margin-top: 80px;
@@ -325,7 +334,7 @@ img{
   margin: 40px 0;
   width: 100%;
   .ant-card{
-    padding: 20px 40px;
+    padding: 20px 40px 60px;
     width: 100%;
     cursor: pointer;
     // background-color: transparent;
@@ -336,39 +345,39 @@ img{
     box-shadow: 0px 8px 45px rgba(210, 210, 215, 0.9);
     &:hover{
       .designation{
-        opacity: 1;
+        // opacity: 1;
       }
     }
   }
+  .ant-card-body{
+    padding: 20px 0 5px;
+  }
   .card-inner{
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    .img-wrap{
-      height: 100px;
-      width: 100px;
-      background: #ffffff;
-      border-radius: 8px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+    h4{
+      font-size: 22px;
+      font-weight: 600;
+      text-align: center;
     }
     .designation{
       position: absolute;
       bottom: 0;
-      opacity: 0;
-      padding-bottom: 20px;
+      opacity: 1;
+      padding-bottom: 25px;
       transition: all ease .5s;
+      @include d-y-center;
       .icon{
         cursor: pointer;
         svg{
-          font-size: 20px;
+         margin-right: 10px;
+          font-size: 23px;
           color: #000000;
         }
       }
       .linked{
-        margin-left: 10px;
         svg{
           color: #0084be;
         }

app/assets/sass/pages/_user-account.scss

@@ -56,4 +56,3 @@
     }
   }
 
-  

app/common/layout/Navbar.js

@@ -11,23 +11,21 @@ function Navbar() {
       <Header className="d-flex w-100 headers">
         <div className="container-fluid d-flex w-100">
           <div className="logos"> Truthy</div>
-          <div className="w-100">
-            <Menu
-              mode="horizontal"
-              defaultSelectedKeys={['1']}
-              className="ml-auto"
-            >
-              <Menu.Item key="1">
-                <Link className="login-form-forgot" to="/">
-                  <FormattedMessage {...messages.home} />
-                </Link>
-              </Menu.Item>
-              <Menu.Item key="2">
-                <Link className="login-form-forgot" to="/login">
-                  <FormattedMessage {...messages.login} />
-                </Link>
-              </Menu.Item>
-            </Menu>
+          <div className="header-main">
+            <div className="ml-auto">
+              <Menu mode="horizontal" defaultSelectedKeys={['1']}>
+                <Menu.Item key="1">
+                  <Link className="login-form-forgot" to="/">
+                    <FormattedMessage {...messages.home} />
+                  </Link>
+                </Menu.Item>
+                <Menu.Item key="2">
+                  <Link className="login-form-forgot" to="/login">
+                    <FormattedMessage {...messages.login} />
+                  </Link>
+                </Menu.Item>
+              </Menu>
+            </div>
           </div>
         </div>
       </Header>

app/containers/HomePage/contributors.js

@@ -32,9 +32,9 @@ const Contributors = ({ contributors, loading = true }) => {
                   }
                 >
                   <div className="card-inner">
-                    <div className="img-wrap">
+                    {/* <div className="img-wrap">
                       <h4 className="text-center">{item.author}</h4>
-                    </div>
+                    </div> */}
                     <h4>{item.author}</h4>
                     <p className="mb-3">{item.designation}</p>
 

app/containers/HomePage/truthyHelp.js

@@ -57,7 +57,7 @@ const TruthyHelps = () => {
           <Row gutter={20}>
             {functionalities.map((functionality) => (
               <Col lg={8} key={functionality.title}>
-                <Card className="card-one">
+                <Card>
                   <div className="card-inner">
                     <div className="img-wrap">{functionality.icon}</div>
                     <h4>{functionality.title}</h4>