Merge branch 'master' into gui_search

This commit is contained in:
venashial
2022-08-03 00:44:17 -07:00
parent b0a55c9b18
commit 51982dde62
79 changed files with 6320 additions and 6336 deletions
@@ -1,49 +1,52 @@
<script lang="ts">
import VerticalNav from "$components/VerticalNav.svelte";
import IconPackage from 'virtual:icons/lucide/package'
import IconAdjustments from 'virtual:icons/heroicons-outline/adjustments'
import IconFileText from 'virtual:icons/lucide/file-text'
import VerticalNav from '$components/VerticalNav.svelte';
import IconPackage from 'virtual:icons/lucide/package';
import IconAdjustments from 'virtual:icons/heroicons-outline/adjustments';
import IconFileText from 'virtual:icons/lucide/file-text';
</script>
<div class="layout-instance">
<div class="instance-sidebar">
<VerticalNav level={3} items={[
<div class="instance-sidebar">
<VerticalNav
level={3}
items={[
{
label: 'Mods',
href: 'mods',
icon: IconPackage,
label: 'Mods',
href: 'mods',
icon: IconPackage
},
{
label: 'Settings',
href: 'settings',
icon: IconAdjustments,
label: 'Settings',
href: 'settings',
icon: IconAdjustments
},
{
label: 'Logs',
href: 'logs',
icon: IconFileText,
label: 'Logs',
href: 'logs',
icon: IconFileText
}
]}/>
</div>
]}
/>
</div>
<div class="layout-instance__page">
<slot />
</div>
<div class="layout-instance__page">
<slot />
</div>
</div>
<style lang="postcss">
.layout-instance {
display: grid;
grid-template-columns: 224px 1fr;
height: 100%;
.layout-instance {
display: grid;
grid-template-columns: 224px 1fr;
height: 100%;
&__page {
height: 100%;
background-color: var(--sub-page-bg);
}
&__page {
height: 100%;
background-color: var(--sub-page-bg);
}
}
.instance-sidebar {
padding: 16px;
}
.instance-sidebar {
padding: 16px;
}
</style>
@@ -1,43 +1,45 @@
<script lang="ts">
import { Checkbox, FormField, TextInput, Button } from "omorphia"
import GlobalSettings from "$components/GlobalSettings.svelte"
import TitledSection from "$components/TitledSection.svelte"
<script context="module" lang="ts">
</script>
export let overrideGlobalSettings = false
<script lang="ts">
import GlobalSettings from '$components/GlobalSettings.svelte';
import TitledSection from '$components/TitledSection.svelte';
export let overrideGlobalSettings = false;
</script>
<div class="section">
<TitledSection title="Override global settings" toggleable={true}>
<GlobalSettings />
</TitledSection>
<TitledSection title="Override global settings" toggleable={true}>
<GlobalSettings />
</TitledSection>
</div>
<style lang="postcss">
.section {
display: flex;
flex-direction: column;
padding: 1rem;
grid-gap: 1rem;
.section {
display: flex;
flex-direction: column;
padding: 1rem;
grid-gap: 1rem;
&__title {
display: flex;
grid-gap: 1rem;
align-items: center;
&__title {
display: flex;
grid-gap: 1rem;
align-items: center;
&::after {
flex: 1 1;
content: " ";
background-color: hsla(0, 0%, 100%, 0.2);
height: 0.2rem;
border-radius: var(--rounded-max);
}
}
&__items {
display: flex;
flex-direction: column;
grid-gap: 1rem;
padding: 0 8px;
}
&::after {
flex: 1 1;
content: ' ';
background-color: hsla(0, 0%, 100%, 0.2);
height: 0.2rem;
border-radius: var(--rounded-max);
}
}
&__items {
display: flex;
flex-direction: column;
grid-gap: 1rem;
padding: 0 8px;
}
}
</style>