Skip to content

Commit

Permalink
Merge pull request #42 from Vesselchuck/main
Browse files Browse the repository at this point in the history
Various enhancements
  • Loading branch information
Dorako authored May 10, 2022
2 parents 6a50bc4 + 986a963 commit 05576cd
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 250 deletions.
2 changes: 1 addition & 1 deletion scripts/dorako-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ Hooks.once("init", async function () {
setting = game.settings.get("pf2e-dorako-ui", "sheet");
if (setting == "dark") injectCSS("pc-sheet-dark");
setting = game.settings.get("pf2e-dorako-ui", "familiar-sheet");
if (setting == "dark") injectCSS("familiar-sheet-dark");
if (setting == "dark" || "darkRedHeader") injectCSS("familiar-sheet-dark");
if (setting == "darkRedHeader") injectCSS("familiar-sheet-dark-red-header");
// if (setting == "plain") injectCSS("sheet-plain");
}
Expand Down
184 changes: 1 addition & 183 deletions styles/familiar-sheet-dark-red-header.css
Original file line number Diff line number Diff line change
@@ -1,189 +1,7 @@
/* Dark sheet background with red header */
.actor.sheet.familiar .window-content {
background: url(/systems/pf2e/assets/sheet/header.webp), var(--sheet-dark);
background-repeat: repeat-x, no-repeat;
background-size: 1295px, cover;
background-attachment: local;
}
/* Text color - White */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .charname .familiar-title,
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .details-section,
.actor.sheet.familiar .familiar-sheet-header .header-row .details-section .hp-section .hpac-value .current-hp,
.actor.sheet.familiar .window-content .skills-content .skills-list .skills-name,
.actor.sheet.familiar .window-content .skills-content .skills-attack,
.actor.sheet.familiar .window-content .effects .item-list .list-row .item-header .item-control .fas,
.familiar .window-content .effects .list-row .item-summary {
color: var(--text-light);
}
/* Tertiary text color */
.actor.sheet.familiar .familiar-sheet-header .header-row .details-section .hp-section .fas,
.actor.sheet.familiar .window-content .effects .item-list .list-row .item-header .item-control .fas:hover,
.actor.sheet.familiar .window-content .effects .item-list .item-header .item-name h4:hover,
.actor.sheet.familiar .window-content .effects .list-row.expanded .item-header .item-name h4,
.actor.sheet.familiar .window-content .skills-content .skills-attack:hover {
color: var(--tertiary);
}
/* Tertiary dark text color */
.actor.sheet.familiar .window-content .skills-content .skills-list .skills-score,
.actor.sheet.familiar .window-content .detail .detail-label {
color: var(--tertiary-dark);
}
/* Familiar name field appearance */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .charname input {
border-bottom: none;
color: var(--text-light);
}
/* Master Actor selection appearance */
.actor.sheet.familiar .window-content .master-section select {
color: var(--text-light);
box-shadow: var(--glassy);
border: none;
border-radius: .25em;
padding-left: 4px;
padding-right: 4px;
margin-left: 6px;
margin-bottom: 6px;
font-weight: 700;
width: 181px;
}
/* Master Spellcasting Ability selection appearance */
.actor.sheet.familiar .window-content .familiar-content .familiar-modifier select {
color: var(--text-light);
box-shadow: var(--glassy);
border: none;
border-radius: .25em;
padding-left: 4px;
padding-right: 4px;
}
/* Drop-down menus background */
.actor.sheet.familiar .window-content select option {
background: var(--alt);
}
/* Current HP hover */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .details-section .hp-section .hp-ac .hpac-value input.current-hp:focus,
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .details-section .hp-section .hp-ac .hpac-value input.current-hp:hover {
border: 1px solid var(--tertiary-dark);
box-shadow: 0 0 10px var(--text-light);
}
/* Perception & Saves hover */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .details-section .hp-section .hp-ac.rollable:hover,
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .details-section .master-section .saves-list .saves:hover {
border-bottom: 1px solid var(--tertiary);
}
/* Horizontal line (under details section) appearance */
.actor.sheet.familiar .window-content .editable > hr {
border-top: 2px solid var(--tertiary);
border-bottom: none;
margin-left: -10px;
margin-right: -10px;
}
/* Skills hover */
.actor.sheet.familiar .window-content .skills-content .skills-list .skills-item:hover {
border: 1px solid var(--tertiary-dark);
}
/* Horizontal line (above Attack Roll) appearance */
.actor.sheet.familiar .window-content .skills-content hr {
border-top: none;
border-bottom: 2px solid var(--tertiary);
width: 10em;
}
/* Sections border */
.actor.sheet.familiar .window-content .section-container .section-body {
border: 1px solid var(--tertiary);
border-top: unset;
}
/* Sections headers */
.familiar .window-content .section-container .section-header {
border: 1px solid var(--tertiary);
}
/* Creature Type field appearance */
.actor.sheet.familiar .window-content .familiar-content input[type=text] {
color: var(--text-light);
box-shadow: var(--glassy);
border: none;
border-radius: .25em;
padding-left: 4px;
padding-right: 4px;
height: 27px;
font-size: 14px;
}
/* Creature Type field pre-written text appearance */
.actor.sheet.familiar .window-content .familiar-content input[type=text]::placeholder {
color: var(--text-light);
filter: brightness(0.8);
}
/* Total # Of Familiar Abilities field appearance */
.actor.sheet.familiar .window-content .detail h4 {
color: var(--text-light);
box-shadow: var(--glassy);
border: none;
border-radius: .25em;
padding-left: 4px;
padding-right: 4px;
padding-top: 2px;
height: 27px;
}
/* Speed & Senses tags appearance */
.actor.sheet.familiar .familiar-senses .tag {
border: 1px solid rgba(255, 255, 255, 0.5);
}
/* Speed & Senses tags appearance */
.actor.sheet.familiar .window-content .effects .item-image {
box-shadow: 0 0 0 1px var(--tertiary),0 0 0 2px #9f725b,inset 0 0 4px rgba(0,0,0,.5);
border: 1px solid var(--body);
margin-left: 4px;
margin-right: 8px;
}
/* Conditions & Effects bottom border */
.actor.sheet.familiar .window-content .effects .list-row {
border-image: linear-gradient(90deg,var(--tertiary-dark),var(--tertiary-dark)) 1 repeat;
padding-bottom: 5px;
padding-top: 1px;
border-bottom: solid 1px transparent;
}
/* Conditions & Effects item summary appearance */
.actor.sheet.familiar .window-content .effects .list-row.expanded .item-summary {
margin-left: 4px;
font-family: var(--body-serif);
}
/* Conditions & Effects item name appearance */
.actor.sheet.familiar .effects .item-list .item-header .item-name h4 {
color: var(--text-light);
font-family: var(--body-serif);
}
/* Conditions & Effects item image (action types) appearance */
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/FreeAction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneAction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneThreeActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneTwoActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/Passive.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/Reaction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/ThreeActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/TwoActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/TwoThreeActions.webp)"] {
mix-blend-mode: lighten;
filter: var(--filter-dark);
border: 1px solid transparent;
box-shadow: 0 0 0 1px transparent,0 0 0 2px transparent,inset 0 0 4px transparent;
width: 31px;
background-size: 31px 31px;
height: 31px;
margin-right: 9px
}
/* Conditions & Effects item image on hover appearance */
.actor.sheet.familiar .window-content .effects .item-image:hover {
color: var(--tertiary);
mix-blend-mode: unset;
filter: none;
text-shadow: var(--pf2e-shadow-is-dark);
}
/* Conditions & Effects comment image appearance */
.actor.sheet.familiar .window-content .effects .item-image i {
color: var(--tertiary);
margin: 6px 6px 6px 6px;
font-size: 18px;
}
/* Traits appearance */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .traits span {
background-color: var(--pf2e-color-mono-dark);
background-repeat: repeat-x, no-repeat;
}
52 changes: 18 additions & 34 deletions styles/familiar-sheet-dark.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/* Dark sheet background */
.actor.sheet.familiar .window-content {
background: /* url(/systems/pf2e/assets/sheet/header.webp), */ var(--sheet-dark);
background: var(--sheet-dark);
background-repeat: repeat-x, no-repeat;
background-size: /* 1295px, */ cover;
/* background-attachment: local; */
background-size: cover;
}
/* Text color - White */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .charname .familiar-title,
Expand Down Expand Up @@ -127,12 +126,15 @@
.actor.sheet.familiar .familiar-senses .tag {
border: 1px solid rgba(255, 255, 255, 0.5);
}
/* Speed & Senses tags appearance */
/* Conditions & Effects image appearance */
.actor.sheet.familiar .window-content .effects .item-image {
box-shadow: 0 0 0 1px var(--tertiary),0 0 0 2px #9f725b,inset 0 0 4px rgba(0,0,0,.5);
border: 1px solid var(--body);
flex: 0 0 32px;
height: 32px;
width: 32px;
box-shadow: var(--gold-and-glow);
margin-left: 4px;
margin-right: 8px;
background-size: contain;
}
/* Conditions & Effects bottom border */
.actor.sheet.familiar .window-content .effects .list-row {
Expand All @@ -151,39 +153,21 @@
color: var(--text-light);
font-family: var(--body-serif);
}
/* Conditions & Effects item image (action types) appearance */
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/FreeAction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneAction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneThreeActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/OneTwoActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/Passive.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/Reaction.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/ThreeActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/TwoActions.webp)"],
.actor.sheet.familiar .effects .item-image[style*="background-image: url(systems/pf2e/icons/actions/TwoThreeActions.webp)"] {
mix-blend-mode: lighten;
filter: var(--filter-dark);
border: 1px solid transparent;
box-shadow: 0 0 0 1px transparent,0 0 0 2px transparent,inset 0 0 4px transparent;
width: 31px;
background-size: 31px 31px;
height: 31px;
margin-right: 9px
}
/* Conditions & Effects item image on hover appearance */
/* Conditions & Effects image on hover appearance */
.actor.sheet.familiar .window-content .effects .item-image:hover {
color: var(--tertiary);
mix-blend-mode: unset;
filter: none;
text-shadow: var(--pf2e-shadow-is-dark);
}
/* Conditions & Effects comment image appearance */
/* Conditions & Effects comment icon appearance */
.actor.sheet.familiar .window-content .effects .item-image i {
color: var(--tertiary);
margin: 6px 6px 6px 6px;
margin: 7px;
font-size: 18px;
}
/* Traits appearance */
/* .actor.sheet.familiar .window-content .familiar-sheet-header .header-row .traits span {
background-color: var(--pf2e-color-mono-dark);
} */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .traits span {
background-color: #522e2c;
}
/* Size traits appearance */
.actor.sheet.familiar .window-content .familiar-sheet-header .header-row .traits span[title*="Size"] {
background-color: #478c42;
}
36 changes: 4 additions & 32 deletions styles/pc-sheet-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control.item-toggle-invest.active,
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control.item-carry-type.active,
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action.expanded h4 {
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action.expanded h4,
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action .item-name .item-image:hover {
color: var(--tertiary);
}

Expand Down Expand Up @@ -363,21 +364,6 @@ a.inline-roll {
width: 1.75rem;
}

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/FreeAction.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneAction.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneThreeActions.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneTwoActions.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/Passive.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/Reaction.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/ThreeActions.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/TwoActions.webp)"],
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/TwoThreeActions.webp)"] {
mix-blend-mode: lighten;
filter: var(--filter-dark);
border: 1px solid #00000000 !important;
box-shadow: 0 0 0 1px #00000000,0 0 0 2px #00000000,inset 0 0 4px #00000000 !important;
}

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .actions-title .button-group.tags .skill-action.tag.variant-strike {
border: 1px solid rgba(255, 255, 255, 0.5) !important;
}
Expand Down Expand Up @@ -430,23 +416,9 @@ a.inline-roll {
border-image: linear-gradient(90deg,var(--tertiary-dark),var(--tertiary-dark)) 1 repeat;
}

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action .item-name .item-image:hover {
color: var(--tertiary);
filter: unset !important;
}

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike {
border: 1px solid var(--body);
box-shadow: 0 0 0 1px var(--tertiary),0 0 0 2px #9f725b,inset 0 0 4px rgba(0,0,0,.5);
height: 32px;
width: 32px;
}

.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike,
.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list:not(.skill-action-list, .strikes-list) .item.action .item-name.rollable .item-image {
mix-blend-mode: lighten;
filter: var(--filter-dark);
border: 1px solid #00000000 !important;
box-shadow: 0 0 0 1px #00000000,0 0 0 2px #00000000,inset 0 0 4px #00000000 !important;
box-shadow: var(--gold-and-glow);
height: 32px;
width: 32px;
}
Expand Down

0 comments on commit 05576cd

Please sign in to comment.