Consume more tokens from core arches

archesproject · Sep 10, 2024 · 076a995 · 076a995
1 parent bf986c9
commit 076a995
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 44 deletions.
diff --git a/arches_references/src/arches_references/components/ControlledListsMain.vue b/arches_references/src/arches_references/components/ControlledListsMain.vue
@@ -61,14 +61,9 @@ provide(selectedLanguageKey, selectedLanguage);
     <ConfirmDialog
         :draggable="false"
         :pt="{
-            root: {
-                style: {
-                    fontSize: 'small',
-                },
-            },
             header: {
                 style: {
-                    background: 'var(--p-navigation)',
+                    background: 'var(--p-navigation-color)',
                     color: 'white',
                     borderRadius: '1rem',
                     marginBottom: '1rem',
@@ -77,6 +72,7 @@ provide(selectedLanguageKey, selectedLanguage);
             title: {
                 style: {
                     fontWeight: 800,
+                    fontSize: 'small',
                 },
             },
         }"

diff --git a/arches_references/src/arches_references/components/editor/ImageMetadata.vue b/arches_references/src/arches_references/components/editor/ImageMetadata.vue
@@ -336,21 +336,18 @@ const focusInput = () => {
                     <i
                         class="fa fa-pencil"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
                 <template #roweditorsaveicon>
                     <i
                         class="fa fa-check"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
                 <template #roweditorcancelicon>
                     <i
                         class="fa fa-undo"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
             </Column>
@@ -371,7 +368,7 @@ const focusInput = () => {
             </Column>
         </DataTable>
     </div>
-    <div style="display: flex; gap: 1rem">
+    <div style="display: flex; gap: var(--p-content-gap)">
         <AddMetadata
             :image
             :labeled-choices
@@ -409,4 +406,8 @@ const focusInput = () => {
 :deep(.p-datatable-column-title) {
     font-size: small;
 }
+
+i {
+    font-size: var(--p-icon-size);
+}
 </style>
diff --git a/arches_references/src/arches_references/components/editor/ItemHeader.vue b/arches_references/src/arches_references/components/editor/ItemHeader.vue
@@ -43,7 +43,7 @@ const iconLabel = (item: ControlledListItem) => {
 .item-header {
     display: inline-flex;
     align-items: center;
-    gap: 1rem;
+    gap: var(--p-content-gap);
     margin: 1rem 1rem 0rem 1rem;
     padding-bottom: 1rem;
     border-bottom: 1px solid;

diff --git a/arches_references/src/arches_references/components/editor/ItemType.vue b/arches_references/src/arches_references/components/editor/ItemType.vue
@@ -58,14 +58,14 @@ const issuePatchItem = async () => {
     margin: 1rem 1rem 3rem 1rem;
     display: flex;
     flex-direction: column;
-    gap: 1rem;
+    gap: var(--p-content-gap);
     width: 100%;
     font-size: small;
 }
 
 .guide-switch {
     display: inline-flex;
-    gap: 1rem;
+    gap: var(--p-content-gap);
     align-items: center;
 }
 

diff --git a/arches_references/src/arches_references/components/editor/ItemURI.vue b/arches_references/src/arches_references/components/editor/ItemURI.vue
@@ -162,7 +162,7 @@ input {
 }
 
 .edit-controls i {
-    font-size: small;
+    font-size: var(--p-icon-size);
     padding: 0.5rem;
 }
 </style>
diff --git a/arches_references/src/arches_references/components/editor/ListCharacteristic.vue b/arches_references/src/arches_references/components/editor/ListCharacteristic.vue
@@ -97,7 +97,7 @@ const cancel = () => {
                 :aria-label="$gettext('Edit')"
                 @click="editing = true"
                 @keyup.enter="editing = true"
-            />
+            ></i>
         </span>
         <span
             v-if="props.editable && editing"
@@ -110,15 +110,15 @@ const cancel = () => {
                 :aria-label="$gettext('Save edit')"
                 @click="save"
                 @keyup.enter="save"
-            />
+            ></i>
             <i
                 role="button"
                 tabindex="0"
                 class="fa fa-undo"
                 :aria-label="$gettext('Cancel edit')"
                 @click="cancel"
                 @keyup.enter="cancel"
-            />
+            ></i>
         </span>
     </div>
 </template>

diff --git a/arches_references/src/arches_references/components/editor/ListCharacteristics.vue b/arches_references/src/arches_references/components/editor/ListCharacteristics.vue
@@ -36,21 +36,21 @@ const { $gettext } = useGettext();
                 :label="$gettext('Dynamic')"
                 :style="{ width: '4rem' }"
             />
-            <h4 class="nodes-heading">
-                {{ $gettext("List used by these nodes") }}
-            </h4>
-            <div class="nodes">
-                <div
-                    v-for="node in list.nodes"
-                    :key="node.id"
-                >
-                    <ReferenceNodeLink :node />
-                </div>
-                <div
-                    v-if="list.nodes.length === 0"
-                    :style="{ fontSize: 'small' }"
-                >
-                    {{ $gettext("None") }}
+            <div class="nodes-heading">
+                <h4>{{ $gettext("List used by these nodes") }}</h4>
+                <div class="nodes">
+                    <div
+                        v-for="node in list.nodes"
+                        :key="node.id"
+                    >
+                        <ReferenceNodeLink :node />
+                    </div>
+                    <div
+                        v-if="list.nodes.length === 0"
+                        :style="{ fontSize: 'small' }"
+                    >
+                        {{ $gettext("None") }}
+                    </div>
                 </div>
             </div>
         </div>
@@ -61,7 +61,7 @@ const { $gettext } = useGettext();
 .controlled-list-header {
     display: inline-flex;
     align-items: center;
-    gap: 1rem;
+    gap: var(--p-content-gap);
     margin: 1rem 1rem 0rem 1rem;
     padding-bottom: 1rem;
     border-bottom: 1px solid;
@@ -79,7 +79,6 @@ h3 {
 .nodes {
     display: flex;
     flex-wrap: wrap;
-    gap: 1rem;
-    margin: 1rem;
+    gap: var(--p-content-gap);
 }
 </style>
diff --git a/arches_references/src/arches_references/components/editor/ValueEditor.vue b/arches_references/src/arches_references/components/editor/ValueEditor.vue
@@ -363,21 +363,18 @@ const focusInput = () => {
                     <i
                         class="fa fa-pencil"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
                 <template #roweditorsaveicon>
                     <i
                         class="fa fa-check"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
                 <template #roweditorcancelicon>
                     <i
                         class="fa fa-undo"
                         aria-hidden="true"
-                        style="font-size: small"
                     ></i>
                 </template>
             </Column>
@@ -393,7 +390,7 @@ const focusInput = () => {
                         :aria-label="$gettext('Delete')"
                         @click="issueDeleteValue(slotProps.data)"
                         @keyup.enter="issueDeleteValue(slotProps.data)"
-                    />
+                    ></i>
                 </template>
             </Column>
         </DataTable>
@@ -414,6 +411,10 @@ h4 {
     margin-top: 0;
 }
 
+i {
+    font-size: var(--p-icon-size);
+}
+
 p {
     font-weight: normal;
     margin-top: 0;

diff --git a/arches_references/src/arches_references/components/misc/ControlledListSplash.vue b/arches_references/src/arches_references/components/misc/ControlledListSplash.vue
@@ -39,7 +39,7 @@ const { $gettext } = useGettext();
     border: 1px solid #ddd;
     padding: 4rem 3rem;
     background: #f6f6f6;
-    border-radius: 0.5rem;
+    border-radius: var(--p-content-border-radius);
     display: flex;
     flex-direction: column;
     align-items: center;

diff --git a/arches_references/src/arches_references/components/misc/ListHeader.vue b/arches_references/src/arches_references/components/misc/ListHeader.vue
@@ -61,7 +61,7 @@ const heading = computed(() => {
 .header {
     display: flex;
     align-items: center;
-    background: var(--p-navigation);
+    background: var(--p-navigation-color);
     color: white;
 }
 

diff --git a/arches_references/src/arches_references/components/tree/AddDeleteControls.vue b/arches_references/src/arches_references/components/tree/AddDeleteControls.vue
@@ -204,12 +204,12 @@ const confirmDelete = () => {
         acceptProps: {
             label: $gettext("Delete"),
             severity: shouldUseContrast() ? CONTRAST : DANGER,
-            outlined: true,
+            style: { fontSize: "small" },
         },
         rejectProps: {
             label: $gettext("Cancel"),
             severity: shouldUseContrast() ? CONTRAST : SECONDARY,
-            outlined: true,
+            style: { fontSize: "small" },
         },
         accept: async () => {
             await deleteSelected().then(fetchListsAndPopulateTree);

diff --git a/arches_references/src/arches_references/components/tree/TreeRow.vue b/arches_references/src/arches_references/components/tree/TreeRow.vue
@@ -348,7 +348,7 @@ const acceptNewListShortcutEntry = async () => {
 <style scoped>
 .actions {
     display: inline-flex;
-    gap: 1rem;
+    gap: var(--p-content-gap);
     margin-left: 1rem;
     width: 100%;
     justify-content: space-between;