Merge branch 'main' into pages

This commit is contained in:
Yanick Champoux 2021-06-13 13:21:12 -04:00
commit 6d93e33cd8
2 changed files with 54 additions and 42 deletions

View File

@ -2,7 +2,9 @@
<Header />
<nav>
<button class="button is-danger" type="button" on:click={reset}>reset</button>
<button class="button is-danger" type="button" on:click={reset}
>reset</button
>
<div class="spacer" />
@ -16,7 +18,9 @@
<button class="button" on:click={() => set_output("json")}>json</button>
</p>
<p class="control">
<button class="button" on:click={() => set_output("print")}>print</button>
<button class="button" on:click={() => set_output("print")}
>print</button
>
</p>
</div>
</nav>
@ -64,7 +68,12 @@
<AddWeapon />
{#each weapons as weapon (weapon.id)}
<Weapon {weapon} id={weapon.id} cost={weapon.cost} mass={weapon.mass} />
<Weapon
{weapon}
id={weapon.id}
cost={weapon.cost}
mass={weapon.mass}
/>
{/each}
</Section>
@ -73,7 +82,7 @@
<footer>
Written by <a href="https://twitter.com/yenzie">Yanick Champoux</a>. Code
available on
<a href="https://github.com/yanick/aotds-shipyard">Github</a>
<a href="https://github.com/aotds/aotds-shipyard">Github</a>
</footer>
{/if}
@ -135,7 +144,6 @@
let output = null;
const set_output = (value) => (output = value);
</script>
<style>
@ -177,5 +185,4 @@
.about {
margin-right: 2em;
}
</style>

View File

@ -1,7 +1,11 @@
<aside transition:fly={{x: -800, opacity: 1}}>
<aside transition:fly={{ x: -800, opacity: 1 }}>
<div>
<input type="button" class="button small red" value="close"
on:click={close}/>
<input
type="button"
class="button small red"
value="close"
on:click={close}
/>
</div>
<h3>welcome to the docks</h3>
@ -19,26 +23,27 @@
as closely as possible.
</p>
<p>The app is mostly developed for Firefox. I also check as much as I
can that I don't mess things too badly on Chrome. For the other
browsers... caveat emptor.</p>
<p>
The app is mostly developed for Firefox. I also check as much as I can
that I don't mess things too badly on Chrome. For the other browsers...
caveat emptor.
</p>
<p>
Written by
<a href="https://twitter.com/yenzie">Yanick Champoux</a>
. Code available on
<a href="https://github.com/yanick/aotds-shipyard">Github</a>
<a href="https://github.com/aotds/aotds-shipyard">Github</a>
</p>
</aside>
</aside>
<script>
import { fly } from 'svelte/transition';
import {createEventDispatcher} from 'svelte';
<script>
import { fly } from "svelte/transition";
import { createEventDispatcher } from "svelte";
const dispatch = createEventDispatcher();
const close = () => dispatch('close');
</script>
const close = () => dispatch("close");
</script>
<style>
aside {