diff --git a/src/lib/components/Cards/Card.svelte b/src/lib/components/Cards/Card.svelte index 42f9ff6..7cfe334 100644 --- a/src/lib/components/Cards/Card.svelte +++ b/src/lib/components/Cards/Card.svelte @@ -9,13 +9,13 @@ -
-
+
+
-
-
+
+
diff --git a/src/lib/components/Collapsible.svelte b/src/lib/components/Collapsible.svelte new file mode 100644 index 0000000..b45e247 --- /dev/null +++ b/src/lib/components/Collapsible.svelte @@ -0,0 +1,33 @@ + + +
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/lib/components/Timeline.svelte b/src/lib/components/Timeline.svelte index 8202f81..a8cdef0 100644 --- a/src/lib/components/Timeline.svelte +++ b/src/lib/components/Timeline.svelte @@ -1,40 +1,28 @@
{#each timelineData as entry, i}
- {#if openStates[i]} + {#if i == 0}
{:else}
{/if}

{entry.duration}

- - {#if openStates[i]} -

{@html entry.description}

- {/if} + + + {entry.title} + {entry.description} +
{/each}
diff --git a/src/main.svelte b/src/main.svelte index 2ba3d0f..c809b2e 100644 --- a/src/main.svelte +++ b/src/main.svelte @@ -8,6 +8,7 @@ import GridGallery from "$lib/components/GridGallery.svelte"; import SkillProgress from "$lib/components/SkillProgress.svelte"; import Timeline from '$lib/components/Timeline.svelte'; + import Collapsible from '$lib/components/Collapsible.svelte'; {#await getJson('/json/me.json')} @@ -24,7 +25,7 @@
-
+

{info.name}

{info.job_title}

@@ -47,7 +48,10 @@

{skill.name}

- {skill.about} + + About {skill.name} + {skill.about} +

{skill.link}