the-distro/floral.systems
1
1
Fork 1
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

feat(root page): prettify and add new home page content #7

Open
jakehamilton wants to merge 6 commits from jakehamilton/feat/home-content into main
pull from: jakehamilton/feat/home-content
merge into: the-distro:main
Conversation 0 Commits 6 Files changed 11 -3
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b6b3fd336f - Show all commits

3
src/routes/+page.svelte
View file

@ -1,9 +1,6 @@
<script> <script>
import Highlight from "$lib/Highlight.svelte"; import Highlight from "$lib/Highlight.svelte";
<<<<<<< HEAD
import LinkChip from "$lib/components/LinkChip.svelte"; import LinkChip from "$lib/components/LinkChip.svelte";
=======
>>>>>>> 9781dc7 (feat(root page): redesign the hero element, add dividers between sections)
import FlowerDivider from "$lib/components/FlowerDivider.svelte"; import FlowerDivider from "$lib/components/FlowerDivider.svelte";
import nix from "svelte-highlight/languages/nix"; import nix from "svelte-highlight/languages/nix";