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

WIP: container sheet overhaul, with file structure changes #866

Merged
merged 105 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
7eb8812
Inlined or colocated as many of the CSS variables as possible, in pre…
kgar Sep 27, 2024
cb96eac
Added color variables for light and dark modes.
kgar Sep 28, 2024
7a0b2bd
Repathed classic sheets into sheets/classic, to make room for the hig…
kgar Sep 28, 2024
9eaa8de
Additional path-based fixes and scss style fixes.
kgar Sep 28, 2024
e0fce57
Added gradient variables.
kgar Sep 28, 2024
bae3b29
Added stub container hightouch sheet, component, and registration.
kgar Sep 28, 2024
64bfcfd
Copied over all of the container sheet code from classic to hightouch.
kgar Sep 28, 2024
2935b3a
Moved classic styles down to a /scss/classic/ directory. Hoisted vari…
kgar Sep 28, 2024
266c9d5
Added some App V2 stylings for all hightouch apps.
kgar Sep 28, 2024
aa9f491
Made sheet header interactible across entire horizontal sheet header …
kgar Sep 28, 2024
b339a21
Added denim dark and gray texture for the overhaul.
kgar Sep 28, 2024
7bdc6ae
Added loc key for sections content.
kgar Sep 28, 2024
9bbe26c
Repurposed the text styleshet to be general util stylesheet.
kgar Sep 28, 2024
cd7dfe7
Added styles for item rarity in the sidebar.
kgar Sep 29, 2024
7bf7b27
Added min-width to the item sheet.
kgar Sep 29, 2024
8fcbd4a
Adjusted border for pills to delineate standard and interactive pills.
kgar Sep 29, 2024
45ffa83
Started container contents tab
kgar Sep 29, 2024
7bf4a30
Generalized isActorSheetUnlocked to isSheetUnlocked.
kgar Sep 29, 2024
1d21061
Extracted component styles to their own subdirectory.
kgar Sep 29, 2024
657e284
Fixed annoyance with sheet lock button not always firing in the header.
kgar Sep 30, 2024
d121183
Successfully got hightouch's item border to render reliably and apply…
kgar Sep 30, 2024
95b3c9f
Standardized some of the new variable names to lower kebab case only.
kgar Sep 30, 2024
1d62686
Fixed issue where item image border doesn't scale when Foundry font s…
kgar Sep 30, 2024
db943f2
Added utility toolbar component.
kgar Oct 1, 2024
bce682e
Replaced texture gray with its webp variant. Added bottom texture webp.
kgar Oct 1, 2024
c36a11e
Added roboto condensed variable (plus italic) fonts.
kgar Oct 1, 2024
c1b1e63
Moved individual tab content styles to the classic tabs stylesheet.
kgar Oct 1, 2024
c4fbd9b
Added optional baseWidth for TidyTableCell, to allow for flex-based i…
kgar Oct 2, 2024
4084e79
Went ahead and made new use of tidy tables support grid template colu…
kgar Oct 2, 2024
d4ec47f
Added filigree component styles.
kgar Oct 2, 2024
053ac5a
Formatting
kgar Oct 2, 2024
c4c9d05
Added full-height utility for hightouch styles.
kgar Oct 2, 2024
5619eca
Corrected colors on vertical filigree guideline styles.
kgar Oct 2, 2024
6bb4526
Added action bar sheet part.
kgar Oct 2, 2024
eaca84e
Added action bar and input component styles.
kgar Oct 2, 2024
b0f03ce
Added button base styles. Moved App V2 resets to their appropriate co…
kgar Oct 2, 2024
8cc8756
Further specified default hightouch button styles.
kgar Oct 2, 2024
aaf626d
Added reset styles for hightouch layout.
kgar Oct 2, 2024
5518e0e
Unbuttoned the item image.
kgar Oct 4, 2024
41d44a6
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Oct 7, 2024
4f2638c
Added proper typing to Svelte Mixin's additional components function.
kgar Oct 8, 2024
381bb94
Simplified menu auto-close by utilizing focusout to determine whether…
kgar Oct 8, 2024
6865bfd
Added inversion toggle to debug sheet.
kgar Oct 8, 2024
63c9d18
Added ButtonWithOptionPanel component.
kgar Oct 8, 2024
bbcff26
Added reset styles for radio buttons.
kgar Oct 8, 2024
2746d72
Refined button styles.
kgar Oct 8, 2024
dd8aabf
Added more gallery contents to the debug sheet.
kgar Oct 8, 2024
5138044
Added more debug controls.
kgar Oct 9, 2024
7868f55
Took some notes for issues I noticed.
kgar Oct 9, 2024
6711fba
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Oct 9, 2024
afcef0a
Implemented ToggleButton.
kgar Oct 9, 2024
45c35cc
Added basics for a pill switch and put a pill switch on the demo page.
kgar Oct 10, 2024
c761175
Tried another approach to improve consistency of positioning of icons…
kgar Oct 11, 2024
a45af06
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Oct 12, 2024
19f2872
Revamped the field toggle to use SVGs for all its components. Correct…
kgar Oct 13, 2024
2e79318
Added inverse/dark pill switch icon colors.
kgar Oct 13, 2024
50711a4
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Oct 13, 2024
f5c9021
Added commented alternate approach to dealing with radio button lock …
kgar Oct 14, 2024
c35729e
Overrode app v2 checkbox and applied hightouch styles.
kgar Oct 14, 2024
6deba76
Added readonly pills to debug sheet.
kgar Oct 14, 2024
87f7435
Added spell component styles.
kgar Oct 14, 2024
1a203b0
Implemented data time with title and subtitle and added to debug sheet.
kgar Oct 14, 2024
3e72378
Styled up inputs.
kgar Oct 16, 2024
914827e
Added styles for input hover and addressed it in search styles.
kgar Oct 17, 2024
566a878
Implemented input group to accommodate things like currency inputs.
kgar Oct 18, 2024
08dd790
Minor adjustments to button styles to account for Figma details.
kgar Oct 19, 2024
d639f83
Added complex item form markup to demo sheet.
kgar Oct 28, 2024
7cffb54
Fixed checkbox styles when included in form groups.
kgar Oct 28, 2024
6cf8589
Added numeric inputs to the standard input styles.
kgar Oct 28, 2024
baccdd2
Styled up fieldsets and form groups 💪
kgar Oct 28, 2024
c0a7e5e
Refined form styles based on additional Figma review.
kgar Oct 28, 2024
981d889
Added support for no-newline textareas in forms.
kgar Oct 29, 2024
419a519
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Nov 1, 2024
0780187
Added missing variables
kgar Nov 3, 2024
1f45f58
Added header styles to apps stylesheet.
kgar Nov 3, 2024
eb72966
Added gold header underline component.
kgar Nov 3, 2024
bf918c0
Added item descriptions to the debug sheet.
kgar Nov 3, 2024
4b0c3de
Added item descriptions component and styles.
kgar Nov 3, 2024
c673955
Added item descriptions to item descriptions tab.
kgar Nov 3, 2024
d6fa4ea
Added base container details form to new container sheet with the pro…
kgar Nov 3, 2024
8b9d43a
Filled out remainder of container sheet.
kgar Nov 3, 2024
f1c992c
Implemented secrets management in new item descriptions / collapsible…
kgar Nov 4, 2024
a79c405
Revised pill styles based on Figma review.
kgar Nov 4, 2024
e50525a
Separated attunement applicability from fetching attunement context.
kgar Nov 4, 2024
f27bbfc
Added meter styles.
kgar Nov 4, 2024
6fc796b
Implemented CapacityBar component for new sheet and ensured it fits i…
kgar Nov 4, 2024
911e79f
Began implementing container currency tracker.
kgar Nov 5, 2024
8cc1ddd
Added custom Tidy section content to container sheet details tab.
kgar Nov 5, 2024
ab80da3
Styled up editor enrichers.
kgar Nov 5, 2024
eec2766
Added item styles to help extend the editor surface area to the rest …
kgar Nov 5, 2024
60e2756
Ensured no transient scrollbars appear when collapsing editor sections.
kgar Nov 5, 2024
75e0632
Corrected currency convert button handling.
kgar Nov 5, 2024
4663e7e
Delineated item summary styles between classic and hightouch sheets.
kgar Nov 5, 2024
e9053e0
Added pill styles for the tag class.
kgar Nov 5, 2024
2547341
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Nov 6, 2024
b8df899
Fixed debug sheet now that some additional flex stylings have come al…
kgar Nov 6, 2024
c63e753
Corrected the action bar button icon font size.
kgar Nov 6, 2024
b5b1bef
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Nov 13, 2024
e3128c5
Merge branch 'container-sheet-overhaul' of github.com:kgar/foundry-ti…
kgar Nov 13, 2024
6edfddd
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Nov 28, 2024
d42f9c8
Merge branch 'main' of github.com:kgar/foundry-tidy5e-sheet-2 into co…
kgar Dec 1, 2024
3a7ad52
Fixed check errors.
kgar Dec 1, 2024
e77c2b6
Moved hightouch sheet into debug mode only.
kgar Dec 1, 2024
89dd3c8
Changed new container sheet title for clarity.
kgar Dec 1, 2024
f3bae4d
Corrected Foundry font paths.
kgar Dec 1, 2024
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
Prev Previous commit
Next Next commit
Filled out remainder of container sheet.
Made minor tweaks and adjustments.

Removed mention of quantity on the container sheet because containers cannot be any other quantity than 1.
  • Loading branch information
kgar committed Nov 3, 2024
commit 8b9d43aa60ec8dcd6f99426094d159d0a777bdaa
1 change: 1 addition & 0 deletions src/runtime/item/ItemSheetRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export class ItemSheetRuntime {
tempHightouchTabs: () => [
itemSheetTabs.hightouchContainerContents,
itemSheetTabs.hightouchDescription,
// TODO: Only show to GMs and users when identified
itemSheetTabs.hightouchContainerDetails,
],
},
Expand Down
12 changes: 6 additions & 6 deletions src/runtime/item/item-sheet-tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ const itemSheetTabs = {
title: 'DND5E.Contents',
content: {
component: ContainerContentsTab,
type: 'svelte'
}
type: 'svelte',
},
},
/**
* Details form for containers.
Expand All @@ -184,8 +184,8 @@ const itemSheetTabs = {
title: 'DND5E.Details',
content: {
component: ContainerDetailsTab,
type: 'svelte'
}
type: 'svelte',
},
},
/**
* Three-descriptions interface for items
Expand All @@ -195,8 +195,8 @@ const itemSheetTabs = {
title: 'DND5E.Description',
content: {
component: HightouchItemDescriptionsTab,
type: 'svelte'
}
type: 'svelte',
},
},
/**
* Details form for loot.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
letter-spacing: 0.01rem;
line-height: normal;


flex: 1;
display: flex;
align-items: center;
gap: 0.25rem;
Expand Down
6 changes: 3 additions & 3 deletions src/sheets/hightouch/container/ContainerSheet.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@
</span>
</div>

<div class="item-header-summary-separator" role="presentation"></div>
<!-- <div class="item-header-summary-separator" role="presentation"></div> -->

<!-- Quantity -->
<div class="item-quantity">
<!-- <div class="item-quantity">
<span class="item-quantity-label text-lighter">
{localize('DND5E.Quantity')}
</span>
<span class="item-quantity-value">
{$context.system.quantity}
</span>
</div>
</div> -->
</div>

<!-- Tab Strip -->
Expand Down
114 changes: 83 additions & 31 deletions src/sheets/hightouch/container/tabs/ContainerDetailsTab.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import NumberInput from 'src/components/inputs/NumberInput.svelte';
import Checkbox from 'src/components/inputs/Checkbox.svelte';
import { CONSTANTS } from 'src/constants';
import ItemProperties from 'src/sheets/classic/item/parts/ItemProperties.svelte';

let context = getContext<Readable<ContainerSheetClassicContext>>(
CONSTANTS.SVELTE_CONTEXT.CONTEXT,
Expand All @@ -18,14 +19,61 @@
const localize = FoundryAdapter.localize;
</script>

<fieldset>
<div class="form-group">
<label for="{appId}-weight">
{localize('DND5E.Weight')}
</label>
<div class="form-fields">
<NumberInput
id="{appId}-weight-value"
value={$context.source.weight.value}
step="any"
field="system.weight.value"
document={$context.item}
disabled={!$context.editable}
selectOnFocus={true}
/>
</div>
</div>
<div class="form-group">
<label for="{appId}-price-value">
{localize('DND5E.Price')}
</label>
<div class="form-fields">
<NumberInput
id="{appId}-price-value"
value={$context.source.price.value}
step="any"
field="system.price.value"
document={$context.item}
disabled={!$context.editable}
selectOnFocus={true}
cssClass="large-value"
/>
<Select
value={$context.source.price.denomination}
field="system.price.denomination"
document={$context.item}
disabled={!$context.editable}
>
<SelectOptions
data={$context.config.currencies}
labelProp="abbreviation"
/>
</Select>
</div>
</div>
</fieldset>

<fieldset>
<legend>
{localize('DND5E.ItemContainerDetails')}
</legend>

<div class="form-group stacked container-properties">
<label for="">{localize('DND5E.ItemContainerProperties')}</label>
<p>TODO: Item Properties Here</p>
<ItemProperties />
</div>

<div class="form-group">
Expand All @@ -48,40 +96,44 @@
<label for="{appId}-capacity-type"
>{localize('DND5E.ItemContainerCapacityType')}</label
>
<Select
id="{appId}-capacity-type"
document={$context.item}
field="system.capacity.type"
value={$context.source.capacity.type}
disabled={!$context.editable}
>
<SelectOptions data={$context.config.itemCapacityTypes} />
</Select>
<div class="form-fields">
<Select
id="{appId}-capacity-type"
document={$context.item}
field="system.capacity.type"
value={$context.source.capacity.type}
disabled={!$context.editable}
>
<SelectOptions data={$context.config.itemCapacityTypes} />
</Select>
</div>
</div>

<div class="form-group">
<label for="{appId}-attunement">{localize('DND5E.Attunement')}</label>
<Checkbox
id="{appId}-attuned"
document={$context.item}
field="system.attuned"
checked={$context.source.attuned}
disabled={!$context.editable ||
// @ts-expect-error
!$context.config.attunementTypes[$context.system.attunement]}
title={localize('DND5E.AttunementAttuned')}
/>
<Select
id="{appId}-attunement"
document={$context.item}
field="system.attunement"
value={$context.source.attunement}
disabled={!$context.editable}
>
<SelectOptions
data={$context.config.attunementTypes}
blank={localize('DND5E.AttunementNone')}
<div class="form-fields">
<Checkbox
id="{appId}-attuned"
document={$context.item}
field="system.attuned"
checked={$context.source.attuned}
disabled={!$context.editable ||
// @ts-expect-error
!$context.config.attunementTypes[$context.system.attunement]}
title={localize('DND5E.AttunementAttuned')}
/>
</Select>
<Select
id="{appId}-attunement"
document={$context.item}
field="system.attunement"
value={$context.source.attunement}
disabled={!$context.editable}
>
<SelectOptions
data={$context.config.attunementTypes}
blank={localize('DND5E.AttunementNone')}
/>
</Select>
</div>
</div>
</fieldset>