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

…to icon-pack4

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,13 @@
+name: 'Check for merge conflicts'
+on:
+  push:
+    branches:
+      - master
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: 'merge-conflict'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -59,7 +59,7 @@ Add GIFs of the entire web app
 
 <p align = "center"><img src = "https://media.giphy.com/media/1xOe0qgiYLYWE6pkki/giphy.gif"></p>
 
-Please check out our [contribution guidelines](./Contributing.MD)
+Please check out our [contribution guidelines](./CONTRIBUTING.md)
 
 ## The geeks🤓 behind this initiative:
 

src/pages/Editor/containers/editContext.js

@@ -19,8 +19,9 @@ const EditContextProvider = props => {
 
   const [headValues, setHeadValues] = useState({
     headSize: null,
-    headTop: null,
-    headLeft: 0,
+    headTop: 20,
+    headLeft: 20,
+    headRight: 20,
     headLine: null,
     headFont: "HomemadeApple",
     headColor: "black",
@@ -29,8 +30,9 @@ const EditContextProvider = props => {
   });
   const [bodyValues, setBodyValues] = useState({
     bodySize: null,
-    bodyTop: null,
-    bodyLeft: 0,
+    bodyTop: 20,
+    bodyLeft: 20,
+    bodyRight: 20,
     bodyLine: null,
     bodyFont: "HomemadeApple",
     bodyColor: "black",

src/pages/Editor/sections/OutputComponent/Output.js

@@ -31,6 +31,7 @@ const OutputComponent = () => {
             style={{
               fontSize: `${editContext.headValues.headSize}px`,
               paddingTop: `${editContext.headValues.headTop}px`,
+              paddingRight: `${Number(editContext.headValues.headRight) + 3}px`,
               paddingLeft: `${Number(editContext.headValues.headLeft) + 3}px`,
               lineHeight: `${editContext.headValues.headLine}`,
               fontFamily: `${editContext.headValues.headFont}`,
@@ -49,6 +50,7 @@ const OutputComponent = () => {
             style={{
               fontSize: `${editContext.bodyValues.bodySize}px`,
               paddingTop: `${editContext.bodyValues.bodyTop}px`,
+              paddingRight: `${Number(editContext.bodyValues.bodyRight) + 3}px`,
               paddingLeft: `${Number(editContext.bodyValues.bodyLeft) + 3}px`,
               lineHeight: `${editContext.bodyValues.bodyLine}`,
               fontFamily: `${editContext.bodyValues.bodyFont}`,

src/pages/Home/sections/About/About.module.css

@@ -12,9 +12,9 @@
 @import url(https://fonts.googleapis.com/css?family=Droid+Sans);
 
 .title {
-    font-family: "Samarkan Normal";
+    font-family: 'Poppins', sans-serif;
     color: #4e89ae;
-    font-size: 4rem;
+    font-size: 3rem;
     font-weight: bold;
     text-shadow: 1px 1px 3px #000000;
 }

src/pages/Home/sections/Contact/ContactUs.jsx

@@ -17,7 +17,7 @@ function ContactUs() {
         description={metaData.contact.description}
         keywords={metaData.contact.keywords}
       />
-      <h2>Get in Touch</h2>
+      <p className={styles.p} >Get in Touch</p>
       <div className={styles.contact_and_info_container}>
         <ExperienceForm />
         <div ref={mapRef} className={styles.map}>

src/pages/Home/sections/Contact/ContactUs.module.css

@@ -24,7 +24,13 @@
   overflow: hidden;
   margin: 0px 20px 0px 0px;
 }
-
+p{
+  font-family: 'Poppins', sans-serif;
+  color: #4e89ae;
+  font-size: 3rem;
+  font-weight: bold;
+  text-shadow: 1px 1px 3px #000000;
+}
 @media (max-width: 418px) {
   .map {
     min-width: 100vw;

src/pages/Home/sections/OpenSource/OpenSource.js

@@ -78,7 +78,7 @@ function OpenSource() {
 
   return (
     <div className={styles.OpenSource}>
-      <div className={styles.title}>Open Source Programs we are a part of</div>
+      <div className={styles.title}>Open Source Programs</div>
       <div className={styles.content}>"To do something really well, you have to get a lot of people involved."</div>
       <div className={styles.card_holder}>
         {recentEventsDetails.map(event => (

src/pages/Home/sections/OpenSource/OpenSource.module.css

@@ -3,10 +3,11 @@
 }
 
 .title {
+  font-family: 'Poppins', sans-serif;
   color: #4e89ae;
-  font-size: 2rem;
+  font-size: 3rem;
   font-weight: bold;
-  margin: 5rem 15px 0;
+  text-shadow: 1px 1px 3px #000000;
 }
 
 .content {

src/pages/Home/sections/SupportUs/SupportUs.module.css

@@ -2,6 +2,13 @@
     text-align: center;
     padding: 2rem;
 }
+p{
+  font-family: 'Poppins', sans-serif;
+  color: #4e89ae;
+  font-size: 3rem;
+  font-weight: bold;
+  text-shadow: 1px 1px 3px #000000;
+}
 
 .SupportusQuote {
     color: rgb(0, 153, 255);

src/pages/Home/sections/Team/Team.js

@@ -46,7 +46,7 @@ function Team() {
     return (
         <div className={styles.Team} id="home_team">
             {/* <!-- Project Maintainer Sub Section --> */}
-            <br/><br/> <h3>Project Maintainers</h3><br/><br/>
+            <br/><br/> <p className={styles.p}>Project Maintainers</p><br/><br/>
             <div className={styles.projectMaintainers}>
                 {
                     maintainerSection.map(item =>
@@ -71,7 +71,7 @@ function Team() {
 
             {/* <!-- Contributora Sub Section --> */}
             <br/><br/>
-            <h3>Clan of Contributors</h3><br/><br/>
+            <p className={styles.p}>Clan of Contributors</p><br/><br/>
             <div className={styles.team_container}>
                 {
                   contributors.map(c => (

src/pages/Home/sections/Team/Team.module.css

@@ -10,7 +10,14 @@
     gap: 45px;
     flex-wrap: wrap;
 }
+.tp{
+  font-size: 1.5rem;
+  margin: 15px;
+  font-family: 'Poppins', sans-serif;
+  color: #544eae;
 
+  font-weight: bold;
+}
 .profile_container {
     width: 300px;
     height: 400px;
@@ -20,7 +27,13 @@
     border-radius: 5px;
     transition: 1s all ease;
 }
-
+p{
+  font-family: 'Poppins', sans-serif;
+  color: #4e89ae;
+  font-size: 3rem;
+  font-weight: bold;
+  text-shadow: 1px 1px 3px #000000;
+}
 .profile_container::before {
     content: "";
     position: absolute;