From 03a81158a588fc009b57de04fc4374202f2d3c09 Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Sun, 14 Jan 2024 12:58:08 -0500 Subject: [PATCH] Update on-site cv display to match theme --- .github/workflows/publish.yml | 2 +- content/cv/print/01currently.md | 1 + content/cv/print/021odu.md | 1 + content/cv/print/022temple.md | 1 + content/cv/print/023uofm.md | 1 + content/cv/print/02education.md | 1 + content/cv/print/031redventures.md | 1 + content/cv/print/035csios.md | 1 + content/cv/print/036fordcredit.md | 1 + content/cv/print/038navy.md | 1 + content/cv/print/039canonical.md | 1 + content/cv/print/03workhistory.md | 1 + content/cv/print/04projects.md | 1 + content/cv/print/_index.md | 4 + sass/cv.scss | 22 ++-- sass/style.scss | 193 +++++++++++++++++++++++++---- templates/cv.html | 8 +- templates/printcv.html | 38 ++++++ templates/site.html | 2 +- 19 files changed, 245 insertions(+), 36 deletions(-) create mode 120000 content/cv/print/01currently.md create mode 120000 content/cv/print/021odu.md create mode 120000 content/cv/print/022temple.md create mode 120000 content/cv/print/023uofm.md create mode 120000 content/cv/print/02education.md create mode 120000 content/cv/print/031redventures.md create mode 120000 content/cv/print/035csios.md create mode 120000 content/cv/print/036fordcredit.md create mode 120000 content/cv/print/038navy.md create mode 120000 content/cv/print/039canonical.md create mode 120000 content/cv/print/03workhistory.md create mode 120000 content/cv/print/04projects.md create mode 100644 content/cv/print/_index.md create mode 100644 templates/printcv.html diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b9c8334..3b9c254 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: --no-pdf-header-footer \ --print-to-pdf-no-header \ --print-to-pdf=static/alexlauni-resume.pdf \ - http://localhost:1111/cv + http://localhost:1111/cv/print kill $ZOLA_PID - name: Print github.ref (debugging) diff --git a/content/cv/print/01currently.md b/content/cv/print/01currently.md new file mode 120000 index 0000000..6036c5d --- /dev/null +++ b/content/cv/print/01currently.md @@ -0,0 +1 @@ +../01currently.md \ No newline at end of file diff --git a/content/cv/print/021odu.md b/content/cv/print/021odu.md new file mode 120000 index 0000000..2cec48a --- /dev/null +++ b/content/cv/print/021odu.md @@ -0,0 +1 @@ +../021odu.md \ No newline at end of file diff --git a/content/cv/print/022temple.md b/content/cv/print/022temple.md new file mode 120000 index 0000000..2ec6035 --- /dev/null +++ b/content/cv/print/022temple.md @@ -0,0 +1 @@ +../022temple.md \ No newline at end of file diff --git a/content/cv/print/023uofm.md b/content/cv/print/023uofm.md new file mode 120000 index 0000000..8601473 --- /dev/null +++ b/content/cv/print/023uofm.md @@ -0,0 +1 @@ +../023uofm.md \ No newline at end of file diff --git a/content/cv/print/02education.md b/content/cv/print/02education.md new file mode 120000 index 0000000..b379201 --- /dev/null +++ b/content/cv/print/02education.md @@ -0,0 +1 @@ +../02education.md \ No newline at end of file diff --git a/content/cv/print/031redventures.md b/content/cv/print/031redventures.md new file mode 120000 index 0000000..62ad52d --- /dev/null +++ b/content/cv/print/031redventures.md @@ -0,0 +1 @@ +../031redventures.md \ No newline at end of file diff --git a/content/cv/print/035csios.md b/content/cv/print/035csios.md new file mode 120000 index 0000000..43a92ae --- /dev/null +++ b/content/cv/print/035csios.md @@ -0,0 +1 @@ +../035csios.md \ No newline at end of file diff --git a/content/cv/print/036fordcredit.md b/content/cv/print/036fordcredit.md new file mode 120000 index 0000000..7d1dc9a --- /dev/null +++ b/content/cv/print/036fordcredit.md @@ -0,0 +1 @@ +../036fordcredit.md \ No newline at end of file diff --git a/content/cv/print/038navy.md b/content/cv/print/038navy.md new file mode 120000 index 0000000..6440f25 --- /dev/null +++ b/content/cv/print/038navy.md @@ -0,0 +1 @@ +../038navy.md \ No newline at end of file diff --git a/content/cv/print/039canonical.md b/content/cv/print/039canonical.md new file mode 120000 index 0000000..54ec208 --- /dev/null +++ b/content/cv/print/039canonical.md @@ -0,0 +1 @@ +../039canonical.md \ No newline at end of file diff --git a/content/cv/print/03workhistory.md b/content/cv/print/03workhistory.md new file mode 120000 index 0000000..2da858f --- /dev/null +++ b/content/cv/print/03workhistory.md @@ -0,0 +1 @@ +../03workhistory.md \ No newline at end of file diff --git a/content/cv/print/04projects.md b/content/cv/print/04projects.md new file mode 120000 index 0000000..4aea44c --- /dev/null +++ b/content/cv/print/04projects.md @@ -0,0 +1 @@ +../04projects.md \ No newline at end of file diff --git a/content/cv/print/_index.md b/content/cv/print/_index.md new file mode 100644 index 0000000..98750a3 --- /dev/null +++ b/content/cv/print/_index.md @@ -0,0 +1,4 @@ ++++ +title = "Alex Launi" +template = "printcv.html" ++++ diff --git a/sass/cv.scss b/sass/cv.scss index fdd1686..35573c3 100644 --- a/sass/cv.scss +++ b/sass/cv.scss @@ -91,6 +91,7 @@ video { font: inherit; vertical-align: baseline; } + /* HTML5 display-role reset for older browsers */ article, aside, @@ -109,15 +110,18 @@ section { body { line-height: 0.75; } + ol, ul { list-style: none; margin-bottom: 0.25em; } + blockquote, q { quotes: none; } + blockquote:before, blockquote:after, q:before, @@ -125,6 +129,7 @@ q:after { content: ''; content: none; } + table { border-collapse: collapse; border-spacing: 0; @@ -152,7 +157,7 @@ grid { justify-self: flex-end; } -.content { +.cv-content { grid-area: content; display: flex; flex-direction: row; @@ -170,7 +175,7 @@ grid { $shadow-color-dark: #e84118; display: inline-block; - h1 { + h1 { margin: 0; font-size: 64px; position: relative; @@ -223,13 +228,13 @@ grid { display: none; } -.wrapper { +.cv-wrapper { display: grid; grid-gap: 0px; - grid-template-columns: 18% auto 15%; + grid-template-columns: 18% auto; grid-template-areas: - '....... header header' - 'sidebar content timespan'; + '....... header' + 'sidebar content'; grid-auto-rows: min-content; } @@ -276,7 +281,7 @@ h1 { line-height: 1em; } -h1 + p { +h1+p { /*subtitle*/ font-style: italic; font-size: 110%; @@ -365,6 +370,7 @@ li ul { } font-size: x-small; + ul li { display: inline; } @@ -383,4 +389,4 @@ li ul { text-decoration: none; font-size: xx-small; } -} +} \ No newline at end of file diff --git a/sass/style.scss b/sass/style.scss index 98bde13..5a4dc90 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -1,8 +1,9 @@ * { - box-sizing: border-box; + box-sizing: border-box; } -:after, :before { +:after, +:before { box-sizing: inherit; } @@ -74,7 +75,7 @@ body { --color-selection-bg: var(--color-light-selection); background-color: var(--color-light); line-height: 1.75; - font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; margin: 0; padding: 0; } @@ -98,13 +99,13 @@ body { } } -.nav { +.nav { background-color: var(--color-light); display: flex; align-items: center; align-content: center; justify-content: center; - font-family: Mosk,sans-serif; + font-family: Mosk, sans-serif; font-size: .8rem; font-weight: 600; } @@ -130,7 +131,7 @@ body { } .nav__item a:hover { - text-decoration:overline; + text-decoration: overline; } .nav__item-hover { @@ -148,6 +149,7 @@ body { font-size: 1rem; } } + .theme-switch { display: inline-block; height: 25px; @@ -156,7 +158,7 @@ body { } .theme-switch input { - display:none; + display: none; } .slider { @@ -181,11 +183,11 @@ body { width: 17px; } -input:checked + .slider { +input:checked+.slider { background-color: var(--color-peach); } -input:checked + .slider:before { +input:checked+.slider:before { transform: translateX(20px); } @@ -196,17 +198,17 @@ input:checked + .slider:before { .slider.round:before { border-radius: 50%; } - + main:after { content: ""; position: fixed; top: calc(80% - 100px); left: 25px; width: 500px; - height:2000px; + height: 2000px; background: var(--color-rose); transform: skew(-25deg); - transform-origin:top; + transform-origin: top; z-index: -1; } @@ -290,6 +292,7 @@ main { border: solid 3px var(--color-dark); z-index: -1; } + @media screen and (min-width: 800px) { .Intro__inner { display: flex; @@ -316,15 +319,15 @@ main { @media screen and (min-width: 800px) { .Intro__heading { border: none; - } + } } .Intro__heading { display: inline; - background-image: linear-gradient(transparent 0,transparent 55%,var(--color-sherbet) 55%,var(--color-sherbet) 90%,transparent 90%,transparent 100%); + background-image: linear-gradient(transparent 0, transparent 55%, var(--color-sherbet) 55%, var(--color-sherbet) 90%, transparent 90%, transparent 100%); background-repeat: no-repeat; background-size: 100%; - animation: underline .5s 1s cubic-bezier(.645,.045,.355,1) forwards; + animation: underline .5s 1s cubic-bezier(.645, .045, .355, 1) forwards; } @media screen and (min-width: 800px) { @@ -385,7 +388,7 @@ svg { float: right; } -.doglist > .gritty { +.doglist>.gritty { color: var(--color-gritty); } @@ -405,26 +408,46 @@ code { } } -.h3, h1 { +.h3, +h1 { line-height: 1.2; } -h1, h2, h3 { - font-family: Mosk,sans-serif; +h1, +h2, +h3 { + font-family: Mosk, sans-serif; letter-spacing: .04em; } -.h6, h4, h5, h6 { +.h6, +h4, +h5, +h6 { letter-spacing: .02em; line-height: 1.8; } -body, dd, dl, dt, figcaption, figure, h1, h2, h3, h4, li, ol, p, ul { +body, +dd, +dl, +dt, +figcaption, +figure, +h1, +h2, +h3, +h4, +li, +ol, +p, +ul { margin: 0; padding: 0; } -ol[class], ul[class] { +ol[class], +ul[class] { list-style: none; } @@ -490,6 +513,132 @@ ol[class], ul[class] { .align-right { margin-left: auto; } + .align-center { align-items: center; } + +grid { + display: grid; + grid-auto-rows: auto; +} + +.sidebar { + grid-area: sidebar; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: flex-start; + align-items: flex-end; +} + +.timespan { + grid-area: timespan; + display: flex; + justify-self: flex-end; +} + +.cv-content { + grid-area: content; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: space-between; + text-align: left; +} + +.header { + grid-area: header; +} + +.printonly { + display: none; +} + +.cv-wrapper { + display: grid; + grid-gap: 0px; + grid-template-columns: 18% auto 15%; + grid-template-areas: + '....... header header' + 'sidebar content timespan'; + grid-auto-rows: min-content; + + line-height: 1.5em; + margin: 1em; + + .box { + padding: 5px 20px 5px 20px; + } + + .timespan { + text-align: right; + } + + code { + font: normal normal; + font-size: 90%; + /*line-height: 1em;*/ + font-family: Monaco, Menlo, monospace, sans-serif; + + } + + p code { + text-align: right; + } + + h1, + h2, + h3, + h4 { + font-weight: 400; + } + + h1 { + text-align: left; + font-size: 3em; + line-height: 1em; + } + + h1+p { + /*subtitle*/ + font-style: italic; + font-size: 110%; + } + + h2, + h3 { + padding-bottom: 7px; + } + + h2 { + text-align: right; + font-size: 1.3em; + color: var(--color-gritty); + word-wrap: break-word; + } + + h3 { + font-size: 1em; + text-align: right; + } + + em { + /* font-weight: bold; */ + font-style: italic; + } + + strong { + font-weight: 600; + } + + a { + color: inherit; + /*text-decoration:none*/ + } + + li ul { + text-align: justify; + margin-top: 0.25em; + } +} \ No newline at end of file diff --git a/templates/cv.html b/templates/cv.html index 8c98b81..185fec6 100644 --- a/templates/cv.html +++ b/templates/cv.html @@ -1,8 +1,8 @@ -{% extends "cv-base.html" %} +{% extends "site.html" %} {% block content %} {% for segment in section.pages | sort(attribute="extra.weight") %} -
+
{% if segment.extra.weight % 100 == 0 %}

{{ segment.title }}

@@ -26,7 +26,7 @@

{{ desc }}

{% endif %} {{ segment.extra.timespan }}
-
+
{{ segment.content | safe }}
@@ -35,4 +35,4 @@

{{ desc }}

{% endfor %} -{% endblock content %} +{% endblock content %} \ No newline at end of file diff --git a/templates/printcv.html b/templates/printcv.html new file mode 100644 index 0000000..1b30546 --- /dev/null +++ b/templates/printcv.html @@ -0,0 +1,38 @@ +{% extends "cv-base.html" %} +{% block content %} + +{% for segment in section.pages | sort(attribute="extra.weight") %} +
+
+ {% if segment.extra.weight % 100 == 0 %} +

{{ segment.title }}

+ {% else %} +

{{ segment.title }}

+ {% endif %} + {% set desc = segment.extra.desc -%} + {% if desc != '' %} +

{{ desc }}

+ {% endif %} {% set location = segment.extra.location -%} {% if location != '' %} +

+ {{ location }} +

+ {% endif %} + {% set gpa = segment.extra.gpa %} {% if gpa != '' %} +

+ + GPA: {{ gpa }} + +

+ {% endif %} + {{ segment.extra.timespan }} +
+
+ {{ segment.content | safe }} +
+
+

{{ segment.extra.timespan }}

+
+
+{% endfor %} + +{% endblock content %} \ No newline at end of file diff --git a/templates/site.html b/templates/site.html index e63ff93..b7b1ed0 100644 --- a/templates/site.html +++ b/templates/site.html @@ -62,7 +62,7 @@
-
+