Update all setting labels to be correctly cased and sized to fit new layout

This commit is contained in:
Andrew Kingston 2023-03-09 08:47:32 +00:00
parent db7f267887
commit 1508d4aea3
3 changed files with 203 additions and 184 deletions

View File

@ -74,11 +74,15 @@
}) })
</script> </script>
<div class="property-control" class:highlighted={highlighted && nullishValue}> <div
class="property-control"
class:wide={!label}
class:highlighted={highlighted && nullishValue}
>
{#if label} {#if label}
<Label size="M">{label}</Label> <Label size="M">{label}</Label>
{/if} {/if}
<div id={`${key}-prop-control`} class="control" class:wide={!label}> <div id={`${key}-prop-control`} class="control">
<svelte:component <svelte:component
this={control} this={control}
{componentInstance} {componentInstance}
@ -107,8 +111,8 @@
align-items: center; align-items: center;
transition: background 130ms ease-out, border-color 130ms ease-out; transition: background 130ms ease-out, border-color 130ms ease-out;
border-left: 4px solid transparent; border-left: 4px solid transparent;
margin: -6px calc(-1 * var(--spacing-xl)); margin: 0 calc(-1 * var(--spacing-xl));
padding: 2px var(--spacing-xl) 6px calc(var(--spacing-xl) - 4px); padding: 0 var(--spacing-xl) 0 calc(var(--spacing-xl) - 4px);
gap: 8px; gap: 8px;
} }
.property-control :global(.spectrum-FieldLabel) { .property-control :global(.spectrum-FieldLabel) {
@ -121,13 +125,15 @@
.control { .control {
position: relative; position: relative;
} }
.control.wide { .property-control.wide .control {
grid-column: 1 / -1; grid-column: 1 / -1;
} }
.text { .text {
margin-top: 4px;
font-size: var(--spectrum-global-dimension-font-size-75); font-size: var(--spectrum-global-dimension-font-size-75);
color: var(--grey-6); color: var(--grey-6);
grid-column: 2 / 2;
}
.property-control.wide .text {
grid-column: 1 / -1; grid-column: 1 / -1;
} }
</style> </style>

View File

@ -117,6 +117,7 @@
{#each sections as section, idx (section.name)} {#each sections as section, idx (section.name)}
{#if section.visible} {#if section.visible}
<DetailSummary name={section.name} collapsible={false}> <DetailSummary name={section.name} collapsible={false}>
<div class="settings">
{#if idx === 0 && !componentInstance._component.endsWith("/layout") && !isScreen} {#if idx === 0 && !componentInstance._component.endsWith("/layout") && !isScreen}
<PropertyControl <PropertyControl
control={Input} control={Input}
@ -160,6 +161,7 @@
{#if idx === 0 && componentDefinition?.component?.endsWith("/fieldgroup")} {#if idx === 0 && componentDefinition?.component?.endsWith("/fieldgroup")}
<ResetFieldsButton {componentInstance} /> <ResetFieldsButton {componentInstance} />
{/if} {/if}
</div>
</DetailSummary> </DetailSummary>
{/if} {/if}
{/each} {/each}
@ -168,3 +170,13 @@
<EjectBlockButton /> <EjectBlockButton />
</DetailSummary> </DetailSummary>
{/if} {/if}
<style>
.settings {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: stretch;
gap: 8px;
}
</style>

File diff suppressed because it is too large Load Diff