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

Feat/ancestry sheets #12 #56

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
88c6fc4
chore: Fixed custom fonts
zithith Sep 27, 2024
c37424f
feat(ancestry sheets): Aded basic Ancestry sheets and advancement dat…
zithith Sep 27, 2024
38fe4db
feat(culture sheet): updated culture sheets to use prosemirror editor…
zithith Sep 28, 2024
6da5640
chore: minor item header style update
zithith Sep 28, 2024
0714a38
Merge branch 'release-0.1.0' of https://github.com/zithith/cosmere-rp…
zithith Sep 28, 2024
24d81ce
chore: post merge alignment. Updated Connection, injury, loot, path &…
zithith Sep 29, 2024
6a2c1b2
chore: item sheets tab styling alignment
zithith Sep 29, 2024
e6332a9
feat(item sheets): refactored description enrichment to base item sheets
zithith Sep 29, 2024
8a84d4c
feat(ancestry sheets): removed custom prose-mirror component
zithith Sep 29, 2024
41b43fe
Merge branch 'release-0.1.0' of https://github.com/zithith/cosmere-rp…
zithith Sep 29, 2024
13b5b84
chore: updated armor and trait items to use description placeholders
zithith Sep 29, 2024
20f663b
feat(item sheets): ancestry details tab added, with some placeholder …
zithith Sep 30, 2024
b96fe43
chore: updated missed label localisation
zithith Sep 30, 2024
7df46c8
Merge branch 'release-0.1.0' of https://github.com/zithith/cosmere-rp…
zithith Oct 2, 2024
9ad1328
feat(item sheets): updated new sheet types to include description pla…
zithith Oct 2, 2024
41f14c2
feat(item sheets): Ancestry details tab placeholders replaced with va…
zithith Oct 6, 2024
bc8d5c8
css tweaks
zithith Oct 6, 2024
3b8dcd4
Merge branch 'release-0.1.0' of https://github.com/zithith/cosmere-rp…
zithith Oct 6, 2024
d66f0cd
feat(item sheets): made item sheet tab display into a world setting
zithith Oct 7, 2024
e65b6cb
feat(item sheets): style tweaks
zithith Oct 8, 2024
60eeb7d
feat: add document ref input component
stanavdb Oct 10, 2024
7051959
feat(ancestry sheet): improve usability of advancement extra talents …
stanavdb Oct 11, 2024
e5767b1
feat(ancestry sheet): replace talent picks list with bonus talents ru…
stanavdb Oct 12, 2024
97a8dc9
Merge pull request #1 from zithith/ancestry-sheet-pr
zithith Oct 13, 2024
6dc15fa
Merge branch 'release-0.1.0' of https://github.com/zithith/cosmere-rp…
zithith Oct 13, 2024
39378bd
feat(ancestry-sheets): PR comments addressed:
zithith Oct 16, 2024
2027bbd
feat(item sheets): updated description tab to display read-only eleme…
zithith Oct 17, 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
13 changes: 11 additions & 2 deletions src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
--plotweaver-color-invest-front: #3e6abb;
--plotweaver-color-invest-back: #182845;

--font-primary: 'Laski Sans';
--font-h5: 'Laski-Sans';
// --font-primary: 'Laski Sans';
// --font-h5: 'Laski-Sans';

/* ----------------------------------------- */
/* Default Generic Theme */
Expand Down Expand Up @@ -99,12 +99,21 @@
.application h1,
span.document-name {
font-family: 'Penumbra Web Pro';
zithith marked this conversation as resolved.
Show resolved Hide resolved
font-variant: small-caps;
}

.application h4 {
font-variant: small-caps;
}

.application h5 {
font-family: 'Laski Sans';
}

.application {
font-family: 'Laski Sans';
}

em.cosmere-icon,
i.cosmere-icon {
font-family: 'cosmere-dingbats';
Expand Down
135 changes: 6 additions & 129 deletions src/style/sheets/item/module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
}
}

&:not(.minimized) > .window-header {
.window-title {
visibility: hidden;
}
}

.sheet-content {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -247,135 +253,6 @@ app-item-effects-list {
}
}

app-item-talent-picks-list {
.talent-picks-list {
display: grid;
grid-template-columns: [level-start] 8ch [level-end quantity-start] 8ch [quantity-end controls-start] 10ch [controls-end];
justify-content: center;
padding: 0;
margin-top: 0.5rem;

.talent-picks {
align-content: center;
text-align: center;
background: #302831;
height: 2rem;
padding: 0 0.5rem;
margin: 0;

span {
display: block;
}

&.header {
background: #0f0610;
border-top-left-radius: 0.3rem;
border-top-right-radius: 0.3rem;
font-weight: bold;
}

&:not(.header):not(:last-child) {
border-bottom: 1px solid #463a47;
}

&.new {
grid-column: level-start / controls-end;
background: #251d26;
justify-self: center;
width: 100%;

a {
display: inline-flex;
gap: 5px;
align-items: center;
opacity: 0.6;

&:hover {
opacity: 1;
}
}
}

&:last-child {
border-bottom-left-radius: 0.3rem;
border-bottom-right-radius: 0.3rem;
}
}
}
}

app-item-talents-list {
margin-top: 0.5rem;

.talents-list {
width: fit-content;
display: grid;
grid-template-columns:
[id-start] 16ch [id-end name-start] minmax(20ch, 1fr)
[name-end level-start] 10ch [level-end controls-start] 10ch [controls-end];
padding: 0;
margin-top: 0;
margin-bottom: 0;
margin-left: auto;
margin-right: auto;

.talent {
align-content: center;
text-align: center;
background: #302831;
height: 2rem;
padding: 0 0.5rem;
margin: 0;

span {
display: block;
}

&.name {
text-align: start;
}

&.header {
background: #0f0610;
border-top-left-radius: 0.3rem;
border-top-right-radius: 0.3rem;
font-weight: bold;
}

&:not(.header):not(:last-child) {
border-bottom: 1px solid #463a47;
}

&.new {
grid-column: id-start / controls-end;
background: #251d26;
justify-self: center;
width: 100%;

a {
display: inline-flex;
gap: 5px;
align-items: center;
opacity: 0.6;

&:hover {
opacity: 1;
}
}
}

&:last-child {
border-bottom-left-radius: 0.3rem;
border-bottom-right-radius: 0.3rem;
}
}
}
}

app-prose-mirror-editor {
flex: 1;
}

app-item-properties {
.properties-list {
height: 100%;
Expand Down
1 change: 0 additions & 1 deletion src/system/applications/item/ancestry-sheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export class AncestrySheet extends BaseItemSheet {
window: {
resizable: true,
positioned: true,
title: '<i class="fas fa-timeline"></i> ' + this.name,
},
},
);
Expand Down
74 changes: 0 additions & 74 deletions src/templates/item/components/talent-picks-list.hbs
zithith marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

87 changes: 0 additions & 87 deletions src/templates/item/components/talents-list.hbs
zithith marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

10 changes: 9 additions & 1 deletion src/templates/item/partials/item-description-tab.hbs
zithith marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The description in a non-editable items (locked compendiums) is not getting displayed entirely correctly.
image

I think we just need to add flex-direction: column to fix it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems to have done the trick:
image

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@

<div class="tab tab-content {{tab.cssClass}}" data-tab="description" data-group="primary">
{{app-item-properties}}
<prose-mirror name="system.description.value" data-document-u-u-i-d="{{@root.item.uuid}}" value="{{@root.item.system.description.value}}" toggled="true" collaborate="true">
{{#if @root.editable}}
<prose-mirror name="system.description.value"
data-document-u-u-i-d="{{@root.item.uuid}}"
value="{{@root.item.system.description.value}}"
toggled="true"
collaborate="true">
{{{@root.descHtml}}}
</prose-mirror>
{{else}}
{{{@root.descHtml}}}
{{/if}}
</div>

{{/with}}