diff --git a/package-lock.json b/package-lock.json index c50a96c6..50c4d649 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "7.1.2", + "version": "7.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "7.1.2", + "version": "7.2.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", @@ -7280,9 +7280,9 @@ } }, "node_modules/uc.micro": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.0.0.tgz", - "integrity": "sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", "dev": true }, "node_modules/uglify-js": { diff --git a/package.json b/package.json index dd853c0e..c5ded783 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "7.1.5", + "version": "7.2.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/assets/styles/components/banners.css b/src/assets/styles/components/banners.css index e8e03783..238cf383 100644 --- a/src/assets/styles/components/banners.css +++ b/src/assets/styles/components/banners.css @@ -1,6 +1,6 @@ .banner { - margin: var(--spacing-base) 0; - padding: .75rem; + margin: var(--sizing-base) 0; + padding: var(--sizing-md); border: 1px solid; border-radius: var(--rounded-lg); } diff --git a/src/assets/styles/components/forms.css b/src/assets/styles/components/forms.css index f2f88d3f..2089e2cc 100644 --- a/src/assets/styles/components/forms.css +++ b/src/assets/styles/components/forms.css @@ -12,14 +12,14 @@ textarea { color: var(--text-color) !important; background-color: var(--background-color) !important; border: 1px solid var(--accent-color) !important; - padding: .5rem !important; + padding: var(--sizing-sm) !important; font-size: var(--font-size-base) !important; width: 100% !important; border-radius: var(--rounded-md) !important; /* necessary for pagefind overrides */ outline: none; - margin-bottom: var(--spacing-base); + margin-bottom: var(--sizing-base); font-weight: 400 !important; line-height: var(--line-height-base); transition-property: border-color; @@ -36,8 +36,8 @@ textarea:focus { button:not(.theme__toggle, .share, .pagefind-ui__search-clear) { border-radius: var(--rounded-full); - padding: .5rem 1rem; - margin: 0 .25rem .75rem 0; + padding: var(--sizing-sm) var(--sizing-lg); + margin: 0 var(--sizing-xs) var(--sizing-md) 0; cursor: pointer; display: inline-flex; flex-direction: row; diff --git a/src/assets/styles/components/mastodon-post.css b/src/assets/styles/components/mastodon-post.css index 2f2b9122..6d4249ee 100644 --- a/src/assets/styles/components/mastodon-post.css +++ b/src/assets/styles/components/mastodon-post.css @@ -1,7 +1,7 @@ .mastodon-post-wrapper { border-bottom: 1px solid var(--gray-light); - margin-bottom: var(--spacing-base); - padding-bottom: .25rem; + margin-bottom: var(--sizing-base); + padding-bottom: var(--sizing-xs); } dl { @@ -10,9 +10,9 @@ dl { } dd { - margin-left: .25rem; + margin-left: var(--sizing-xs); } dd:not(:last-child) { - margin-right: 1rem; + margin-right: var(--sizing-lg); } \ No newline at end of file diff --git a/src/assets/styles/components/media-grid.css b/src/assets/styles/components/media-grid.css index 2fb53c09..9d4ab00a 100644 --- a/src/assets/styles/components/media-grid.css +++ b/src/assets/styles/components/media-grid.css @@ -5,12 +5,12 @@ } .now__section--header { - margin: 2rem 0 1rem; + margin: var(--sizing-3xl) 0 var(--sizing-lg); } .media__grid { display: grid; - gap: .5rem; + gap: var(--sizing-sm); } .media__grid.square { diff --git a/src/assets/styles/components/pagefind.css b/src/assets/styles/components/pagefind.css index 6f3b1b8f..5845c786 100644 --- a/src/assets/styles/components/pagefind.css +++ b/src/assets/styles/components/pagefind.css @@ -1,5 +1,5 @@ .pagefind-ui { - margin-bottom: var(--spacing-base); + margin-bottom: var(--sizing-base); --pagefind-ui-primary: var(--accent-color); --pagefind-ui-text: var(--text-color); --pagefind-ui-background: var(--color-lightest); @@ -67,7 +67,7 @@ } .pagefind-ui__result-title { - margin-bottom: .25rem !important; + margin-bottom: var(--sizing-xs) !important; } .pagefind-ui__result-link { @@ -86,8 +86,8 @@ color: var(--color-lightest) !important; line-height: var(--line-height-base); border-radius: var(--rounded-full) !important; - padding: .5rem 1rem !important; - margin: 0 .25rem .75rem 0; + padding: var(--sizing-sm) var(--sizing-lg) !important; + margin: 0 var(--sizing-xs) var(--sizing-md) 0; cursor: pointer !important; height: unset !important; text-decoration: none; diff --git a/src/assets/styles/components/popular-posts.css b/src/assets/styles/components/popular-posts.css index 99107366..94d70ede 100644 --- a/src/assets/styles/components/popular-posts.css +++ b/src/assets/styles/components/popular-posts.css @@ -1,3 +1,3 @@ .popular-posts h2 { - margin: var(--spacing-base) 0; + margin: var(--sizing-base) 0; } \ No newline at end of file diff --git a/src/assets/styles/components/post-graph.css b/src/assets/styles/components/post-graph.css index 5fb24a17..69a8dc8d 100644 --- a/src/assets/styles/components/post-graph.css +++ b/src/assets/styles/components/post-graph.css @@ -1,12 +1,12 @@ .post-graph { - margin-top: var(--spacing-base); - margin-bottom: var(--spacing-base); + margin-top: var(--sizing-base); + margin-bottom: var(--sizing-base); } .post-graph__wrapper { display: flex; align-items: center; - height: 2rem; + height: var(--sizing-3xl); margin-bottom: .375rem; } diff --git a/src/assets/styles/components/progress-bar.css b/src/assets/styles/components/progress-bar.css index 2f74320b..1247253d 100644 --- a/src/assets/styles/components/progress-bar.css +++ b/src/assets/styles/components/progress-bar.css @@ -3,9 +3,9 @@ background-color: rgba(217, 222, 228, .6); border-radius: var(--rounded-lg); overflow: hidden; - height: 1rem; + height: var(--sizing-lg); width: 100%; - margin-bottom: .25rem; + margin-bottom: var(--sizing-xs); } .progress-bar { diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index 59e02db4..23ab5f4a 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -21,14 +21,14 @@ html { p, blockquote { line-height: var(--line-height-lg); - margin: var(--spacing-base) 0; + margin: var(--sizing-base) 0; } blockquote { font-size: var(--font-size-lg); padding-left: .875rem; color: var(--gray-dark); - border-left: .25rem solid var(--gray-dark); + border-left: var(--sizing-xs) solid var(--gray-dark); word-break: break-word; } @@ -37,7 +37,7 @@ blockquote { } :is(h1, h2, h3, h4, h5, h6) > svg { - margin-right: .25rem; + margin-right: var(--sizing-xs); stroke-width: var(--stroke-width-bold) !important; } @@ -111,7 +111,7 @@ hr { } hr.large__spacing { - margin: 1.25rem 0; + margin: var(--sizing-base) 0; } /* tables */ @@ -161,7 +161,7 @@ th { /* header */ .main__title { width: 100%; - padding-top: 2rem; + padding-top: var(--sizing-3xl); display: flex; flex-direction: column; } @@ -236,7 +236,7 @@ nav ul li .active svg:hover { /* layout */ .default__wrapper { - padding-top: 2rem; + padding-top: var(--sizing-3xl); } .main__wrapper { @@ -256,7 +256,7 @@ main { .now__topper, article { border-bottom: 1px solid var(--gray-light); - margin-bottom: 1.25rem; + margin-bottom: var(--sizing-base); } .now__topper p:first-child { @@ -265,8 +265,8 @@ article { footer nav:first-child { gap: .6rem; - margin-top: 2rem; - padding: 2rem 0 1rem; + margin-top: var(--sizing-3xl); + padding: var(--sizing-3xl) 0 var(--sizing-lg); width: 100%; } @@ -275,19 +275,19 @@ footer nav:first-child svg { } footer nav:first-child a { - width: 1.5rem; - height: 1.5rem; + width: var(--sizing-xl); + height: var(--sizing-xl); } footer nav:last-child { font-size: var(--font-size-sm); line-height: var(--line-height-sm); - padding-bottom: 2rem; + padding-bottom: var(--sizing-3xl); } footer nav:last-child span:not(.active) { - margin-left: .25rem; - margin-right: .25rem; + margin-left: var(--sizing-xs); + margin-right: var(--sizing-xs); } :is(.main__title, footer nav:last-child) a { @@ -298,11 +298,11 @@ footer nav:last-child span:not(.active) { .highlight-text { color: var(--color-lightest); background-color: var(--accent-color); - padding: .25rem; + padding: var(--sizing-xs); } code { - padding: .25rem; + padding: var(--sizing-xs); color: var(--text-color-inverted); background-color: var(--background-color-inverted); } @@ -328,11 +328,11 @@ article time { color: var(--gray-dark); font-size: var(--font-size-sm); line-height: var(--line-height-sm); - margin-right: .25rem; + margin-right: var(--sizing-xs); } article [rel="author"] { - margin-bottom: .25rem; + margin-bottom: var(--sizing-xs); } article p:first-of-type { @@ -357,8 +357,8 @@ svg { } .icon--small > svg { - width: 1rem; - height: 1rem; + width: var(--sizing-lg); + height: var(--sizing-lg); } .icon--center__vertical > svg { @@ -369,13 +369,13 @@ svg { /* lists */ ul, ol { list-style-position: inside; - margin: var(--spacing-base) 0; - padding-left: var(--spacing-base); + margin: var(--sizing-base) 0; + padding-left: var(--sizing-base); } li { - margin-top: 1rem; - margin-bottom: 1rem; + margin-top: var(--sizing-lg); + margin-bottom: var(--sizing-lg); } .link__list li { @@ -457,7 +457,7 @@ li { } nav ul li:not(:last-child) { - margin-right: .75rem; + margin-right: var(--sizing-md); } main { @@ -471,19 +471,19 @@ li { } article h2 { - margin: 0 0 .25rem; + margin: 0 0 var(--sizing-xs); } article p:first-of-type { - margin-top: .75rem; + margin-top: var(--sizing-md); } .tag:not(:last-child) { - margin-right: .5rem; - margin-bottom: .5rem; + margin-right: var(--sizing-sm); + margin-bottom: var(--sizing-sm); } footer nav:first-child { - gap: .75rem; + gap: var(--sizing-md); } } \ No newline at end of file diff --git a/src/assets/styles/pages/404.css b/src/assets/styles/pages/404.css index d18e8271..b1aa5531 100644 --- a/src/assets/styles/pages/404.css +++ b/src/assets/styles/pages/404.css @@ -1,4 +1,4 @@ .four-oh-four__wrapper .image__banner, .four-oh-four__wrapper a { - margin-bottom: var(--spacing-base); + margin-bottom: var(--sizing-base); } \ No newline at end of file diff --git a/src/assets/styles/pages/about.css b/src/assets/styles/pages/about.css index aeb1cb21..6fc1d439 100644 --- a/src/assets/styles/pages/about.css +++ b/src/assets/styles/pages/about.css @@ -3,7 +3,7 @@ } .avatar__wrapper { - margin-bottom: 1.5rem; + margin-bottom: var(--sizing-xl); width: 100%; } @@ -13,7 +13,7 @@ border: 1px solid var(--accent-color); border-radius: var(--rounded-full); display: flex; - padding: 1rem; + padding: var(--sizing-lg); background-color: var(--color-lightest); } diff --git a/src/assets/styles/pages/blogroll.css b/src/assets/styles/pages/blogroll.css index 0a9d24a1..a4d8bb01 100644 --- a/src/assets/styles/pages/blogroll.css +++ b/src/assets/styles/pages/blogroll.css @@ -1,16 +1,15 @@ :root { --grid: repeat(1,minmax(0,1fr)); - --blog-roll-spacing: .75rem; } .blog__banner--grid { display: grid; - gap: .5rem; + gap: var(--sizing-sm); grid-template-columns: var(--grid); } .blog__banner { - padding: var(--blog-roll-spacing); + padding: var(--sizing-md); border: 1px solid var(--gray-light); border-radius: var(--rounded-lg); display: flex; @@ -21,7 +20,7 @@ .blog__banner > p, .blog__banner .meta { margin-top: 0; - margin-bottom: var(--blog-roll-spacing); + margin-bottom: var(--sizing-md); } .blog__banner > strong { diff --git a/src/assets/styles/pages/contact.css b/src/assets/styles/pages/contact.css index d829534a..b12fd7d0 100644 --- a/src/assets/styles/pages/contact.css +++ b/src/assets/styles/pages/contact.css @@ -9,7 +9,7 @@ } .contact__wrapper .column.contact__description { - margin-bottom: 1.5rem; + margin-bottom: var(--sizing-xl); } .contact__wrapper .column.contact__description p:first-child { @@ -26,7 +26,7 @@ } .contact__wrapper .column.contact__description { - padding-right: 1.5rem; + padding-right: var(--sizing-xl); margin-bottom: 0; } } \ No newline at end of file diff --git a/src/assets/styles/pages/links.css b/src/assets/styles/pages/links.css index 36564705..6665fb22 100644 --- a/src/assets/styles/pages/links.css +++ b/src/assets/styles/pages/links.css @@ -1,5 +1,5 @@ .link__list { padding-left: 0; margin-top: 0; - margin-bottom: 2rem; + margin-bottom: var(--sizing-3xl); } \ No newline at end of file diff --git a/src/assets/styles/pages/now.css b/src/assets/styles/pages/now.css index bf562715..733065ff 100644 --- a/src/assets/styles/pages/now.css +++ b/src/assets/styles/pages/now.css @@ -1,22 +1,21 @@ /* now */ .now__section--text { - padding-left: 1rem; + padding-left: var(--sizing-base); } .now__section--text p { - margin-top: .25rem; - margin-bottom: .25rem; + margin: var(--sizing-xs) 0; } .now__section--text p > svg { display: inline; vertical-align: middle; - height: var(--spacing-base); - width: var(--spacing-base); + height: var(--sizing-base); + width: var(--sizing-base); } .now__section--header { - margin: 2rem 0 1rem; + margin: var(--sizing-3xl) 0 var(--sizing-lg); } .now__section--header:first-of-type { @@ -26,11 +25,11 @@ .now__explainer { font-size: var(--font-size-xs); line-height: var(--line-height-xs); - padding-top: 1rem; + padding-top: var(--sizing-lg); } @media screen and (min-width: 768px) { .now__section--text { - padding-left: 2rem; + padding-left: var(--sizing-3xl); } } \ No newline at end of file diff --git a/src/assets/styles/pages/post.css b/src/assets/styles/pages/post.css index 2f8652f4..57c91595 100644 --- a/src/assets/styles/pages/post.css +++ b/src/assets/styles/pages/post.css @@ -1,11 +1,11 @@ /* embeds */ .eleventy-plugin-youtube-embed { - margin-bottom: 1rem; + margin-bottom: var(--sizing-lg); } /* footnotes */ hr.footnotes-sep { - margin: var(--spacing-base) 0; + margin: var(--sizing-base) 0; } .footnotes-list { @@ -18,7 +18,7 @@ hr.footnotes-sep { } .footnotes { - padding-bottom: 1.25rem; + padding-bottom: var(--sizing-base); } .footnote-item > p { diff --git a/src/assets/styles/partials/vars.css b/src/assets/styles/partials/vars.css index 75bc13a8..3ba82bd5 100644 --- a/src/assets/styles/partials/vars.css +++ b/src/assets/styles/partials/vars.css @@ -80,9 +80,16 @@ --font-size-3xl: 1.875rem; --line-height-3xl: 2.25rem; - + /* spacing */ - --spacing-base: 1.25rem; + --sizing-xs: .25rem; + --sizing-sm: .5rem; + --sizing-md: .75rem; + --sizing-lg: 1rem; + --sizing-base: 1.25rem; + --sizing-xl: 1.5rem; + --sizing-2xl: 1.75rem; + --sizing-3xl: 2rem; /* radii */ --rounded-none: 0;