feat: prettify the layour

Merge branch 'layout' into version-2
main
Yanick Champoux 2022-03-15 10:59:40 -04:00
commit 4c70a5ff39
4 changed files with 20 additions and 4 deletions

View File

@ -1,9 +1,12 @@
<Ribbon /> <Ribbon />
<Header /> <Header />
<ShipEdit />
<script> <script>
import Ribbon from "./Ribbon.svelte"; import Ribbon from "./Ribbon.svelte";
import Header from "./Header.svelte"; import Header from "./Header.svelte";
import ShipEdit from './ShipEdit/index.svelte';
</script> </script>
<style> <style>

View File

@ -1,5 +1,6 @@
<main>
<div class="identification-row"> <div class="identification-row">
<Identification {...$shipState.identification} {...$shipState.reqs} /> <Identification {...$shipState.identification} />
<ShipCost {...$shipState.reqs} /> <ShipCost {...$shipState.reqs} />
</div> </div>
@ -11,6 +12,7 @@
<Weaponry {...$shipState.weaponry}/> <Weaponry {...$shipState.weaponry}/>
<Carrier {...$shipState.carrier} /> <Carrier {...$shipState.carrier} />
</main>
<script> <script>
import { getContext } from "svelte"; import { getContext } from "svelte";
@ -33,4 +35,10 @@
.identification-row :global(> *:first-child) { .identification-row :global(> *:first-child) {
flex: 1; flex: 1;
} }
main {
width: var(--main-width);
margin-left: auto;
margin-right: auto;
}
</style> </style>

View File

@ -11,13 +11,13 @@ import weaponry from "./weaponry/index.js";
import { screensReqsReaction } from "./structure/screens.js"; import { screensReqsReaction } from "./structure/screens.js";
const dux = new Updux({ const dux = new Updux({
subduxes: { subduxes: {
identification, identification,
propulsion, propulsion,
structure, structure,
carrier, carrier,
weaponry, weaponry,
}, },
initial: { initial: {
reqs: { cost: 0, mass: 10, usedMass: 0 }, reqs: { cost: 0, mass: 10, usedMass: 0 },
}, },
@ -55,5 +55,4 @@ dux.addReaction( (store) => (state) => {
}); });
export default dux; export default dux;

View File

@ -1,9 +1,15 @@
<App /> <App />
<script> <script>
import { setContext } from "svelte";
import "../../static/fonts/faktos.css"; import "../../static/fonts/faktos.css";
import "../../static/fonts/dosis/dosis.css"; import "../../static/fonts/dosis/dosis.css";
import "../../static/global.css"; import "../../static/global.css";
import shipStore from "$lib/store/ship.js";
import App from "$lib/components/App.svelte"; import App from "$lib/components/App.svelte";
setContext("ship", shipStore());
</script> </script>