Merge pull request #14 from Andros415/v2.4.1

Update Skillset + Adjust coloring on light theme
Andros415 · Sep 29, 2024 · c34ecc3 · c34ecc3
2 parents 4efe646 + 2795343
commit c34ecc3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/components/SkillsAndInterests/SkillRow/SkillRow.tsx b/src/components/SkillsAndInterests/SkillRow/SkillRow.tsx
@@ -9,34 +9,30 @@ function SkillRow({ selectedSkillSet }: SkillRowProps): ReactElement {
     <div className="mx-auto grid grid-cols-2 gap-4 text-8xl sm:mx-8 sm:flex sm:flex-wrap sm:content-center sm:justify-evenly">
       {selectedSkillSet === SkillSetOptions.DELVING_IN && (
         <>
-          <SkillIcon name="tailwindcss" type="plain" caption="Tailwind CSS" />
-          <SkillIcon name="rstudio" type="plain" caption="R" />
-          <SkillIcon name="react" type="original" caption="React" />
+          <SkillIcon name="react" type="original" caption="React Native" />
+          <SkillIcon name="kubernetes" type="plain" caption="Kubernetes" />
+          <SkillIcon name="graphql" type="plain" caption="GraphQL" />
           <SkillIcon name="azure" type="plain" caption="Azure" />
         </>
       )}
       {selectedSkillSet === SkillSetOptions.DAILY_BASIS && (
         <>
           <SkillIcon name="react" type="original" caption="React" />
           <SkillIcon name="typescript" type="plain" caption="Typescript" />
-          <SkillIcon name="sass" type="original" caption="Sass" />
+          <SkillIcon name="materialui" type="plain" caption="Material UI" />
           <SkillIcon name="nodejs" type="plain" caption="Node.js" />
           <SkillIcon name="git" type="plain" caption="Git" />
           <SkillIcon name="vscode" type="plain" caption="VS Code" />
-          <SkillIcon name="jira" type="plain" caption="Jira" />
+          <SkillIcon name="azuredevops" type="plain" caption="Azure DevOps" />
         </>
       )}
       {selectedSkillSet === SkillSetOptions.OTHER_SKILLS && (
         <>
           <SkillIcon name="angularjs" type="plain" caption="Angular" />
           <SkillIcon name="django" type="plain" caption="Django" />
           <SkillIcon name="python" type="plain" caption="Python" />
-          <SkillIcon name="pandas" type="original" caption="Pandas" />
-          <SkillIcon
-            name="jupyter"
-            type="plain-wordmark"
-            caption="Jupyter Notebook"
-          />
+          <SkillIcon name="figma" type="plain" caption="Figma" />
+          <SkillIcon name="tailwindcss" type="plain" caption="Tailwind CSS" />
           <SkillIcon name="bootstrap" type="plain" caption="Bootstrap" />
           <SkillIcon name="java" type="plain" caption="Java" />
           <SkillIcon name="github" type="original" caption="GitHub" />

diff --git a/src/components/SkillsAndInterests/SkillRowSelector/SkillRowSelector.tsx b/src/components/SkillsAndInterests/SkillRowSelector/SkillRowSelector.tsx
@@ -35,7 +35,7 @@ function SkillRowSelector({
                 className={({ active, selected }) =>
                   `p-1 transition-colors ${
                     active
-                      ? "cursor-pointer rounded-lg bg-black/5 text-teal dark:bg-white/5"
+                      ? "cursor-pointer rounded-lg bg-black/5 text-emerald-500 dark:text-teal dark:bg-white/5"
                       : ""
                   } ${
                     selected

diff --git a/src/index.css b/src/index.css
@@ -1,6 +1,6 @@
 @import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;1,400;1,500&family=Shadows+Into+Light&display=swap");
 @import url("https://fonts.googleapis.com/icon?family=Material+Icons+Outlined");
-@import url("https://cdn.jsdelivr.net/gh/devicons/devicon@v2.14.0/devicon.min.css");
+@import url("https://cdn.jsdelivr.net/gh/devicons/devicon@v2.16.0/devicon.min.css");
 
 @tailwind base;
 @tailwind components;