diff --git a/package.json b/package.json index 6c6c6ba..231f102 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "www-aaronjy-me", - "version": "2.4.0", + "version": "2.4.1", "private": true, "type": "module", "lint-staged": { diff --git a/src/components/Resume/Resume.jsx b/src/components/Resume/Resume.jsx index 40f509e..4367b4e 100644 --- a/src/components/Resume/Resume.jsx +++ b/src/components/Resume/Resume.jsx @@ -51,15 +51,10 @@ function Resume({ position={exp.position} start={exp.start} end={exp.end} + skills={exp.skills} > {markdownToHtml(exp.description)} - {!!exp.skills?.length && ( -
- Competencies - <>{exp.skills.sort().join(", ")} -
- )} ))} @@ -107,50 +102,43 @@ function Resume({ export default Resume; -function WorkExperience({ position, employer, start, end, children }) { +function WorkExperience({ position, employer, start, end, skills, children }) { return ( - //
- //
- //

- // {position} - //
- // {employer} - //

- // - // - - // - //
- //
- //
+ <> + + + + + + + + + + +
+ + {position} + +
+ {employer} +
+ - +
+
- - - - - - - - - - -
- - {position} - -
- {employer} -
- {/* */} - - - {/* */} -
-
-
+ {!!skills?.length && ( +
+ {skills.sort().map((skill) => ( + {skill} + ))} +
+ )} +
+
+ ); } diff --git a/src/components/Resume/Resume.module.css b/src/components/Resume/Resume.module.css index d3ab528..09e164f 100644 --- a/src/components/Resume/Resume.module.css +++ b/src/components/Resume/Resume.module.css @@ -9,7 +9,7 @@ .cvContent { display: flex; flex-direction: row-reverse; - gap: 3rem; + gap: 0.5em; position: relative; } @@ -30,11 +30,28 @@ margin-bottom: 0; } -.cv ol, -.cv ul { +.cvContent ol, +.cvContent ul { padding: 0 1rem; } +.skillList { + font-size: 0.8em; + display: flex; + flex-wrap: wrap; + gap: 0.2em; +} + +.skillList span { + background-color: var(--dark); + color: var(--light); + padding: 0 0.5em; +} + +.experienceContent > p { + margin-bottom: 0; +} + @media screen and (max-width: 768px) { .cvContent { display: block; @@ -47,10 +64,6 @@ } @media print { - .cvContent { - gap: 1rem; - } - .cvContent .experience { flex-basis: 80%; } diff --git a/src/styles/globals.css b/src/styles/globals.css index 9ba65c1..97f43f8 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -37,7 +37,7 @@ td:first-child { } body { - font-size: 12px; + font-size: 11.5px; line-height: 1.3; padding: 0; }