Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style cleanups #56

Merged
merged 9 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const router = createRouter({

const ControlledListsPreset = definePreset(ArchesPreset, {
semantic: {
iconSize: 'small',
iconSize: '1.2rem',
},
components: {
button: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ provide(systemLanguageKey, systemLanguage);
</script>

<template>
<!-- Subtract size of arches toolbars -->
<div style="width: calc(100vw - 50px); height: calc(100vh - 50px)">
<div style="height: 100vh; padding-bottom: 2.5rem">
<div class="list-editor-container">
<ListHeader />
<MainSplitter />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const panel = computed(() => {
</script>

<template>
<Splitter style="height: 100%">
<Splitter style="height: 100%; overflow: hidden">
<SplitterPanel
:size="34"
:size="30"
:min-size="25"
style="display: flex; flex-direction: column"
>
Expand All @@ -46,12 +46,12 @@ const panel = computed(() => {
</Suspense>
</SplitterPanel>
<SplitterPanel
:size="66"
:size="70"
:min-size="25"
:style="{
margin: '1rem 0rem 4rem 1rem',
overflowY: 'auto',
paddingRight: '4rem',
paddingRight: '2rem',
}"
>
<component
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ const focusInput = () => {
</Column>
<Column
:row-editor="true"
style="width: 5%; min-width: 6rem; text-align: center"
style="width: 5%; text-align: center; white-space: nowrap"
:pt="{
headerCell: { ariaLabel: $gettext('Row edit controls') },
}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ const focusInput = () => {
</Column>
<Column
:row-editor="true"
style="width: 5%; min-width: 6rem; text-align: center"
style="width: 5%; text-align: center; white-space: nowrap"
:pt="{
headerCell: { ariaLabel: $gettext('Row edit controls') },
}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,6 @@ function lazyLabelLookup(node: TreeNode) {
style: { width: '100%', fontSize: 'small' },
},
},
pcFilterIconContainer: {
root: {
style: { display: 'flex' },
},
},
wrapper: {
style: {
overflowY: 'auto',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@ import { shouldUseContrast } from "@/arches_references/utils.ts";
import type { Ref } from "vue";
import type { Language } from "@/arches_vue_utils/types";

const { $gettext } = useGettext();

const selectedLanguage = inject(selectedLanguageKey) as Ref<Language>;

const { expandAll, collapseAll } = defineProps<{
expandAll: () => void;
collapseAll: () => void;
}>();

let selectedLanguage: Ref<Language> | undefined;
if (arches.languages) {
// arches-lingo reuses this component without this provided.
selectedLanguage = inject(selectedLanguageKey);
}

const { $gettext } = useGettext();
</script>

<template>
Expand All @@ -44,7 +48,10 @@ const { expandAll, collapseAll } = defineProps<{
:label="$gettext('Collapse all')"
@click="collapseAll"
/>
<div style="display: flex; flex-grow: 1; justify-content: flex-end">
<div
v-if="arches.languages"
class="language-select"
>
<span
id="languageSelectLabel"
style="
Expand Down Expand Up @@ -78,4 +85,10 @@ const { expandAll, collapseAll } = defineProps<{
height: 3rem;
margin: 0.5rem;
}

.language-select {
display: flex;
flex-grow: 1;
justify-content: flex-end;
}
</style>
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
<div id="controlled-list-manager-mounting-point" style="font-family: 'Open Sans'"></div>
<div
id="controlled-list-manager-mounting-point"
style="height: 100%; width: 100%; font-family: 'Open Sans'"
></div>
Loading