diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml new file mode 100644 index 00000000..b45c699e --- /dev/null +++ b/.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 }} diff --git a/README.md b/README.md index 0322d0c2..bb12df5e 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Add GIFs of the entire web app

-Please check out our [contribution guidelines](./Contributing.MD) +Please check out our [contribution guidelines](./CONTRIBUTING.md) ## The geeks🤓 behind this initiative: diff --git a/src/pages/Editor/containers/editContext.js b/src/pages/Editor/containers/editContext.js index ff312b53..ce0088c8 100644 --- a/src/pages/Editor/containers/editContext.js +++ b/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", diff --git a/src/pages/Editor/sections/OutputComponent/Output.js b/src/pages/Editor/sections/OutputComponent/Output.js index 19ec224b..3f53d924 100644 --- a/src/pages/Editor/sections/OutputComponent/Output.js +++ b/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}`, diff --git a/src/pages/Home/sections/About/About.module.css b/src/pages/Home/sections/About/About.module.css index 7e654ce5..26380b5c 100644 --- a/src/pages/Home/sections/About/About.module.css +++ b/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; } diff --git a/src/pages/Home/sections/Contact/ContactUs.jsx b/src/pages/Home/sections/Contact/ContactUs.jsx index 87a0623e..2a6aaef4 100644 --- a/src/pages/Home/sections/Contact/ContactUs.jsx +++ b/src/pages/Home/sections/Contact/ContactUs.jsx @@ -17,7 +17,7 @@ function ContactUs() { description={metaData.contact.description} keywords={metaData.contact.keywords} /> -

Get in Touch

+

Get in Touch

diff --git a/src/pages/Home/sections/Contact/ContactUs.module.css b/src/pages/Home/sections/Contact/ContactUs.module.css index 4859156d..883c7441 100644 --- a/src/pages/Home/sections/Contact/ContactUs.module.css +++ b/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; diff --git a/src/pages/Home/sections/OpenSource/OpenSource.js b/src/pages/Home/sections/OpenSource/OpenSource.js index 3556769c..fc26843d 100644 --- a/src/pages/Home/sections/OpenSource/OpenSource.js +++ b/src/pages/Home/sections/OpenSource/OpenSource.js @@ -78,7 +78,7 @@ function OpenSource() { return (
-
Open Source Programs we are a part of
+
Open Source Programs
"To do something really well, you have to get a lot of people involved."
{recentEventsDetails.map(event => ( diff --git a/src/pages/Home/sections/OpenSource/OpenSource.module.css b/src/pages/Home/sections/OpenSource/OpenSource.module.css index a7601675..7a69c340 100644 --- a/src/pages/Home/sections/OpenSource/OpenSource.module.css +++ b/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 { diff --git a/src/pages/Home/sections/SupportUs/SupportUs.js b/src/pages/Home/sections/SupportUs/SupportUs.js index f2cbad49..b2475069 100644 --- a/src/pages/Home/sections/SupportUs/SupportUs.js +++ b/src/pages/Home/sections/SupportUs/SupportUs.js @@ -8,7 +8,7 @@ function SupportUs() { - Philippe Kahn

-

Support us and help us assist you better

+

Support us

diff --git a/src/pages/Home/sections/SupportUs/SupportUs.module.css b/src/pages/Home/sections/SupportUs/SupportUs.module.css index 9414b08f..b53db37d 100644 --- a/src/pages/Home/sections/SupportUs/SupportUs.module.css +++ b/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); diff --git a/src/pages/Home/sections/Team/Team.js b/src/pages/Home/sections/Team/Team.js index 446af47f..e5b2805b 100644 --- a/src/pages/Home/sections/Team/Team.js +++ b/src/pages/Home/sections/Team/Team.js @@ -46,7 +46,7 @@ function Team() { return (
{/* */} -

Project Maintainers



+

Project Maintainers



{ maintainerSection.map(item => @@ -71,7 +71,7 @@ function Team() { {/* */}

-

Clan of Contributors



+

Clan of Contributors



{ contributors.map(c => ( diff --git a/src/pages/Home/sections/Team/Team.module.css b/src/pages/Home/sections/Team/Team.module.css index b30fc4bf..a875df0f 100644 --- a/src/pages/Home/sections/Team/Team.module.css +++ b/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; diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/cpu-microchip-processor-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/cpu-microchip-processor-bw.svg new file mode 100644 index 00000000..b387610b --- /dev/null +++ b/src/pages/Sketch/components/IconLibrary/icon-pack4/cpu-microchip-processor-bw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-bw.svg deleted file mode 100644 index 870c7378..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-bw.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-color.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-color.svg deleted file mode 100644 index 4f4fa70a..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-1-color.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-2-color.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-2-color.svg deleted file mode 100644 index e5cb46eb..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-2-color.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-5-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-5-bw.svg deleted file mode 100644 index 9e80c552..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-5-bw.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-bw.svg deleted file mode 100644 index 48407d5c..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-bw.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-1-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-1-bw.svg deleted file mode 100644 index 39bea02a..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-1-bw.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-2-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-2-bw.svg deleted file mode 100644 index f3258ec7..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-cell-share-2-bw.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-color.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-color.svg deleted file mode 100644 index f3537682..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-color.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-tablet-color.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-tablet-color.svg deleted file mode 100644 index 4caade48..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/devices-tablet-color.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-computers-connected-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-computers-connected-bw.svg deleted file mode 100644 index 1770de10..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-computers-connected-bw.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-devices-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-devices-bw.svg deleted file mode 100644 index 97c44cc2..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/multiple-devices-bw.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/pc-share-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/pc-share-bw.svg deleted file mode 100644 index 5f4dba1e..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/pc-share-bw.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/ps4-gamepad-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/ps4-gamepad-bw.svg deleted file mode 100644 index 138b4329..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/ps4-gamepad-bw.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/tablet-device-ipad-gadget-tablet-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/tablet-device-ipad-gadget-tablet-bw.svg deleted file mode 100644 index 17ad8022..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/tablet-device-ipad-gadget-tablet-bw.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/src/pages/Sketch/components/IconLibrary/icon-pack4/video-game-console-with-gamepad-bw.svg b/src/pages/Sketch/components/IconLibrary/icon-pack4/video-game-console-with-gamepad-bw.svg deleted file mode 100644 index fdb98338..00000000 --- a/src/pages/Sketch/components/IconLibrary/icon-pack4/video-game-console-with-gamepad-bw.svg +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -