No commit message

CODE_OF_CONDUCT.md

@@ -136,11 +136,11 @@ For answers to common questions about this code of conduct, see the FAQ at
 [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
 [https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
+[homepage]: HTTPS://www.contributor-covenant.org
+[v2.1]: HTTPS://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: HTTPS://github.com/mozilla/diversity
+[FAQ]: HTTPS://www.contributor-covenant.org/faq
+[translations]: HTTPS://www.contributor-covenant.org/translations
 
 Thank you for being part of our community and helping us create a safe and
 respectful environment for everyone!

README.md

@@ -1,29 +1,5 @@
 # 📄 [Starter] —
 
-<<<<<<< HEAD
 AstroJS Starter.
 
 [Starter]: https://npmjs.org/blank-web-starter
-=======
-A simple skeleton with TailwindCSS, PostCSS.
-
-<table>
-	<tr>
-		<td>
-			<picture>
-				<source media="(prefers-color-scheme: dark)" srcset="https://nikolahristov.tech/Dark/Image/GitHub/tailwindcss.svg">
-				<source media="(prefers-color-scheme: light)" srcset="https://nikolahristov.tech/Image/GitHub/tailwindcss.svg">
-				<img alt="TailwindCSS Logo" src="https://nikolahristov.tech/Dark/Image/GitHub/tailwindcss.svg" width="300" />
-			</picture>
-		</td>
-    	<td>
-    		<picture>
-    			<source media="(prefers-color-scheme: dark)" srcset="https://nikolahristov.tech/Image/GitHub/postcss.svg">
-    			<img alt="PostCSS Logo" src="https://nikolahristov.tech/Image/GitHub/postcss.svg" width="150" />
-    		</picture>
-    	</td>
-    </tr>
-</table>
-
-[Starter]: HTTPS://NPMJS.Org/@playform/starter
->>>>>>> Fork/Current

Source/Stylesheet/Global.css

@@ -4,42 +4,18 @@ html {
 
 html,
 body {
-<<<<<<< HEAD
-	@apply h-full
-		w-full;
-}
-
-body {
-	@apply dark:bg-black
-		flex
-		flex-grow
-		flex-col
-		bg-white
-		tabular-nums
-		text-black
-		antialiased
-		sm:subpixel-antialiased
-		dark:text-white;
-=======
 	@apply h-full w-full;
 }
 
 body {
 	@apply flex flex-grow flex-col bg-white tabular-nums text-black antialiased sm:subpixel-antialiased dark:bg-black dark:text-white;
->>>>>>> Fork/Current
 
 	font-variant-ligatures: no-common-ligatures;
 
 	--swup-overlay-theme-color: white;
-<<<<<<< HEAD
-	--swup-overlay-theme-duration: 0.2s;
-	--swup-overlay-theme-delay: 0s;
-	--swup-overlay-theme-scale: 1.2;
-=======
 	--swup-overlay-theme-duration: 0.21s;
 	--swup-overlay-theme-delay: 0s;
 	--swup-overlay-theme-scale: 0.21;
->>>>>>> Fork/Current
 	--swup-overlay-theme-skew: 0deg;
 }
 
@@ -53,33 +29,16 @@ body {
 ::selection {
 	text-shadow: none;
 
-<<<<<<< HEAD
-	@apply bg-amber-400
-		text-black;
-=======
 	@apply bg-amber-400 text-black;
->>>>>>> Fork/Current
 }
 
 @media (prefers-color-scheme: dark) {
 	*::selection,
 	::selection {
-<<<<<<< HEAD
-		@apply bg-orange-400
-			text-white;
-=======
 		@apply bg-orange-400 text-white;
->>>>>>> Fork/Current
 	}
 }
 
 img {
-<<<<<<< HEAD
-	@apply inline-block
-		select-none
-		align-top
-		outline-none;
-=======
 	@apply inline-block select-none align-top outline-none;
->>>>>>> Fork/Current
 }

Source/env.d.ts

@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 /// <reference path="../.astro/types.d.ts" />
->>>>>>> Fork/Current
 /// <reference types="astro/client" />

astro.config.ts

@@ -4,11 +4,6 @@ export default (await import("astro/config")).defineConfig({
 	outDir: "./Target",
 	// TODO Place your site URL here
 	// site: "",
-<<<<<<< HEAD
-=======
-	compressHTML: true,
-	prefetch: true,
->>>>>>> Fork/Current
 	integrations: [
 		// @ts-ignore
 		import.meta.env.MODE === "production"
@@ -29,6 +24,9 @@ export default (await import("astro/config")).defineConfig({
 		build: {
 			sourcemap: true,
 		},
+		resolve: {
+			preserveSymlinks: true,
+		},
 		css: {
 			devSourcemap: true,
 			transformer: "postcss",

package.json

@@ -1,16 +1,11 @@
 {
-<<<<<<< HEAD
 	"name": "blank-web-starter",
-=======
-	"name": "@playform/starter",
->>>>>>> Fork/Current
 	"version": "0.0.1",
 	"private": false,
 	"description": "📄 Starter —",
 	"keywords": [
 		"astro",
 		"starter",
-<<<<<<< HEAD
 		"playform"
 	],
 	"homepage": "HTTPS://GitHub.Com/PlayForm/BlankWebStarter#readme",
@@ -20,18 +15,6 @@
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/PlayForm/BlankWebStarter.git"
-=======
-		"skeleton",
-		"playform"
-	],
-	"homepage": "HTTPS://GitHub.Com/PlayForm/Starter#readme",
-	"bugs": {
-		"url": "HTTPS://GitHub.Com/PlayForm/Starter/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/PlayForm/Starter.git"
->>>>>>> Fork/Current
 	},
 	"license": "SEE LICENSE IN LICENSE",
 	"author": {
@@ -66,10 +49,6 @@
 		"postcss-import": "16.1.0",
 		"postcss-reporter": "7.1.0",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
-=======
-		"solid-js": "1.8.18",
->>>>>>> Fork/Current
 		"tailwindcss": "*",
 		"typescript": "*",
 		"zod": "*"

tailwind.config.js

@@ -3,13 +3,9 @@ export default {
 		"./Public/**/*.html",
 		"./Source/**/*.{astro,js,jsx,ts,tsx,vue,svelte}",
 	],
-<<<<<<< HEAD
 
 	darkMode: "media",
 
-=======
-	darkMode: "media",
->>>>>>> Fork/Current
 	theme: {
 		container: {
 			center: true,
@@ -26,13 +22,9 @@ export default {
 			},
 		},
 	},
-<<<<<<< HEAD
 
 	variants: {},
 
-=======
-	variants: {},
->>>>>>> Fork/Current
 	plugins: [
 		require("@tailwindcss/forms"),
 		require("@tailwindcss/typography"),

tsconfig.json

@@ -1,16 +1,11 @@
 {
-<<<<<<< HEAD
-	"compilerOptions": {
-		"baseUrl": "./",
-=======
 	"$schema": "https://json.schemastore.org/tsconfig",
 	"compilerOptions": {
 		"baseUrl": "./",
 		"emitDeclarationOnly": false,
 		"noEmit": true,
 		"outDir": "Target",
 		"rootDir": ".",
->>>>>>> Fork/Current
 		"types": ["astro/client", "astro/env"]
 	},
 	"extends": "@playform/build/tsconfig",