From 675401152be63a3858efb8f66d51f93d25d6e038 Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:35:48 +1100 Subject: [PATCH] feat: formatted and fix some issues on nixos --- astro.config.ts | 2 +- flake.nix | 8 ++------ package.json | 5 ++++- src/content/config.ts | 6 +++--- src/styles/starlight.css | 15 +++++++-------- tailwind.config.ts | 21 +++++++++++++++++---- 6 files changed, 34 insertions(+), 23 deletions(-) diff --git a/astro.config.ts b/astro.config.ts index f9d53cc..83ebb84 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -57,7 +57,7 @@ export default defineConfig({ directory: "wiki/developers", collapsed: true, }, - } + }, ], editLink: { baseUrl: "https://github.com/teaclientmc/website", diff --git a/flake.nix b/flake.nix index bd8b56a..1b7ba67 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ devShells.default = pkgs.mkShell { packages = with pkgs; [ bun + dprint ]; nativeBuildInputs = with pkgs; [ playwright @@ -27,12 +28,7 @@ PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}"; PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true; PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; - - - shellHook = '' - bun install - ''; }; }; }; -} \ No newline at end of file +} diff --git a/package.json b/package.json index e183fc2..7ca57cf 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "astro-meta-tags": "^0.2.2", "astro-page-insight": "^0.8.7", "astro-seo": "^0.8.4", - "dprint": "^0.47.5", "octokit": "^4.0.2", "sharp": "^0.33.5", "tailwind-merge": "^2.5.4", @@ -38,8 +37,12 @@ "@astrojs/check": "^0.5.10", "@types/bun": "^1.1.12", "astro": "^4.16.7", + "dprint": "^0.47.5", "playwright": "^1.48.2", "typescript": "^5.6.3" }, + "overrides": { + "astro-expressive-code": "^0.38.0" + }, "packageManager": "bun@1.0.25" } diff --git a/src/content/config.ts b/src/content/config.ts index ab3e322..e8a4839 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -1,5 +1,5 @@ import { defineCollection, reference, z } from "astro:content"; -import { docsSchema } from '@astrojs/starlight/schema'; +import { docsSchema } from "@astrojs/starlight/schema"; const news = defineCollection({ type: "content", @@ -30,7 +30,7 @@ const authors = defineCollection({ }); const docs = defineCollection({ - schema: docsSchema() -}) + schema: docsSchema(), +}); export const collections = { news, authors, docs }; diff --git a/src/styles/starlight.css b/src/styles/starlight.css index 232c526..7f483ef 100644 --- a/src/styles/starlight.css +++ b/src/styles/starlight.css @@ -2,15 +2,14 @@ @tailwind components; @tailwind utilities; +.header { + backdrop-filter: blur(6px) saturate(10%); +} - .header { - backdrop-filter: blur(6px) saturate(10%); - } - - .header > div { - @apply bg-[#00000015] bg-no-repeat; - } +.header > div { + @apply bg-[#00000015] bg-no-repeat; +} body { - @apply bg-[url("/background/1.webp")] bg-no-repeat bg-cover; + @apply bg-[url("/background/1.webp")] bg-no-repeat bg-cover; } diff --git a/tailwind.config.ts b/tailwind.config.ts index ebbcd5c..a7feb68 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,8 +1,21 @@ -import starlightPlugin from '@astrojs/starlight-tailwind'; +import starlightPlugin from "@astrojs/starlight-tailwind"; - -const accent = { 200: '#c8c8c8', 600: '#4e4e4e', 900: '#323232', 950: '#242424' }; -const gray = { 100: '#f6f6f6', 200: '#eeeeee', 300: '#c2c2c2', 400: '#8b8b8b', 500: '#585858', 700: '#383838', 800: 'rgba(0, 0, 0, 0.212)', 900: '#181818' }; +const accent = { + 200: "#c8c8c8", + 600: "#4e4e4e", + 900: "#323232", + 950: "#242424", +}; +const gray = { + 100: "#f6f6f6", + 200: "#eeeeee", + 300: "#c2c2c2", + 400: "#8b8b8b", + 500: "#585858", + 700: "#383838", + 800: "rgba(0, 0, 0, 0.212)", + 900: "#181818", +}; export default { content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],