Pull-Request-Community · Noamili · Jun 24, 2022 · Jul 2, 2022 · Jul 2, 2022 · Jul 2, 2022
diff --git a/components/buttons/basicButton.tsx b/components/buttons/basicButton.tsx
@@ -1,32 +1,9 @@
-import colors from '../../styles/colors';
+import styles from './button.module.scss';
 
 const BasicButton = ({ children, className }: BasicButtonProps) => {
   return (
     <>
-      <button className={`${className} BasicButton`}>{children}</button>
-      <style jsx>{`
-        .BasicButton {
-          user-select: none;
-          cursor: pointer;
-          color: white;
-          font-size: 1rem;
-          border: none;
-          border-radius: 64px;
-          background-color: var(--primary);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          padding: 6px 12px 6px 6px;
-          transition: all 0.3s;
-          width: 126px;
-          height: 36px;
-        }
-
-        .BasicButton:hover {
-          filter: brightness(1.2);
-          transform: scale(1.02);
-        }
-      `}</style>
+      <button className={`${className} ${styles.basicButton}`}>{children}</button>
     </>
   );
 };

diff --git a/components/buttons/button.module.scss b/components/buttons/button.module.scss
@@ -0,0 +1,69 @@
+@import "../../styles/colors";
+
+.socialButton {
+  user-select: none;
+  cursor: pointer;
+  color: white;
+  font-size: 1.5rem;
+  border: none;
+  border-radius: 100%;
+  padding: 10px 0;
+  transition: background-color 0.3s cubic-bezier(0.4, 0, 1, 1);
+  max-height: 36px;
+  max-width: 36px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.telegram {
+  background-color: $blue-300;
+}
+
+.facebook {
+  background-color: $blue-200;
+}
+
+.discord {
+  background-color: $blue-100;
+}
+
+.newsletter {
+  background-color: $gray-400;
+}
+
+.socialButton:hover {
+  filter: brightness(1.2);
+}
+
+@media only screen and (max-width: 600px) {
+  .socialButton {
+    max-height: 48px;
+    max-width: 48px;
+  }
+}
+
+.basicButton {
+  user-select: none;
+  cursor: pointer;
+  color: white;
+  font-size: 1rem;
+  border: none;
+  border-radius: 64px;
+  background-color: var(--primary);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6px 12px 6px 6px;
+  transition: all 0.3s;
+  width: 126px;
+  height: 36px;
+}
+
+.basicButton:hover {
+  filter: brightness(1.2);
+  transform: scale(1.02);
+}
diff --git a/components/buttons/socialButton.tsx b/components/buttons/socialButton.tsx
@@ -1,51 +1,9 @@
-import colors from '../../styles/colors';
+import styles from './button.module.scss';
 
 const SocialButton = ({ children, className }: BasicButtonProps) => {
   return (
     <>
-      <button className={`${className} SocialButton`}>{children}</button>
-      <style jsx>{`
-        .SocialButton {
-          user-select: none;
-          cursor: pointer;
-          color: white;
-          font-size: 1.5rem;
-          border: none;
-          border-radius: 100%;
-          padding: 10px 0;
-          transition: background-color 0.3s cubic-bezier(0.4, 0, 1, 1);
-          max-height: 36px;
-          max-width: 36px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          -webkit-box-sizing: border-box;
-          -moz-box-sizing: border-box;
-          box-sizing: border-box;
-        }
-        .telegram {
-          background-color: ${colors.telegram};
-        }
-        .facebook {
-          background-color: ${colors.facebook};
-        }
-        .discord {
-          background-color: ${colors.discord};
-        }
-        .newsletter {
-          background-color: ${colors.newsletter};
-        }
-
-        .SocialButton:hover {
-          filter: brightness(1.2);
-        }
-        @media only screen and (max-width: 600px) {
-          .SocialButton {
-            max-height: 48px;
-            max-width: 48px;
-          }
-        }
-      `}</style>
+      <button className={`${styles[className]} ${styles.socialButton}`}>{children}</button>
     </>
   );
 };

diff --git a/components/personCard/personCard.module.scss b/components/personCard/personCard.module.scss
@@ -1,4 +1,5 @@
 @import "../../styles/media";
+@import "../../styles/colors";
 
 .card {
   width: 100%;
@@ -106,3 +107,11 @@
     }
   }
 }
+
+.card_default_theme {
+  border-bottom-color: $red-200;
+}
+
+.icon_default_theme {
+  color: $red-200;
+}
diff --git a/components/personCard/personCard.tsx b/components/personCard/personCard.tsx
@@ -1,4 +1,5 @@
 import { useMemo, useRef } from 'react';
+import classNames from 'classnames';
 import {
   mdiFacebook,
   mdiGithub,
@@ -11,7 +12,6 @@ import {
 import Icon from '@mdi/react';
 import { IPerson } from '../../services/people';
 import styles from './personCard.module.scss';
-import colors from '../../styles/colors';
 import ShowMore from '../showMore/showMore';
 import Label from '../label/label';
 
@@ -35,7 +35,6 @@ export function PersonCard({ person }: IPersonProps) {
     roles,
     customImage,
   } = person;
-  const theme = useMemo(() => themeColor ?? colors.secondary_color, [themeColor]);
   const icons = useMemo(
     () => [
       { link: github, icon: mdiGithub },
@@ -54,7 +53,12 @@ export function PersonCard({ person }: IPersonProps) {
   const onToggleCard = () => card?.current?.classList.toggle(styles.card__open);
 
   return (
-    <div ref={card} className={styles.card} style={{ borderBottomColor: theme }}>
+    <div
+      ref={card}
+      className={classNames(styles.card, {
+        [`${styles.card_default_theme}`]: !themeColor,
+      })}
+    >
       <div
         className={styles.card__img}
         style={{
@@ -94,7 +98,12 @@ export function PersonCard({ person }: IPersonProps) {
                   href={link.startsWith('https://') ? link : `https://github.com/${link}`}
                   rel="noreferrer"
                 >
-                  <Icon className="icon" path={icon} style={{ color: theme }} />
+                  <Icon
+                    className={classNames({
+                      [`${styles.icon_default_theme}`]: !themeColor,
+                    })}
+                    path={icon}
+                  />
                 </a>
               )
           )}

diff --git a/components/projectPage/ProjectPage.module.scss b/components/projectPage/ProjectPage.module.scss
@@ -1,3 +1,5 @@
+@import "../../styles/colors";
+
 .descriptionContainer {
   display: flex;
   flex-direction: column;
@@ -10,7 +12,7 @@
   justify-content: center;
   font-weight: bold;
   font-size: 36px;
-  color: #0b008e;
+  color: $blue-500;
 }
 
 .star {
@@ -60,6 +62,6 @@
   }
 
   .description {
-    font-size: 1.556rem; // Based on 9px.
+    font-size: 1rem; // Based on 16px.
   }
 }
diff --git a/components/projectPage/technologies/Technologies.module.scss b/components/projectPage/technologies/Technologies.module.scss
@@ -1,3 +1,5 @@
+@import "../../../styles/colors";
+
 .listContainer {
   display: flex;
   flex-direction: row;
@@ -14,6 +16,6 @@
   align-items: center;
   justify-content: center;
   font-size: 14px;
-  color: #e2e2e2;
+  color: $gray-200;
   user-select: none;
 }
diff --git a/components/socialNetworks/socialNetworks.module.scss b/components/socialNetworks/socialNetworks.module.scss
@@ -8,7 +8,7 @@
     max-height: 50px;
   }
   &__btn {
-    color: #fff;
+    color: white;
     width: 50px;
     height: 50px;
     border-radius: 50%;

diff --git a/styles/colors.scss b/styles/colors.scss
@@ -0,0 +1,31 @@
+$blue-100: #7289da;
+$blue-200: #1778f2;
+$blue-300: #0088cc;
+$blue-500: #0b008e;
+$red-200: #ce5a55;
+$gray-100: #e8e8e8;
+$gray-200: #e2e2e2;
+$gray-400: #808080;
+$gray-500: #353535;
+$gray-600: #292e33;
+$gray-700: #242831;
+$gray-800: #202529;
+$gray-900: #1d1d1d;
+// New colors.
+$blue-600: #01007d;
+$new-gray-100: #fafafb;
+$new-gray-200: #e9ebef;
+$new-gray-300: #bfc0c3;
+$new-gray-400: #5b6375;
+$new-gray-500: #39475d;
+$new-gray-600: #242831;
+$purple-500: #832ec6;
+$purple-red-500: linear-gradient(180deg, #01007d 0%, #832ec6 47.92%, #dc665e 100%);
+$purple-red-400: linear-gradient(
+  180deg,
+  rgba(1, 0, 125, 0.6) 0%,
+  rgba(131, 46, 198, 0.6) 47.92%,
+  rgba(220, 102, 94, 0.6) 100%
+);
+$purple-100: rgba(11, 0, 142, 0.3);
+$purple-200: rgba(11, 0, 142, 0.1);
diff --git a/styles/colors.ts b/styles/colors.ts
diff --git a/styles/globals.scss b/styles/globals.scss
@@ -1,4 +1,5 @@
 @import "./typography.scss";
+@import "../styles/colors";
 
 * {
   box-sizing: border-box;
@@ -25,19 +26,19 @@ html {
 }
 
 html {
-  --primary: #ce5a55;
-  --background-color: #e8e8e8;
+  --primary: #{$red-200};
+  --background-color: #{$gray-100};
   --background-description: white;
   --card-background: white;
-  --header-background: #242831;
-  --text: #1d1d1d;
+  --header-background: #{$gray-700};
+  --text: #{$gray-900};
 }
 
 html.dark {
-  --primary: #ce5a55;
-  --background-color: #353535;
-  --background-description: #202529;
-  --card-background: #292e33;
-  --header-background: #000;
-  --text: #e8e8e8;
+  --primary: #{$red-200};
+  --background-color: #{$gray-500};
+  --background-description: #{$gray-800};
+  --card-background: #{$gray-600};
+  --header-background: black;
+  --text: #{$gray-100};
 }