Merge branch 'master' of https://github.com/smaranjitghose/doc2pen in…

…to sass-home3
anshika208 · Mar 20, 2021 · fcb9f2d · fcb9f2d
2 parents e0c9649 + 86de449
commit fcb9f2d
Show file tree

Hide file tree

Showing 78 changed files with 137 additions and 1,821 deletions.
diff --git a/src/assets/images/404/404.gif b/src/assets/images/404/404.gif
diff --git a/src/assets/images/editor/checkmark.svg b/src/assets/images/editor/checkmark.svg
diff --git a/src/components/Footer/footer.module.scss b/src/components/Footer/footer.module.scss
@@ -44,7 +44,7 @@
     left: 0;
     height: 100%;
     width: 100%;
-    background: colors.$black_0-8;
+    background: colors.$black-dark-tint;
   }
 
   .newsletter {
@@ -87,7 +87,7 @@
 
           .icon {
             padding: 10px;
-            color: colors.$blue1;
+            color: colors.$royal-blue;
             min-width: 40px;
           }
           input {
@@ -101,13 +101,13 @@
         .bsClass {
           border-radius: 0 30px 30px 0;
           padding: 6px 15px;
-          background-color: colors.$blue1;
-          border: 2px solid colors.$blue1;
+          background-color: colors.$royal-blue;
+          border: 2px solid colors.$royal-blue;
           color: colors.$white;
 
           &:hover {
-            background-color: colors.$blue2;
-            border: 2px solid colors.$blue2;
+            background-color: colors.$navy-blue;
+            border: 2px solid colors.$navy-blue;
           }
         }
       }

diff --git a/src/components/ScrollToTopButton/scroll-to-top.module.scss b/src/components/ScrollToTopButton/scroll-to-top.module.scss
@@ -9,13 +9,13 @@
   font-size: 23px;
   width: 49px;
   transition: all 300ms ease-in-out;
-  background-color: colors.$blue1 !important;
+  background-color: colors.$royal-blue !important;
   color: colors.$white !important;
   box-shadow: 2px 2px 3px colors.$grey;
   border: none !important;
 
   &:hover {
-    background-color: colors.$blue1 !important;
+    background-color: colors.$royal-blue !important;
     transition: all 300ms ease-in-out;
   }
 

diff --git a/src/pages/404/notFound.jsx b/src/pages/404/notFound.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import "./squiggly-animation.css";
 import style from "./notFound.module.css";
-import sadImg from "./../../assets/images/404/sad404.svg";
+import pageNotFound from "./../../assets/images/404/404.gif";
 
 import MetaComponent from "../../seo/MetaComponent";
 import metaData from "../../seo/metaData";
@@ -25,22 +25,15 @@ function Hero() {
         keywords={metaData.notFound.keywords}
       />
       <div className={style.root}>
+        <div className={style.pageNotFound} style={{ backgroundImage: `url(${pageNotFound})` }} alt=""></div>
         <div className={`test`}>
-          <p className={style.smaller}>Uh ooh! 404 Not Found.</p>
-        </div>
-        <div className={style.sadImg} style={{ backgroundImage: `url(${sadImg})` }} alt="">
-          <div className={style.fours}></div>
-        </div>
-        <div className={`test`}>
-          {/* <p className={style.small}>– Hi there! – </p> */}
           You went too far buddy!
           <p className={style.small}>There's nothing Here :(</p>
         </div>
         <a className={style.navlink} href="/">
           <span className={style.hoverEffect}></span>
           <span className={style.buttonText}>Go back</span>
         </a>
-
         <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
           <defs>
             <filter id="squiggly-0">

diff --git a/src/pages/404/notFound.module.css b/src/pages/404/notFound.module.css
@@ -3,14 +3,13 @@
 .root {
   font-family: "Amatic SC", sans-serif;
   font-size: 100px;
-  background: #111;
-  color: #fff;
+  color: #0b3c54;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   min-height: 100vh;
-  padding-top: 30px;
+  padding-top: 0px;
 }
 
 .small {
@@ -26,86 +25,55 @@ p {
   margin: 0;
 }
 
-.sadImg {
+.pageNotFound {
   position: relative;
-  height: 200px;
-  width: 342px;
-  margin-bottom: 30px;
+  width: 600px;
+  height: 500px;
+  background-repeat: no-repeat;
+  margin-bottom: 10px;
   display: flex;
   justify-content: center;
   background-position:center;
-  margin-top: 30px;
-}
-
-.sadImg::after {
-  content: "";
-  display: block;
-  width: 125px;
-  border-radius: 100%;
-  filter: blur(2px);
-  background-color: #000;
-  height: 5px;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.fours {
-  height: 100%;
-  width: 200px;
-  position: relative;
-}
-
-.fours::before,
-.fours::after {
-  content: "4";
-  position: absolute;
-  bottom: 0;
-
-  font-size: 14rem;
-  font-family: "Luckiest Guy";
-  line-height: 0.94;
-}
-.fours::before {
-  left: -140px;
-}
-
-.fours::after {
-  right: -140px;
+  margin-top: 0px;
 }
 
 .navlink {
   color: rgb(202, 202, 202);
   text-decoration: none;
   font-size: 2rem;
-  box-shadow: 0 0 0 1.5px #fff;
+  box-shadow: 0 0 0 1.5px whitesmoke;
   border-radius: 25px;
+  border:1px solid #272727;
   padding: 5px 20px;
   margin-top: 30px;
   position: relative;
   overflow: hidden;
 }
+
 .navlink:hover {
   color: rgb(202, 202, 202);
   background-color: #1e2836;
   box-shadow: 0 0 0 1.5px #1e2836;
+  border: none;
 }
+
 .buttonText {
   position: relative;
   z-index: 1;
-  color: #08fdd8;
+  color: rebeccapurple;
 }
+
 .navlink:hover .buttonText {
   color: #272727;
 }
+
 .hoverEffect {
   position: absolute;
   display: block;
   top: 0;
   left: 0;
   border-radius: 0 100% 100% 0;
-  background-color: #fcfcfc;
+  background-color: #c7e2f6;
   width: 500px;
   height: 100%;
   transform: scale(0, 1) translate(-10px, -10px);
@@ -118,10 +86,12 @@ p {
 }
 
 @media (max-width:570px){
-  .sadImg{
-    transform: scale(0.6);
+  .pageNotFound {
+    transform: scale(0.7);
   }
-  .root{
+
+  .root {
     font-size: 3.5rem;
   }
-}
+
+}
diff --git a/src/pages/Home/sections/Contact/components/EmojiRating/emoji-rating.module.scss b/src/pages/Home/sections/Contact/components/EmojiRating/emoji-rating.module.scss
@@ -3,26 +3,33 @@
   margin-top: 10px;
   user-select: none;
 
-  &:hover {
-    filter: grayscale(0);
-    opacity: 1;
+  .emoji {
+    transition: all 0.5s ease-in;
+
+    &:hover {
+      filter: grayscale(0);
+      opacity: 1;
+      transform: scale(1.5);
+    }
   }
 
   .radio {
     display: none;
-    
+
     & ~ span {
       font-size: 1.2rem;
       filter: grayscale(100);
       cursor: pointer;
       transition: 0.3s;
       margin: 8px;
+      display: block;
     }
 
     &:checked ~ span {
       filter: grayscale(0);
       font-size: 1.3rem;
       margin: 6px;
+      transform: scale(1.3);
     }
   }
 }
diff --git a/src/pages/Home/sections/Contact/components/ExperienceForm/experience-form.module.scss b/src/pages/Home/sections/Contact/components/ExperienceForm/experience-form.module.scss
@@ -2,10 +2,10 @@
 @use './../../../../../../scss/colors';
 
 .info {
-  width: 350px;
+  width: 500px;
 
   .general_info {
-    background: colors.$blue3;
+    background: colors.$dark-blue;
     color: colors.$white;
     margin: 0.35rem 1rem;
     border-radius: 15px;
@@ -48,7 +48,7 @@
             height: 200px;
             top: -150px;
             left: -150px;
-            background-color: colors.$blue1;
+            background-color: colors.$royal-blue;
           }
         }
 
@@ -100,7 +100,7 @@
             border-radius: 8px;
             width: 100%;
             border: 0;
-            background: colors.$white2;
+            background: colors.$light-grey;
             font-size: 16px;
             outline: none;
             resize: none;
@@ -109,7 +109,7 @@
             color: colors.$grey;
           }
           .submit {
-            background: colors.$blue3;
+            background: colors.$dark-blue;
             font-size: 14px;
             letter-spacing: 4px;
             font-family: "Open Sans", sans-serif;
@@ -141,7 +141,7 @@
               top: 0;
               left: 0;
               border-radius: 0 50% 100% 0;
-              background-color: colors.$white2;
+              background-color: colors.$light-grey;
               width: 500px;
               height: 100%;
               transform: scale(0, 1);
@@ -155,7 +155,7 @@
                 height: 200%;
               }
               & .buttonText {
-                color: colors.$black_0-8;
+                color: colors.$black-dark-tint;
               }
             }
           }

diff --git a/src/pages/Home/sections/Contact/components/Map/map.scss b/src/pages/Home/sections/Contact/components/Map/map.scss
@@ -11,16 +11,16 @@
 }
 
 .leaflet-popup-content-wrapper {
-  background-color: colors.$black_0-8;
+  background-color: colors.$black-dark-tint;
   color: colors.$white;
 }
 
 .leaflet-popup-tip {
-  background-color: colors.$black_0-8;
+  background-color: colors.$black-dark-tint;
 }
 
 .leaflet-control-layers.leaflet-control {
-  background: colors.$black_0-8;
+  background: colors.$black-dark-tint;
 }
 
 .leaflet-control-layers-base {
@@ -56,7 +56,7 @@
   width: 230px;
   padding: 1.5rem;
   left: 10px;
-  background: colors.$black_0-8;
+  background: colors.$black-dark-tint;
   color: colors.$white;
   border-radius: 5px;
 
@@ -68,9 +68,9 @@
 .reCenter {
   border-radius: 100%;
   right: 10px;
-  background: colors.$white2;
+  background: colors.$light-grey;
   padding: 5px;
   border: none;
-  box-shadow: 2px 2px 3px colors.$black_0-8;
+  box-shadow: 2px 2px 3px colors.$black-dark-tint;
 }
 
diff --git a/src/pages/Home/sections/Contact/contact-us.module.scss b/src/pages/Home/sections/Contact/contact-us.module.scss
@@ -19,7 +19,7 @@
 
     .map {
       min-height: 60vh;
-      min-width: 418px;
+      min-width: 350px;
       display: flex;
       align-items: center;
       flex: 1;