From 55b593c4e6b90137995aee9a55ba2a86423cc7bd Mon Sep 17 00:00:00 2001 From: Pauline Date: Mon, 23 Oct 2023 12:20:13 -0400 Subject: [PATCH] chore(fmt): lint and format config files --- .vscode/settings.json | 2 +- apps/storybook/.storybook/preview.ts | 1 - apps/website/astro.config.ts | 7 ++---- apps/website/src/styles/global.css | 3 ++- apps/website/tailwind.config.cjs | 34 ++++++++++++++-------------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6f751e1..4b3f49b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,7 +16,7 @@ "**/pnpm-lock.yaml": true, "**/.gitignore": true, "/packages/ctjs/types/*": true, - "**/dist": true, + "**/dist": true }, "css.customData": [".vscode/tailwind.json"], "eslint.lintTask.enable": true, diff --git a/apps/storybook/.storybook/preview.ts b/apps/storybook/.storybook/preview.ts index 1c3d344..4663aa6 100644 --- a/apps/storybook/.storybook/preview.ts +++ b/apps/storybook/.storybook/preview.ts @@ -1,5 +1,4 @@ import type { Preview } from '@storybook/react'; - import '@polyfrost/ui/style'; const preview: Preview = { diff --git a/apps/website/astro.config.ts b/apps/website/astro.config.ts index 76dbdbe..c7c7928 100644 --- a/apps/website/astro.config.ts +++ b/apps/website/astro.config.ts @@ -1,8 +1,7 @@ import tailwind from '@astrojs/tailwind'; import { defineConfig } from 'astro/config'; - // @ts-ignore - Tailwind doesn't have types for this yet -import postcssNesting from "tailwindcss/nesting"; +import postcssNesting from 'tailwindcss/nesting'; // https://astro.build/config export default defineConfig({ @@ -10,9 +9,7 @@ export default defineConfig({ vite: { css: { postcss: { - plugins: [ - postcssNesting, - ] + plugins: [postcssNesting] } } } diff --git a/apps/website/src/styles/global.css b/apps/website/src/styles/global.css index 79904b7..0bbfc2e 100644 --- a/apps/website/src/styles/global.css +++ b/apps/website/src/styles/global.css @@ -18,7 +18,8 @@ @apply bg-blue-500/20; } - html, body { + html, + body { @apply text-[14px] md:text-[16px]; } } diff --git a/apps/website/tailwind.config.cjs b/apps/website/tailwind.config.cjs index 362e59f..488f6cd 100644 --- a/apps/website/tailwind.config.cjs +++ b/apps/website/tailwind.config.cjs @@ -3,7 +3,7 @@ module.exports = { content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], theme: { colors: { - blue: { + 'blue': { 50: 'rgba(231, 235, 252, 1)', 75: 'rgba(227, 236, 245, 1)', 100: 'rgba(210, 225, 249, 1)', @@ -14,35 +14,35 @@ module.exports = { 600: 'rgba(9, 84, 165, 1)', 800: 'rgba(19, 43, 83, 1)' }, - gray: { + 'gray': { 50: 'rgba(240, 242, 244, 1)', 400: 'rgba(138, 150, 168, 1)', 700: 'rgba(65, 74, 88, 1)', 800: 'rgba(42, 47, 55, 1)' }, - white: { - DEFAULT: 'rgba(255, 255, 255, 1)', - "1/4": 'rgba(255, 255, 255, 0.25)', - light: "rgba(235, 245, 254, 1)" + 'white': { + 'DEFAULT': 'rgba(255, 255, 255, 1)', + '1/4': 'rgba(255, 255, 255, 0.25)', + 'light': 'rgba(235, 245, 254, 1)' }, - black: { + 'black': { DEFAULT: 'rgba(0, 0, 0, 1)' }, - text: { + 'text': { DEFAULT: 'rgba(2, 3, 7, 1)', primary: 'rgba(2, 3, 7, 1)' }, // Other - "navy-peony": "rgba(32, 55, 91, 1)", + 'navy-peony': 'rgba(32, 55, 91, 1)' }, borderRadius: { - none: '0', - sm: '3px', - md: '5px', - lg: '8px', - xl: '12px', - "2xl": '16px', - full: '100vw' + 'none': '0', + 'sm': '3px', + 'md': '5px', + 'lg': '8px', + 'xl': '12px', + '2xl': '16px', + 'full': '100vw' }, fontSize: { // rem starts at 16px on desktop, 14px on tailwind 'sm' and below @@ -55,7 +55,7 @@ module.exports = { 'header-sm': '1.5rem', // 24px 'header': '1.75rem', // 28px 'header-lg': '2rem', // 32px - 'header-page': "2.25rem", // 36px + 'header-page': '2.25rem', // 36px 'body-sm': '0.938rem', // 15px 'body': '1rem', // 16px