diff --git a/.github/workflows/build-theme.yml b/.github/workflows/build-theme.yml index 81fa9c3..e4ed330 100644 --- a/.github/workflows/build-theme.yml +++ b/.github/workflows/build-theme.yml @@ -8,7 +8,7 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: "${{ github.head_ref }}" - name: Install dependencies and Build Theme diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 79335b6..7f2b4d8 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -13,7 +13,7 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 4722561..f91cd41 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -10,7 +10,7 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cb9c2c..78236e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.3.1] - 2023-09-10 + +### Changed + +- Upgrade to Tailwind v3.3.3 ([#77](https://github.com/jpanther/lynx/pull/77)) +- Upgrade to Typography v0.5.10 ([#90](https://github.com/jpanther/lynx/pull/90)) + ## [1.3.0] - 2023-06-04 ### Added @@ -93,7 +100,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fathom Analytics and Google Analytics support - Favicons support -[Unreleased]: https://github.com/jpanther/lynx/compare/v1.3.0...HEAD +[Unreleased]: https://github.com/jpanther/lynx/compare/v1.3.1...HEAD +[1.3.1]: https://github.com/jpanther/lynx/compare/v1.3.0...v1.3.1 [1.3.0]: https://github.com/jpanther/lynx/compare/v1.2.4...v1.3.0 [1.2.4]: https://github.com/jpanther/lynx/compare/v1.2.3...v1.2.4 [1.2.3]: https://github.com/jpanther/lynx/compare/v1.2.2...v1.2.3 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 6705316..7823e7c 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,6 +1,6 @@ /*! Lynx v1.3.0 | MIT License | https://github.com/jpanther/lynx */ -/*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */ /* 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) @@ -31,6 +31,7 @@ 3. Use a more readable tab size. 4. Use the user's configured `sans` font-family by default. 5. Use the user's configured `sans` font-feature-settings by default. +6. Use the user's configured `sans` font-variation-settings by default. */ html { @@ -47,6 +48,8 @@ html { /* 4 */ font-feature-settings: normal; /* 5 */ + font-variation-settings: normal; + /* 6 */ } /* @@ -188,6 +191,10 @@ select, textarea { font-family: inherit; /* 1 */ + font-feature-settings: inherit; + /* 1 */ + font-variation-settings: inherit; + /* 1 */ font-size: 100%; /* 1 */ font-weight: inherit; @@ -338,6 +345,14 @@ menu { padding: 0; } +/* +Reset default styling for dialogs. +*/ + +dialog { + padding: 0; +} + /* Prevent resizing textareas horizontally by default. */ @@ -433,6 +448,9 @@ video { --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -480,6 +498,9 @@ video { --tw-pan-y: ; --tw-pinch-zoom: ; --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; --tw-ordinal: ; --tw-slashed-zero: ; --tw-numeric-figure: ; @@ -518,12 +539,12 @@ video { max-width: 65ch; } -.prose :where(p):not(:where([class~="not-prose"] *)) { +.prose :where(p):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 1.25em; margin-bottom: 1.25em; } -.prose :where([class~="lead"]):not(:where([class~="not-prose"] *)) { +.prose :where([class~="lead"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-lead); font-size: 1.25em; line-height: 1.6; @@ -531,103 +552,109 @@ video { margin-bottom: 1.2em; } -.prose :where(a):not(:where([class~="not-prose"] *)) { +.prose :where(a):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-links); text-decoration: underline; font-weight: 500; text-decoration-color: #d8b4fe; } -.prose :where(a):not(:where([class~="not-prose"] *)):hover { +.prose :where(a):not(:where([class~="not-prose"],[class~="not-prose"] *)):hover { text-decoration: none; background-color: #9333ea; border-radius: 0.09rem; } -.prose :where(strong):not(:where([class~="not-prose"] *)) { +.prose :where(strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-bold); font-weight: 600; } -.prose :where(a strong):not(:where([class~="not-prose"] *)) { +.prose :where(a strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(blockquote strong):not(:where([class~="not-prose"] *)) { +.prose :where(blockquote strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(thead th strong):not(:where([class~="not-prose"] *)) { +.prose :where(thead th strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(ol):not(:where([class~="not-prose"] *)) { +.prose :where(ol):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: decimal; margin-top: 1.25em; margin-bottom: 1.25em; padding-left: 1.625em; } -.prose :where(ol[type="A"]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="A"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: upper-alpha; } -.prose :where(ol[type="a"]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="a"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: lower-alpha; } -.prose :where(ol[type="A" s]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="A" s]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: upper-alpha; } -.prose :where(ol[type="a" s]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="a" s]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: lower-alpha; } -.prose :where(ol[type="I"]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="I"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: upper-roman; } -.prose :where(ol[type="i"]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="i"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: lower-roman; } -.prose :where(ol[type="I" s]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="I" s]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: upper-roman; } -.prose :where(ol[type="i" s]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="i" s]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: lower-roman; } -.prose :where(ol[type="1"]):not(:where([class~="not-prose"] *)) { +.prose :where(ol[type="1"]):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: decimal; } -.prose :where(ul):not(:where([class~="not-prose"] *)) { +.prose :where(ul):not(:where([class~="not-prose"],[class~="not-prose"] *)) { list-style-type: disc; margin-top: 1.25em; margin-bottom: 1.25em; padding-left: 1.625em; } -.prose :where(ol > li):not(:where([class~="not-prose"] *))::marker { +.prose :where(ol > li):not(:where([class~="not-prose"],[class~="not-prose"] *))::marker { font-weight: 400; color: var(--tw-prose-counters); } -.prose :where(ul > li):not(:where([class~="not-prose"] *))::marker { +.prose :where(ul > li):not(:where([class~="not-prose"],[class~="not-prose"] *))::marker { color: var(--tw-prose-bullets); } -.prose :where(hr):not(:where([class~="not-prose"] *)) { +.prose :where(dt):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + color: var(--tw-prose-headings); + font-weight: 600; + margin-top: 1.25em; +} + +.prose :where(hr):not(:where([class~="not-prose"],[class~="not-prose"] *)) { border-color: var(--tw-prose-hr); border-top-width: 1px; margin-top: 3em; margin-bottom: 3em; } -.prose :where(blockquote):not(:where([class~="not-prose"] *)) { +.prose :where(blockquote):not(:where([class~="not-prose"],[class~="not-prose"] *)) { font-weight: 500; font-style: italic; color: var(--tw-prose-quotes); @@ -639,15 +666,15 @@ video { padding-left: 1em; } -.prose :where(blockquote p:first-of-type):not(:where([class~="not-prose"] *))::before { +.prose :where(blockquote p:first-of-type):not(:where([class~="not-prose"],[class~="not-prose"] *))::before { content: open-quote; } -.prose :where(blockquote p:last-of-type):not(:where([class~="not-prose"] *))::after { +.prose :where(blockquote p:last-of-type):not(:where([class~="not-prose"],[class~="not-prose"] *))::after { content: close-quote; } -.prose :where(h1):not(:where([class~="not-prose"] *)) { +.prose :where(h1):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-headings); font-weight: 800; font-size: 2.25em; @@ -656,12 +683,12 @@ video { line-height: 1.1111111; } -.prose :where(h1 strong):not(:where([class~="not-prose"] *)) { +.prose :where(h1 strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { font-weight: 900; color: inherit; } -.prose :where(h2):not(:where([class~="not-prose"] *)) { +.prose :where(h2):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-headings); font-weight: 700; font-size: 1.5em; @@ -670,12 +697,12 @@ video { line-height: 1.3333333; } -.prose :where(h2 strong):not(:where([class~="not-prose"] *)) { +.prose :where(h2 strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { font-weight: 800; color: inherit; } -.prose :where(h3):not(:where([class~="not-prose"] *)) { +.prose :where(h3):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-headings); font-weight: 600; font-size: 1.25em; @@ -684,12 +711,12 @@ video { line-height: 1.6; } -.prose :where(h3 strong):not(:where([class~="not-prose"] *)) { +.prose :where(h3 strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { font-weight: 700; color: inherit; } -.prose :where(h4):not(:where([class~="not-prose"] *)) { +.prose :where(h4):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-headings); font-weight: 600; margin-top: 1.5em; @@ -697,73 +724,82 @@ video { line-height: 1.5; } -.prose :where(h4 strong):not(:where([class~="not-prose"] *)) { +.prose :where(h4 strong):not(:where([class~="not-prose"],[class~="not-prose"] *)) { font-weight: 700; color: inherit; } -.prose :where(img):not(:where([class~="not-prose"] *)) { +.prose :where(img):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 2em; margin-bottom: 2em; } -.prose :where(figure > *):not(:where([class~="not-prose"] *)) { - margin-top: 0; - margin-bottom: 0; +.prose :where(picture):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + display: block; + margin-top: 2em; + margin-bottom: 2em; } -.prose :where(figcaption):not(:where([class~="not-prose"] *)) { - color: var(--tw-prose-captions); - font-size: 0.875em; - line-height: 1.4285714; - margin-top: 0.8571429em; +.prose :where(kbd):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + font-weight: 600; + font-family: inherit; + color: var(--tw-prose-kbd); + box-shadow: 0 0 0 1px rgb(var(--tw-prose-kbd-shadows) / 10%), 0 3px 0 rgb(var(--tw-prose-kbd-shadows) / 10%); + font-size: 0.9rem; + border-radius: 0.25rem; + padding-top: 0.1875em; + padding-right: 0.375em; + padding-bottom: 0.1875em; + padding-left: 0.375em; + background-color: #e5e7eb; + padding: 0.1rem 0.4rem; } -.prose :where(code):not(:where([class~="not-prose"] *)) { +.prose :where(code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-code); font-weight: 600; font-size: 0.875em; } -.prose :where(code):not(:where([class~="not-prose"] *))::before { +.prose :where(code):not(:where([class~="not-prose"],[class~="not-prose"] *))::before { content: "`"; } -.prose :where(code):not(:where([class~="not-prose"] *))::after { +.prose :where(code):not(:where([class~="not-prose"],[class~="not-prose"] *))::after { content: "`"; } -.prose :where(a code):not(:where([class~="not-prose"] *)) { +.prose :where(a code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-code); } -.prose :where(h1 code):not(:where([class~="not-prose"] *)) { +.prose :where(h1 code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(h2 code):not(:where([class~="not-prose"] *)) { +.prose :where(h2 code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; font-size: 0.875em; } -.prose :where(h3 code):not(:where([class~="not-prose"] *)) { +.prose :where(h3 code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; font-size: 0.9em; } -.prose :where(h4 code):not(:where([class~="not-prose"] *)) { +.prose :where(h4 code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(blockquote code):not(:where([class~="not-prose"] *)) { +.prose :where(blockquote code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(thead th code):not(:where([class~="not-prose"] *)) { +.prose :where(thead th code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: inherit; } -.prose :where(pre):not(:where([class~="not-prose"] *)) { +.prose :where(pre):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-pre-code); background-color: var(--tw-prose-pre-bg); overflow-x: auto; @@ -779,7 +815,7 @@ video { padding-left: 1.1428571em; } -.prose :where(pre code):not(:where([class~="not-prose"] *)) { +.prose :where(pre code):not(:where([class~="not-prose"],[class~="not-prose"] *)) { background-color: transparent; border-width: 0; border-radius: 0; @@ -791,15 +827,15 @@ video { line-height: inherit; } -.prose :where(pre code):not(:where([class~="not-prose"] *))::before { +.prose :where(pre code):not(:where([class~="not-prose"],[class~="not-prose"] *))::before { content: none; } -.prose :where(pre code):not(:where([class~="not-prose"] *))::after { +.prose :where(pre code):not(:where([class~="not-prose"],[class~="not-prose"] *))::after { content: none; } -.prose :where(table):not(:where([class~="not-prose"] *)) { +.prose :where(table):not(:where([class~="not-prose"],[class~="not-prose"] *)) { width: 100%; table-layout: auto; text-align: left; @@ -809,12 +845,12 @@ video { line-height: 1.7142857; } -.prose :where(thead):not(:where([class~="not-prose"] *)) { +.prose :where(thead):not(:where([class~="not-prose"],[class~="not-prose"] *)) { border-bottom-width: 1px; border-bottom-color: var(--tw-prose-th-borders); } -.prose :where(thead th):not(:where([class~="not-prose"] *)) { +.prose :where(thead th):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: var(--tw-prose-headings); font-weight: 600; vertical-align: bottom; @@ -823,28 +859,40 @@ video { padding-left: 0.5714286em; } -.prose :where(tbody tr):not(:where([class~="not-prose"] *)) { +.prose :where(tbody tr):not(:where([class~="not-prose"],[class~="not-prose"] *)) { border-bottom-width: 1px; border-bottom-color: var(--tw-prose-td-borders); } -.prose :where(tbody tr:last-child):not(:where([class~="not-prose"] *)) { +.prose :where(tbody tr:last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { border-bottom-width: 0; } -.prose :where(tbody td):not(:where([class~="not-prose"] *)) { +.prose :where(tbody td):not(:where([class~="not-prose"],[class~="not-prose"] *)) { vertical-align: baseline; } -.prose :where(tfoot):not(:where([class~="not-prose"] *)) { +.prose :where(tfoot):not(:where([class~="not-prose"],[class~="not-prose"] *)) { border-top-width: 1px; border-top-color: var(--tw-prose-th-borders); } -.prose :where(tfoot td):not(:where([class~="not-prose"] *)) { +.prose :where(tfoot td):not(:where([class~="not-prose"],[class~="not-prose"] *)) { vertical-align: top; } +.prose :where(figure > *):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + margin-top: 0; + margin-bottom: 0; +} + +.prose :where(figcaption):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + color: var(--tw-prose-captions); + font-size: 0.875em; + line-height: 1.4285714; + margin-top: 0.8571429em; +} + .prose { --tw-prose-body: #374151; --tw-prose-headings: #1f2937; @@ -857,6 +905,8 @@ video { --tw-prose-quotes: #374151; --tw-prose-quote-borders: #e9d5ff; --tw-prose-captions: #6b7280; + --tw-prose-kbd: #111827; + --tw-prose-kbd-shadows: 17 24 39; --tw-prose-code: #7e22ce; --tw-prose-pre-code: #374151; --tw-prose-pre-bg: #f9fafb; @@ -873,6 +923,8 @@ video { --tw-prose-invert-quotes: #e5e7eb; --tw-prose-invert-quote-borders: #581c87; --tw-prose-invert-captions: #9ca3af; + --tw-prose-invert-kbd: #fff; + --tw-prose-invert-kbd-shadows: 255 255 255; --tw-prose-invert-code: #c084fc; --tw-prose-invert-pre-code: #e5e7eb; --tw-prose-invert-pre-bg: #374151; @@ -882,111 +934,118 @@ video { line-height: 1.75; } -.prose :where(video):not(:where([class~="not-prose"] *)) { +.prose :where(picture > img):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + margin-top: 0; + margin-bottom: 0; +} + +.prose :where(video):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 2em; margin-bottom: 2em; } -.prose :where(figure):not(:where([class~="not-prose"] *)) { - margin-top: 2em; - margin-bottom: 2em; -} - -.prose :where(li):not(:where([class~="not-prose"] *)) { +.prose :where(li):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0.5em; margin-bottom: 0.5em; } -.prose :where(ol > li):not(:where([class~="not-prose"] *)) { +.prose :where(ol > li):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-left: 0.375em; } -.prose :where(ul > li):not(:where([class~="not-prose"] *)) { +.prose :where(ul > li):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-left: 0.375em; } -.prose :where(.prose > ul > li p):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > ul > li p):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0.75em; margin-bottom: 0.75em; } -.prose :where(.prose > ul > li > *:first-child):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > ul > li > *:first-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 1.25em; } -.prose :where(.prose > ul > li > *:last-child):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > ul > li > *:last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-bottom: 1.25em; } -.prose :where(.prose > ol > li > *:first-child):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > ol > li > *:first-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 1.25em; } -.prose :where(.prose > ol > li > *:last-child):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > ol > li > *:last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-bottom: 1.25em; } -.prose :where(ul ul, ul ol, ol ul, ol ol):not(:where([class~="not-prose"] *)) { +.prose :where(ul ul, ul ol, ol ul, ol ol):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0.75em; margin-bottom: 0.75em; } -.prose :where(hr + *):not(:where([class~="not-prose"] *)) { +.prose :where(dl):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + margin-top: 1.25em; + margin-bottom: 1.25em; +} + +.prose :where(dd):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + margin-top: 0.5em; + padding-left: 1.625em; +} + +.prose :where(hr + *):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0; } -.prose :where(h2 + *):not(:where([class~="not-prose"] *)) { +.prose :where(h2 + *):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0; } -.prose :where(h3 + *):not(:where([class~="not-prose"] *)) { +.prose :where(h3 + *):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0; } -.prose :where(h4 + *):not(:where([class~="not-prose"] *)) { +.prose :where(h4 + *):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0; } -.prose :where(thead th:first-child):not(:where([class~="not-prose"] *)) { +.prose :where(thead th:first-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-left: 0; } -.prose :where(thead th:last-child):not(:where([class~="not-prose"] *)) { +.prose :where(thead th:last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-right: 0; } -.prose :where(tbody td, tfoot td):not(:where([class~="not-prose"] *)) { +.prose :where(tbody td, tfoot td):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-top: 0.5714286em; padding-right: 0.5714286em; padding-bottom: 0.5714286em; padding-left: 0.5714286em; } -.prose :where(tbody td:first-child, tfoot td:first-child):not(:where([class~="not-prose"] *)) { +.prose :where(tbody td:first-child, tfoot td:first-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-left: 0; } -.prose :where(tbody td:last-child, tfoot td:last-child):not(:where([class~="not-prose"] *)) { +.prose :where(tbody td:last-child, tfoot td:last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { padding-right: 0; } -.prose :where(.prose > :first-child):not(:where([class~="not-prose"] *)) { +.prose :where(figure):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + margin-top: 2em; + margin-bottom: 2em; +} + +.prose :where(.prose > :first-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-top: 0; } -.prose :where(.prose > :last-child):not(:where([class~="not-prose"] *)) { +.prose :where(.prose > :last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) { margin-bottom: 0; } -.prose :where(kbd):not(:where([class~="not-prose"] *)) { - background-color: #e5e7eb; - padding: 0.1rem 0.4rem; - border-radius: 0.25rem; - font-size: 0.9rem; - font-weight: 600; -} - -.prose :where(mark):not(:where([class~="not-prose"] *)) { +.prose :where(mark):not(:where([class~="not-prose"],[class~="not-prose"] *)) { color: #1f2937; background-color: #e9d5ff; padding: 0.1rem 0.2rem; @@ -1204,36 +1263,36 @@ video { margin: auto; } -.mt-10 { - margin-top: 2.5rem; -} - -.mb-3 { - margin-bottom: 0.75rem; +.\!mb-9 { + margin-bottom: 2.25rem !important; } .mb-2 { margin-bottom: 0.5rem; } -.mt-4 { - margin-top: 1rem; -} - -.mr-1 { - margin-right: 0.25rem; -} - -.mt-2 { - margin-top: 0.5rem; +.mb-3 { + margin-bottom: 0.75rem; } .mb-6 { margin-bottom: 1.5rem; } -.\!mb-9 { - margin-bottom: 2.25rem !important; +.mr-1 { + margin-right: 0.25rem; +} + +.mt-10 { + margin-top: 2.5rem; +} + +.mt-2 { + margin-top: 0.5rem; +} + +.mt-4 { + margin-top: 1rem; } .block { @@ -1248,14 +1307,14 @@ video { display: flex; } -.h-full { - height: 100%; -} - .h-36 { height: 9rem; } +.h-full { + height: 100%; +} + .h-screen { height: 100vh; } @@ -1296,17 +1355,12 @@ video { place-self: start; } -.rounded-full { - border-radius: 9999px; -} - .rounded { border-radius: 0.25rem; } -.py-2 { - padding-top: 0.5rem; - padding-bottom: 0.5rem; +.rounded-full { + border-radius: 9999px; } .px-6 { @@ -1319,6 +1373,11 @@ video { padding-bottom: 2.5rem; } +.py-2 { + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} + .pt-5 { padding-top: 1.25rem; } @@ -1336,11 +1395,6 @@ video { line-height: 2.5rem; } -.text-xl { - font-size: 1.25rem; - line-height: 1.75rem; -} - .text-lg { font-size: 1.125rem; line-height: 1.75rem; @@ -1351,6 +1405,11 @@ video { line-height: 1.25rem; } +.text-xl { + font-size: 1.25rem; + line-height: 1.75rem; +} + .text-xs { font-size: 0.75rem; line-height: 1rem; @@ -1364,24 +1423,60 @@ video { line-height: 1.75rem; } +.text-neutral-400 { + --tw-text-opacity: 1; + color: rgb(156 163 175 / var(--tw-text-opacity)); +} + .text-neutral-500 { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); } -.text-neutral-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} - .text-neutral-800 { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); } -.text-neutral-400 { +.text-neutral-900 { --tw-text-opacity: 1; - color: rgb(156 163 175 / var(--tw-text-opacity)); + color: rgb(17 24 39 / var(--tw-text-opacity)); +} + +@media (prefers-color-scheme: dark) { + .dark\:prose-invert { + --tw-prose-body: var(--tw-prose-invert-body); + --tw-prose-headings: var(--tw-prose-invert-headings); + --tw-prose-lead: var(--tw-prose-invert-lead); + --tw-prose-links: var(--tw-prose-invert-links); + --tw-prose-bold: var(--tw-prose-invert-bold); + --tw-prose-counters: var(--tw-prose-invert-counters); + --tw-prose-bullets: var(--tw-prose-invert-bullets); + --tw-prose-hr: var(--tw-prose-invert-hr); + --tw-prose-quotes: var(--tw-prose-invert-quotes); + --tw-prose-quote-borders: var(--tw-prose-invert-quote-borders); + --tw-prose-captions: var(--tw-prose-invert-captions); + --tw-prose-kbd: var(--tw-prose-invert-kbd); + --tw-prose-kbd-shadows: var(--tw-prose-invert-kbd-shadows); + --tw-prose-code: var(--tw-prose-invert-code); + --tw-prose-pre-code: var(--tw-prose-invert-pre-code); + --tw-prose-pre-bg: var(--tw-prose-invert-pre-bg); + --tw-prose-th-borders: var(--tw-prose-invert-th-borders); + --tw-prose-td-borders: var(--tw-prose-invert-td-borders); + } + + .dark\:prose-invert :where(a):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + text-decoration-color: #4b5563; + } + + .dark\:prose-invert :where(kbd):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + color: #e5e7eb; + background-color: #374151; + } + + .dark\:prose-invert :where(mark):not(:where([class~="not-prose"],[class~="not-prose"] *)) { + background-color: #c084fc; + } } .hover\:text-primary-500:hover { @@ -1403,43 +1498,6 @@ video { background-color: rgb(31 41 55 / var(--tw-bg-opacity)); } - .dark\:prose-invert { - --tw-prose-body: var(--tw-prose-invert-body); - --tw-prose-headings: var(--tw-prose-invert-headings); - --tw-prose-lead: var(--tw-prose-invert-lead); - --tw-prose-links: var(--tw-prose-invert-links); - --tw-prose-bold: var(--tw-prose-invert-bold); - --tw-prose-counters: var(--tw-prose-invert-counters); - --tw-prose-bullets: var(--tw-prose-invert-bullets); - --tw-prose-hr: var(--tw-prose-invert-hr); - --tw-prose-quotes: var(--tw-prose-invert-quotes); - --tw-prose-quote-borders: var(--tw-prose-invert-quote-borders); - --tw-prose-captions: var(--tw-prose-invert-captions); - --tw-prose-code: var(--tw-prose-invert-code); - --tw-prose-pre-code: var(--tw-prose-invert-pre-code); - --tw-prose-pre-bg: var(--tw-prose-invert-pre-bg); - --tw-prose-th-borders: var(--tw-prose-invert-th-borders); - --tw-prose-td-borders: var(--tw-prose-invert-td-borders); - } - - .dark\:prose-invert :where(a):not(:where([class~="not-prose"] *)) { - text-decoration-color: #4b5563; - } - - .dark\:prose-invert :where(kbd):not(:where([class~="not-prose"] *)) { - color: #e5e7eb; - background-color: #374151; - } - - .dark\:prose-invert :where(mark):not(:where([class~="not-prose"] *)) { - background-color: #c084fc; - } - - .dark\:text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); - } - .dark\:text-neutral-400 { --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); @@ -1449,6 +1507,11 @@ video { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); } + + .dark\:text-white { + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); + } } @media (min-width: 640px) { @@ -1456,15 +1519,15 @@ video { min-width: 0px; } - .sm\:px-24 { - padding-left: 6rem; - padding-right: 6rem; - } - .sm\:px-14 { padding-left: 3.5rem; padding-right: 3.5rem; } + + .sm\:px-24 { + padding-left: 6rem; + padding-right: 6rem; + } } @media (min-width: 768px) { diff --git a/assets/css/main.css b/assets/css/main.css index 8858cc6..fed0390 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Lynx v1.3.0 | MIT License | https://github.com/jpanther/lynx */ +/*! Lynx v1.3.1 | MIT License | https://github.com/jpanther/lynx */ @tailwind base; @tailwind components; diff --git a/netlify.toml b/netlify.toml index cadf7c5..881b6c9 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,22 +3,16 @@ publish = "exampleSite/public" [build.environment] +HUGO_VERSION = "0.118.2" HUGO_THEMESDIR = "../.." HUGO_THEME = "repo" TZ = "Australia/Melbourne" [context.production.environment] -HUGO_VERSION = "0.112.7" HUGO_ENV = "production" [context.deploy-preview] command = "cd exampleSite && hugo --gc --minify -D -b $DEPLOY_PRIME_URL" -[context.deploy-preview.environment] -HUGO_VERSION = "0.112.7" - [context.branch-deploy] command = "cd exampleSite && hugo --gc --minify -D -b $DEPLOY_PRIME_URL" - -[context.branch-deploy.environment] -HUGO_VERSION = "0.112.7" diff --git a/package-lock.json b/package-lock.json index 82de520..c37d379 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "hugo-lynx-theme", - "version": "1.2.4", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "hugo-lynx-theme", - "version": "1.2.4", + "version": "1.3.0", "license": "MIT", "devDependencies": { - "@tailwindcss/typography": "^0.5.9", - "prettier": "^2.8.8", - "prettier-plugin-go-template": "^0.0.13", - "prettier-plugin-tailwindcss": "^0.3.0", - "tailwindcss": "^3.3.2" + "@tailwindcss/typography": "^0.5.10", + "prettier": "^3.0.3", + "prettier-plugin-go-template": "^0.0.15", + "prettier-plugin-tailwindcss": "^0.5.4", + "tailwindcss": "^3.3.3" } }, "node_modules/@alloc/quick-lru": { @@ -118,9 +118,9 @@ } }, "node_modules/@tailwindcss/typography": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz", - "integrity": "sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz", + "integrity": "sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw==", "dev": true, "dependencies": { "lodash.castarray": "^4.4.0", @@ -807,24 +807,24 @@ "dev": true }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-plugin-go-template": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.13.tgz", - "integrity": "sha512-gG/xT5kd+kCzoMaTchXvdfBdsunyRCV6G8cgdPGPd2V5JGGKXUG7SjzBKU7jaGh2RTeblcAdBb/E+S/duOAMsA==", + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.15.tgz", + "integrity": "sha512-WqU92E1NokWYNZ9mLE6ijoRg6LtIGdLMePt2C7UBDjXeDH9okcRI3zRqtnWR4s5AloiqyvZ66jNBAa9tmRY5EQ==", "dev": true, "dependencies": { "ulid": "^2.3.0" @@ -833,16 +833,16 @@ "node": ">=14.0.0" }, "peerDependencies": { - "prettier": "^2.0.0" + "prettier": "^3.0.0" } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.3.0.tgz", - "integrity": "sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.4.tgz", + "integrity": "sha512-QZzzB1bID6qPsKHTeA9qPo1APmmxfFrA5DD3LQ+vbTmAnY40eJI7t9Q1ocqel2EKMWNPLJqdTDWZj1hKYgqSgg==", "dev": true, "engines": { - "node": ">=12.17.0" + "node": ">=14.21.3" }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", @@ -850,17 +850,15 @@ "@shopify/prettier-plugin-liquid": "*", "@shufo/prettier-plugin-blade": "*", "@trivago/prettier-plugin-sort-imports": "*", - "prettier": ">=2.2.0", + "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", - "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", - "prettier-plugin-svelte": "*", - "prettier-plugin-twig-melody": "*" + "prettier-plugin-svelte": "*" }, "peerDependenciesMeta": { "@ianvs/prettier-plugin-sort-imports": { @@ -1045,9 +1043,9 @@ } }, "node_modules/tailwindcss": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz", - "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", + "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -1070,7 +1068,6 @@ "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", - "postcss-value-parser": "^4.2.0", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, @@ -1246,9 +1243,9 @@ } }, "@tailwindcss/typography": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz", - "integrity": "sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz", + "integrity": "sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw==", "dev": true, "requires": { "lodash.castarray": "^4.4.0", @@ -1741,24 +1738,24 @@ "dev": true }, "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.13.tgz", - "integrity": "sha512-gG/xT5kd+kCzoMaTchXvdfBdsunyRCV6G8cgdPGPd2V5JGGKXUG7SjzBKU7jaGh2RTeblcAdBb/E+S/duOAMsA==", + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.15.tgz", + "integrity": "sha512-WqU92E1NokWYNZ9mLE6ijoRg6LtIGdLMePt2C7UBDjXeDH9okcRI3zRqtnWR4s5AloiqyvZ66jNBAa9tmRY5EQ==", "dev": true, "requires": { "ulid": "^2.3.0" } }, "prettier-plugin-tailwindcss": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.3.0.tgz", - "integrity": "sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.4.tgz", + "integrity": "sha512-QZzzB1bID6qPsKHTeA9qPo1APmmxfFrA5DD3LQ+vbTmAnY40eJI7t9Q1ocqel2EKMWNPLJqdTDWZj1hKYgqSgg==", "dev": true, "requires": {} }, @@ -1840,9 +1837,9 @@ "dev": true }, "tailwindcss": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz", - "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", + "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", "dev": true, "requires": { "@alloc/quick-lru": "^5.2.0", @@ -1865,7 +1862,6 @@ "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", - "postcss-value-parser": "^4.2.0", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, diff --git a/package.json b/package.json index 197120c..89d283d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-lynx-theme", - "version": "1.3.0", + "version": "1.3.1", "description": "Lynx theme for Hugo", "scripts": { "dev": "NODE_ENV=development ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit -w", @@ -25,10 +25,10 @@ }, "homepage": "https://github.com/jpanther/lynx#readme", "devDependencies": { - "@tailwindcss/typography": "^0.5.9", - "prettier": "^2.8.8", - "prettier-plugin-go-template": "^0.0.13", - "prettier-plugin-tailwindcss": "^0.3.0", - "tailwindcss": "^3.3.2" + "@tailwindcss/typography": "^0.5.10", + "prettier": "^3.0.3", + "prettier-plugin-go-template": "^0.0.15", + "prettier-plugin-tailwindcss": "^0.5.4", + "tailwindcss": "^3.3.3" } }