From 9bc4ef49e82522e8009c086817430637802630d1 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Tue, 6 Jun 2023 23:37:58 +0200 Subject: [PATCH] cleanup styles --- package.json | 8 +- pnpm-lock.yaml | 209 ++++++++++++++++++----- src/components/base/Footer.astro | 4 +- src/components/tree/List.astro | 2 +- src/content/wiki/recommended-reading.md | 2 +- src/pages/tags/[tag].astro | 1 - src/pages/tags/utils.ts | 1 - src/pages/wiki/[...slug].astro | 4 +- src/pages/wiki/index.astro | 4 +- src/styles/_base.scss | 35 ---- src/styles/_markdown.scss | 212 ++++++++++-------------- src/styles/_utils.scss | 50 ------ src/styles/components/_link-tree.scss | 23 ++- src/styles/layouts/_wiki.scss | 16 ++ src/styles/partials/_footer.scss | 11 ++ src/styles/styles.scss | 1 + 16 files changed, 311 insertions(+), 272 deletions(-) create mode 100644 src/styles/layouts/_wiki.scss diff --git a/package.json b/package.json index aad3ac2..db31bfa 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^0.19.5", + "@astrojs/mdx": "^0.19.6", "@astrojs/solid-js": "^2.2.0", - "astro": "^2.5.6", - "astro-pagefind": "^1.1.0", - "dayjs": "^1.11.7", + "astro": "^2.6.0", + "astro-pagefind": "^1.2.0", + "dayjs": "^1.11.8", "leaflet": "^1.9.4", "leaflet.markercluster": "^1.5.3", "purify-ts": "^2.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01669c0..d0f6e36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,20 +6,20 @@ settings: dependencies: '@astrojs/mdx': - specifier: ^0.19.5 - version: 0.19.5(astro@2.5.6) + specifier: ^0.19.6 + version: 0.19.6(astro@2.6.0) '@astrojs/solid-js': specifier: ^2.2.0 version: 2.2.0(@babel/core@7.22.1)(solid-js@1.7.6) astro: - specifier: ^2.5.6 - version: 2.5.6(sass@1.62.1) + specifier: ^2.6.0 + version: 2.6.0(sass@1.62.1) astro-pagefind: - specifier: ^1.1.0 - version: 1.1.0(astro@2.5.6) + specifier: ^1.2.0 + version: 1.2.0(astro@2.6.0) dayjs: - specifier: ^1.11.7 - version: 1.11.7 + specifier: ^1.11.8 + version: 1.11.8 leaflet: specifier: ^1.9.4 version: 1.9.4 @@ -103,6 +103,10 @@ packages: resolution: {integrity: sha512-k04X/7nlMklU0HQUScxbCTf5n8/Vr+0U0bawb9QWulWxd6qJf3FmBrNATgTYiltjB4pc5HBqmmttAfFi7m4lLg==} dev: false + /@astrojs/internal-helpers@0.1.0: + resolution: {integrity: sha512-OSwvoFkTqVowiyP+codQeQZWoq/HOwY32x17NxDglWoCx2sdyXzplDZoVV4/3odmSEY6/A+48WMl5qkjmP1CXw==} + dev: false + /@astrojs/language-server@1.0.8: resolution: {integrity: sha512-gssRxLGb8XnvKpqSzrDW5jdzdFnXD7eBXVkPCkkt2hv7Qzb+SAzv6hVgMok3jDCxpR1aeB+XNd9Qszj2h29iog==} hasBin: true @@ -122,13 +126,13 @@ packages: vscode-uri: 3.0.7 dev: false - /@astrojs/markdown-remark@2.2.1(astro@2.5.6): + /@astrojs/markdown-remark@2.2.1(astro@2.6.0): resolution: {integrity: sha512-VF0HRv4GpC1XEMLnsKf6jth7JSmlt9qpqP0josQgA2eSpCIAC/Et+y94mgdBIZVBYH/yFnMoIxgKVe93xfO2GA==} peerDependencies: astro: ^2.5.0 dependencies: '@astrojs/prism': 2.1.2 - astro: 2.5.6(sass@1.62.1) + astro: 2.6.0(sass@1.62.1) github-slugger: 1.5.0 import-meta-resolve: 2.2.2 rehype-raw: 6.1.1 @@ -145,11 +149,11 @@ packages: - supports-color dev: false - /@astrojs/mdx@0.19.5(astro@2.5.6): - resolution: {integrity: sha512-x+zmrvvEonZPDhDkeALfhizrg6pMllo6Q259GrIxayOkFMtpyxIwWoI3tGv9Z0SaSZfesa0MmDpgGA3IORsXrw==} + /@astrojs/mdx@0.19.6(astro@2.6.0): + resolution: {integrity: sha512-P9CU+l/GveJPG3OOOdlZtIK5NWcJuEnXPtxwfjJUaoIPHDByp6okT/yN/WwLAA4TfnluFnULNG4bDsEnwcpYvw==} engines: {node: '>=16.12.0'} dependencies: - '@astrojs/markdown-remark': 2.2.1(astro@2.5.6) + '@astrojs/markdown-remark': 2.2.1(astro@2.6.0) '@astrojs/prism': 2.1.2 '@mdx-js/mdx': 2.3.0 acorn: 8.8.2 @@ -172,6 +176,19 @@ packages: - supports-color dev: false + /@astrojs/node@5.2.0(astro@2.6.0): + resolution: {integrity: sha512-WWrQuxvdrD2Jd9np8vpS8/zCNEm0JnGv+oaojXzbfW36R8/09L827t/acYxLuguLufiV3U16QAqEwpS8VFS9TA==} + peerDependencies: + astro: ^2.6.0 + dependencies: + '@astrojs/webapi': 2.2.0 + astro: 2.6.0(sass@1.62.1) + send: 0.18.0 + server-destroy: 1.0.1 + transitivePeerDependencies: + - supports-color + dev: false + /@astrojs/prism@2.1.2: resolution: {integrity: sha512-3antim1gb34689GHRQFJ88JEo93HuZKQBnmxDT5W/nxiNz1p/iRxnCTEhIbJhqMOTRbbo5h2ldm5qSxx+TMFQA==} engines: {node: '>=16.12.0'} @@ -763,7 +780,7 @@ packages: is-glob: 4.0.3 open: 9.1.0 picocolors: 1.0.0 - tslib: 2.5.2 + tslib: 2.5.3 dev: false /@polka/url@1.0.0-next.21: @@ -783,7 +800,7 @@ packages: '@babel/types': 7.22.4 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 - '@types/babel__traverse': 7.20.0 + '@types/babel__traverse': 7.20.1 dev: false /@types/babel__generator@7.6.4: @@ -799,8 +816,8 @@ packages: '@babel/types': 7.22.4 dev: false - /@types/babel__traverse@7.20.0: - resolution: {integrity: sha512-TBOjqAGf0hmaqRwpii5LLkJLg7c6OMm4nHLmpsUxwk9bBHtoTC6dAHdVWdGv4TBxj2CZOZY8Xfq8WmfoVi7n4Q==} + /@types/babel__traverse@7.20.1: + resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} dependencies: '@babel/types': 7.22.4 dev: false @@ -1003,21 +1020,22 @@ packages: hasBin: true dev: false - /astro-pagefind@1.1.0(astro@2.5.6): - resolution: {integrity: sha512-cW/F6IOX/F4FewQggwgjyndtv2yt23o2QOSWpPavlHnG0HbJvhcPiAT315nAqHS81xGmSyQw0YNJdTEcgGIlfg==} + /astro-pagefind@1.2.0(astro@2.6.0): + resolution: {integrity: sha512-1l4RSz/Cm5jIHbgN+mZZ2jOjpB5gK0qWJDZ0zWqUcguX3NJxaS+pai/snGmBoxtEbOGXx/SjrhlSAq2inqwdQw==} peerDependencies: astro: ^2.0.4 dependencies: + '@astrojs/node': 5.2.0(astro@2.6.0) '@pagefind/default-ui': 0.12.0 - astro: 2.5.6(sass@1.62.1) + astro: 2.6.0(sass@1.62.1) pagefind: 0.12.0 sirv: 2.0.3 transitivePeerDependencies: - supports-color dev: false - /astro@2.5.6(sass@1.62.1): - resolution: {integrity: sha512-IdgEnjP8kqLEYgNbWcrRyqR4tUq1iEXI3AZ5RqV9PTaDd4l9H+UmN0oDjrzG8VTmCdpfSHGlQEr+0qkGPoIiOw==} + /astro@2.6.0(sass@1.62.1): + resolution: {integrity: sha512-Y//Gfy/DB43qIT6aB/0nuB0KyCj/JcLIWW8OTxfMEDyq3hGoensCD8SdWCyjcrKRVE3C9ntkszJ5RyLZh3Fg0g==} engines: {node: '>=16.12.0', npm: '>=6.14.0'} hasBin: true peerDependencies: @@ -1027,8 +1045,9 @@ packages: optional: true dependencies: '@astrojs/compiler': 1.5.0 + '@astrojs/internal-helpers': 0.1.0 '@astrojs/language-server': 1.0.8 - '@astrojs/markdown-remark': 2.2.1(astro@2.5.6) + '@astrojs/markdown-remark': 2.2.1(astro@2.6.0) '@astrojs/telemetry': 2.1.1 '@astrojs/webapi': 2.2.0 '@babel/core': 7.22.1 @@ -1171,8 +1190,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001492 - electron-to-chromium: 1.4.417 + caniuse-lite: 1.0.30001495 + electron-to-chromium: 1.4.422 node-releases: 2.0.12 update-browserslist-db: 1.0.11(browserslist@4.21.7) dev: false @@ -1203,8 +1222,8 @@ packages: engines: {node: '>=10'} dev: false - /caniuse-lite@1.0.30001492: - resolution: {integrity: sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==} + /caniuse-lite@1.0.30001495: + resolution: {integrity: sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==} dev: false /ccount@2.0.1: @@ -1346,8 +1365,19 @@ packages: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} dev: false - /dayjs@1.11.7: - resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==} + /dayjs@1.11.8: + resolution: {integrity: sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==} + dev: false + + /debug@2.6.9: + resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.0.0 dev: false /debug@4.3.4: @@ -1401,11 +1431,21 @@ packages: engines: {node: '>=12'} dev: false + /depd@2.0.0: + resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} + engines: {node: '>= 0.8'} + dev: false + /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} dev: false + /destroy@1.2.0: + resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dev: false + /devalue@4.3.2: resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==} dev: false @@ -1428,8 +1468,12 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /electron-to-chromium@1.4.417: - resolution: {integrity: sha512-8rY8HdCxuSVY8wku3i/eDac4g1b4cSbruzocenrqBlzqruAZYHjQCHIjC66dLR9DXhEHTojsC4EjhZ8KmzwXqA==} + /ee-first@1.1.1: + resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + dev: false + + /electron-to-chromium@1.4.422: + resolution: {integrity: sha512-OQMid0IRbJv27BhlPiBK8CfGzjeq4ZCBSmpwNi1abyS8w17/BajOUu7hBI49ptDTBCz9NRFbORhWvt41dF7dwg==} dev: false /emmet@2.4.4: @@ -1451,6 +1495,11 @@ packages: resolution: {integrity: sha512-dqx7eA9YaqyvYtUhJwT4rC1HIp82j5ybS1/vQ42ur+jBe17dJMwZE4+gvL1XadSFfxaPFFGt3Xsw+Y8akThDlw==} dev: false + /encodeurl@1.0.2: + resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} + engines: {node: '>= 0.8'} + dev: false + /entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} @@ -1495,6 +1544,10 @@ packages: engines: {node: '>=6'} dev: false + /escape-html@1.0.3: + resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} + dev: false + /escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -1554,6 +1607,11 @@ packages: '@types/estree': 1.0.1 dev: false + /etag@1.8.1: + resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} + engines: {node: '>= 0.6'} + dev: false + /events@3.3.0: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} @@ -1672,6 +1730,11 @@ packages: engines: {node: '>=0.4.x'} dev: false + /fresh@0.5.2: + resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + engines: {node: '>= 0.6'} + dev: false + /fsevents@2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -1900,6 +1963,17 @@ packages: resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==} dev: false + /http-errors@2.0.0: + resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} + engines: {node: '>= 0.8'} + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + dev: false + /https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} @@ -2781,6 +2855,12 @@ packages: picomatch: 2.3.1 dev: false + /mime@1.6.0: + resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} + engines: {node: '>=4'} + hasBin: true + dev: false + /mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} @@ -2807,9 +2887,17 @@ packages: engines: {node: '>=10'} dev: false + /ms@2.0.0: + resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} + dev: false + /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + /ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + dev: false + /nanoid@3.3.6: resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -2850,6 +2938,13 @@ packages: path-key: 4.0.0 dev: false + /on-finished@2.4.1: + resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} + engines: {node: '>= 0.8'} + dependencies: + ee-first: 1.1.1 + dev: false + /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -3086,6 +3181,11 @@ packages: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: false + /range-parser@1.2.1: + resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} + engines: {node: '>= 0.6'} + dev: false + /readable-stream@3.6.2: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} @@ -3283,8 +3383,8 @@ packages: engines: {node: '>=10.0.0'} dev: false - /rollup@3.23.0: - resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==} + /rollup@3.23.1: + resolution: {integrity: sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -3355,6 +3455,27 @@ packages: lru-cache: 6.0.0 dev: false + /send@0.18.0: + resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} + engines: {node: '>= 0.8.0'} + dependencies: + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 2.0.0 + mime: 1.6.0 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + dev: false + /seroval@0.5.1: resolution: {integrity: sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g==} engines: {node: '>=10'} @@ -3364,6 +3485,10 @@ packages: resolution: {integrity: sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==} dev: false + /setprototypeof@1.2.0: + resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} + dev: false + /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -3431,6 +3556,11 @@ packages: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} dev: false + /statuses@2.0.1: + resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} + engines: {node: '>= 0.8'} + dev: false + /stdin-discarder@0.1.0: resolution: {integrity: sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -3555,7 +3685,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} dependencies: '@pkgr/utils': 2.4.1 - tslib: 2.5.2 + tslib: 2.5.3 dev: false /titleize@3.0.0: @@ -3574,6 +3704,11 @@ packages: dependencies: is-number: 7.0.0 + /toidentifier@1.0.1: + resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} + engines: {node: '>=0.6'} + dev: false + /totalist@3.0.1: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} @@ -3598,8 +3733,8 @@ packages: type-fest: 0.13.1 dev: false - /tslib@2.5.2: - resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} + /tslib@2.5.3: + resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} dev: false /type-fest@0.13.1: @@ -3796,7 +3931,7 @@ packages: dependencies: esbuild: 0.17.19 postcss: 8.4.24 - rollup: 3.23.0 + rollup: 3.23.1 sass: 1.62.1 optionalDependencies: fsevents: 2.3.2 diff --git a/src/components/base/Footer.astro b/src/components/base/Footer.astro index 0ae8ce4..997363f 100644 --- a/src/components/base/Footer.astro +++ b/src/components/base/Footer.astro @@ -8,7 +8,7 @@ const email = "maciej@kamoshi.org";
{email}
- - Creative Commons License + + Creative Commons License diff --git a/src/components/tree/List.astro b/src/components/tree/List.astro index 62383a4..1b94109 100644 --- a/src/components/tree/List.astro +++ b/src/components/tree/List.astro @@ -32,7 +32,7 @@ function compare(a: {title: string}, b: {title: string}) { {page.slug .chain(slug => prefix.map(prefix => pathify(prefix, slug))) .mapOrDefault(href => - + {page.title} , {page.title} diff --git a/src/content/wiki/recommended-reading.md b/src/content/wiki/recommended-reading.md index f17a67e..2e33dac 100644 --- a/src/content/wiki/recommended-reading.md +++ b/src/content/wiki/recommended-reading.md @@ -1,5 +1,5 @@ --- -title: Recommended Reading +title: Recommended reading --- ## Programming diff --git a/src/pages/tags/[tag].astro b/src/pages/tags/[tag].astro index 82c21b4..c5c8c0c 100644 --- a/src/pages/tags/[tag].astro +++ b/src/pages/tags/[tag].astro @@ -15,7 +15,6 @@ const predicate = (entry: any) => entry.data.tags?.includes(tag); const posts = (await Promise.all([ getCollection('posts', predicate), getCollection('slides', predicate), - getCollection('aoc', predicate), ])) .flat() .sort((a, b) => a.data.date < b.data.date ? 1 : -1) diff --git a/src/pages/tags/utils.ts b/src/pages/tags/utils.ts index 6cdf707..f67e6df 100644 --- a/src/pages/tags/utils.ts +++ b/src/pages/tags/utils.ts @@ -5,7 +5,6 @@ export async function getAllTags() { return (await Promise.all([ getCollection('posts'), getCollection('slides'), - getCollection('aoc'), ])) .flat() .reduce( diff --git a/src/pages/wiki/[...slug].astro b/src/pages/wiki/[...slug].astro index addcab8..109241f 100644 --- a/src/pages/wiki/[...slug].astro +++ b/src/pages/wiki/[...slug].astro @@ -20,9 +20,9 @@ const { Content } = await entry.render(); --- -
+
-
+

{entry.data.title}

diff --git a/src/pages/wiki/index.astro b/src/pages/wiki/index.astro index cff7f87..b5db69f 100644 --- a/src/pages/wiki/index.astro +++ b/src/pages/wiki/index.astro @@ -9,9 +9,9 @@ const tree = collapse(await getCollection('wiki')); --- -
+
-
+
siema
diff --git a/src/styles/_base.scss b/src/styles/_base.scss index 9fa56f9..b048ccc 100644 --- a/src/styles/_base.scss +++ b/src/styles/_base.scss @@ -26,38 +26,3 @@ main { } } -/** - * BASE STYLES - */ - -ol, ul { - margin: 1em 0em 1em 1em; -} - -p { - margin: 0.5em 0; -} - -h1, h2, h3, h4, h5, h6 { - margin-bottom: 0.5em; -} -h1 { - font-size: var(--fs-xl); -} -h2 { - font-size: var(--fs-lg); -} -h3, h4, h5, h6 { - font-size: var(--fs-md); -} -h4, h6 { - font-style: italic; -} -h5, h6 { - color: gray; -} - -a { - text-decoration: underline; - color: var(--c-primary); -} diff --git a/src/styles/_markdown.scss b/src/styles/_markdown.scss index b5dfa16..c3d7dc3 100644 --- a/src/styles/_markdown.scss +++ b/src/styles/_markdown.scss @@ -1,154 +1,112 @@ - -.md { - &_anchor { - margin-left: 0.2em; - opacity: 0.5; - - &:hover, - &:focus-within { - opacity: 1; - } - &__icon { - display: inline; - max-height: 0.8em; - width: auto; - } - } - - &_youtube { - position:relative; - height:0; - margin: 1em 0; - padding-bottom:56.25%; - overflow:hidden; - - > iframe { - position:absolute; - top:0; - left:0; - width:100%; - height:100%; - border:0; - } - } -} - .markdown { + overflow-x: auto; + + > h1 { + font-size: 2.227em; + } + + > h2 { + font-size: 1.802em; + } + + > h3 { + font-size: 1.602em; + } + + > h4, > h5, > h6 { + font-size: 1.424em; + } + + > p { + margin: 0.5em 0; + line-height: 1.5em; + + > a { + color: var(--c-primary); + } + } + > h1, > h2, > h3, > h4, > h5, > h6 { margin: 1em 0 0.5em 0; + font-family: var(--serif); + font-weight: 500; } - //> img, - //> p > img { - // display: block; - // max-width: 100%; - // max-height: 50vh; - // margin-left: auto; - // margin-right: auto; - //} - - > table { - margin: 1em auto 1em auto; - border-collapse: collapse; - - - th, td { - padding: 0.2em 0.5em; - border: 1px solid #dbdbdb; - - p { - white-space: pre-line; - } - } - - th { - background-color: #f3f3f3; - } - - &.albums .images { - display: flex; - max-width: 100%; - } - } - - /** - * BLOCKQUOTE - */ blockquote { position: relative; margin: 1em 2em; &::before { content: ""; - position: absolute; display: block; - background-color: var(--c-secondary); + position: absolute; left: -1em; - height: 100%; width: 4px; + height: 100%; + background-color: var(--c-secondary); border-radius: 2px; } } - /** - * CODE - */ + > table { + margin: 1em auto 1em auto; + border-collapse: collapse; + + th, td { + padding: 0.2em 0.5em; + border: 1px solid #dbdbdb; + } + + th { + background-color: #f3f3f3; + } + + p { + white-space: pre-line; + } + } + code { font-family: var(--monospace); - font-size: var(--fs-sm); } - pre > code { - display: block; - line-height: 1.5em; + + :not(pre) > code { + padding-inline: 0.25em; + background-color: white; + border-radius: 0.33em; + border: 1px dashed lightgray; } - .highlight { - margin: 1em 0; - border-radius: 3px; - border: 1px solid #e1e2e1; - - > pre { - padding: 0.2em; - - &[style] { // default styles chroma - border-radius: 3px; - } - } - } - code:not(.highlight code) { - padding: 0.1em; - border: 1px solid #e1e2e1; - border-radius: 3px; - background-color: #f6f6f6; - color: #2f3337; - } - .highlight { - .lntable { - border-collapse: collapse; - border-spacing: 0; - } - .lntd { - padding: 0 0.5rem; - - &:first-of-type { - min-width: 1rem; - border-right: 1px solid #e1e2e1; - } + + > :is(pre:has(> code)), + > pre.astro-code { + margin: 1em 0.5em; + padding: 0.5em; + max-width: 100%; + border-radius: 0.5em; + overflow-x: auto; + border: 1px dashed lightgray; + + > code { + display: block; + line-height: 1.5em; } } - *:last-child { - margin-bottom: 0; - } -} - -.md-icon { - display: inline-block; - height: 1.2em; - width: auto; - vertical-align: middle; - margin: 0.1em 0; - - &.big { - height: 4em; + .math-display { + margin-block: 1em; + font-size: 1.1em; + } + + // TODO: clean this + .md-icon { + display: inline-block; + height: 1.2em; + width: auto; + vertical-align: middle; + margin: 0.1em 0; + + &.big { + height: 4em; + } } } diff --git a/src/styles/_utils.scss b/src/styles/_utils.scss index 88e4146..cacbe8e 100644 --- a/src/styles/_utils.scss +++ b/src/styles/_utils.scss @@ -39,53 +39,3 @@ $marker-offset: -0.7rem; @extend %article-marker; } } - -/** - * OTHER - */ - -.block { - display: block; -} - -.flex { - display: flex; - - &-row { - flex-direction: row; - } - &-col { - flex-direction: column; - } - - &-wrap { - flex-wrap: wrap; - } -} - -.justify { - &-center { - justify-content: center; - } - &-between { - justify-content: space-between; - } -} - -.items { - &-center { - align-items: center; - } -} - -.font { - &-light { - font-weight: 300; - } - &-medium { - font-weight: 500; - } - &-bold { - font-weight: 700; - } -} diff --git a/src/styles/components/_link-tree.scss b/src/styles/components/_link-tree.scss index a460038..ec21c21 100644 --- a/src/styles/components/_link-tree.scss +++ b/src/styles/components/_link-tree.scss @@ -1,20 +1,16 @@ -.main-wiki { - display: grid; - grid-template-columns: 16em 1fr 16em; -} - .link-tree { padding: 1em; overflow-y: auto; &__heading { border-bottom: 1px solid; - border-image: linear-gradient(to right, transparent, var(--c-primary), transparent) 1; + border-image: linear-gradient(to right, transparent, lightgray, transparent) 1; &-text { display: block; text-decoration: unset; text-align: center; + color: var(--c-primary); } } @@ -31,16 +27,25 @@ // &-list-item { // } &-list-text { - display: block; + padding-inline: 0.25em; text-decoration: unset; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - &.current { + &.link { + color: var(--c-primary); + } + + &:not(.current):hover { text-decoration: underline; } + + &.current { + background-color: var(--c-primary); + border-radius: 0.33em; + color: white; + } } } } - diff --git a/src/styles/layouts/_wiki.scss b/src/styles/layouts/_wiki.scss new file mode 100644 index 0000000..4383efa --- /dev/null +++ b/src/styles/layouts/_wiki.scss @@ -0,0 +1,16 @@ +.wiki-main { + display: grid; + grid-template-columns: 16em auto; + + @media (min-width: 80rem) { + grid-template-columns: 16em auto 16em; + } +} + +.wiki-article { + margin-inline: 1em; + + @media (min-width: 80rem) { + margin-inline: 2em; + } +} diff --git a/src/styles/partials/_footer.scss b/src/styles/partials/_footer.scss index 5ade48d..58cd157 100644 --- a/src/styles/partials/_footer.scss +++ b/src/styles/partials/_footer.scss @@ -1,9 +1,20 @@ .p-footer { + display: flex; + align-items: center; + justify-content: space-between; padding: 0.5em; background-color: var(--c-footer-bg); &__info { font-size: var(--fs-sm); color: var(--c-footer-text); + + a { + color: var(--c-primary); + } + } + + &__img-wrap { + display: block; } } diff --git a/src/styles/styles.scss b/src/styles/styles.scss index f982657..757d1d4 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -38,3 +38,4 @@ @use 'layouts/article'; @use 'layouts/songs'; @use 'layouts/repos'; +@use 'layouts/wiki'; \ No newline at end of file