Skip to content

Commit

Permalink
3.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorako committed Nov 26, 2023
1 parent d865e2b commit 0514cca
Show file tree
Hide file tree
Showing 21 changed files with 354 additions and 211 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 3.1.8

- (Refinement) Bunch of small adjustments.
- (Fix) Fixed Opaque app theme's popped out sidebar windows being translucent.

# 3.1.7

- (Fix) Fixed BAM button text color.
Expand Down
2 changes: 1 addition & 1 deletion esmodules/consts.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const themedApps = [...coreApps, ...systemApps, ...moduleApps];
/* Window apps */
/* ----------------------------------------- */
export const systemSheets = ["CreatureSheetPF2e","PartySheetPF2e","SpellPreparationSheet","ItemSheet","NPCSheetPF2e","VehicleSheetPF2e","FamiliarSheetPF2e","HazardSheetPF2e", "CharacterSheetPF2e","LootSheetPF2e"]; //|| "ItemSheet","ActorSheet", "KingdomSheetPF2e"
export const limitedScopeApplications = ["KingdomSheetPF2e","CreatureSheetPF2e", "CharacterSheetPF2e", "PartySheetPF2e", "NPCSheetPF2e", "VehicleSheetPF2e", "HUD"];
export const limitedScopeApplications = ["KingdomSheetPF2e","CreatureSheetPF2e", "CharacterSheetPF2e", "PartySheetPF2e", "NPCSheetPF2e", "HazardSheetPF2e","VehicleSheetPF2e", "HUD"];

/* ----------------------------------------- */
/* Excluded */
Expand Down
2 changes: 1 addition & 1 deletion sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
align-items: center;
// height: var(--input-height);
// line-height: var(--input-height);
padding: 0 0.3rem;
// padding: 0 0.3rem;
border-radius: 4px;
outline: 1px solid transparent;
user-select: text;
Expand Down
8 changes: 4 additions & 4 deletions sass/module-support/_abomination-vaults.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* --------------------------------------------------------- */
/* The original styling has been overruled by system changes */
/* --------------------------------------------------------- */
.pf2e-av.sheet.journal-entry .journal-entry-content {
background: url("../../pf2e-abomination-vaults/styles/assets/parchment-av.jpg") repeat;
border-color: var(--av-green-light);
}
// .pf2e-av.sheet.journal-entry .journal-entry-content {
// background: url("../../pf2e-abomination-vaults/styles/assets/parchment-av.jpg") repeat; // Forge stuff...
// border-color: var(--av-green-light);
// }

.pf2e-av .journal-page-content a.inline-check > i.icon,
.pf2e-av .journal-page-content span[data-pf2-check] > i.icon,
Expand Down
11 changes: 10 additions & 1 deletion sass/module-support/_item-piles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
--item-piles-even-color: color-mix(in srgb, var(--color-cool-3) 20%, transparent);
--item-piles-border-light-primary: var(--color-cool-3);

.item-piles-chat-card li img,
.item-piles-img-container {
@include f2-app;
border-color: var(--color-warm-1);
border: 1px solid;
border-color: var(--icon-border-color);
}

.item-piles-player-list-trade-button {
Expand All @@ -45,3 +47,10 @@
margin-top: 2px;
}
}

[data-dorako-ui-theme="foundry"],
[data-dorako-ui-theme="bg3"],
[data-dorako-ui-theme][data-color-scheme="dark"] {
--item-piles-border-light-primary: rgba(255, 255, 255, 0.2);
--item-piles-text-light-highlight: rgba(255, 255, 255, 0.3);
}
10 changes: 10 additions & 0 deletions sass/module-support/_monks.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/* ----------------------------------------- */
/* General?? */
/* ----------------------------------------- */
[data-dorako-ui-theme] {
&.monks-active-tiles.sheet .items-list .item-header {
border: none;
background: none;
}
}

/* ----------------------------------------- */
/* Monk's Common Display */
/* ----------------------------------------- */
Expand Down
10 changes: 5 additions & 5 deletions sass/module-support/_pf2e-see-simple-scale-statistics.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
[data-dorako-ui-theme][data-color-scheme="dark"] {
&.dorako-ux.sheet.pf2e.actor.npc {
.pf2e-see-simple-scale-statistics-Extreme-color-primary {
color: #6cd8ff;
color: #6cd8ff !important;
}
.pf2e-see-simple-scale-statistics-High-color-primary {
color: #3cff00;
color: #3cff00 !important;
}

.pf2e-see-simple-scale-statistics-Moderate-color-primary {
color: #ffff54;
color: #ffff54 !important;
}

.pf2e-see-simple-scale-statistics-Low-color-primary {
color: #ff8000;
color: #ff8000 !important;
}

.pf2e-see-simple-scale-statistics-Terrible-color-primary {
color: #ff0000;
color: #ff0000 !important;
}
}
}
10 changes: 7 additions & 3 deletions sass/ui-theme/foundry-core/_app-ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
--rarity-uncommon: #c45500;
--rarity-rare: #5362ff;
--rarity-unique: #e127e1;
--color-rarity-common: #e1d8cf;
--color-rarity-uncommon: #c45500;
--color-rarity-rare: #5362ff;
--color-rarity-unique: #e127e1;
--ornamentation: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='33' height='33' overflow='scroll'%3E%3Cstyle%3E.st1{stroke:wheat;stroke-miterlimit:10}.st1,.st2{fill:none}%3C/style%3E%3Cg opacity='1'%3E%3Cpath class='st1' d='M.5 20v-7'/%3E%3Cpath class='st2' d='M13 20v-7'/%3E%3Cpath class='st1' d='M13 .5h7'/%3E%3Cpath class='st2' d='M13 13h7'/%3E%3Cpath class='st1' d='M32.5 13v7'/%3E%3Cpath class='st2' d='M20 13v7'/%3E%3Cpath class='st1' d='M20 32.5h-7'/%3E%3Cpath class='st2' d='M20 20h-7'/%3E%3Cpath class='st1' d='M.5.5h3.1v3.1H.5zm3.1 3.1h3.1v3.1H3.6zm3.2 0h3.1v3.1H6.8zM3.6 6.8h3.1v3.1H3.6zm0 0H.5V13M13 .5H6.8v3.1M29.4.5h3.1v3.1h-3.1zm-3.1 3.1h3.1v3.1h-3.1zm0 3.2h3.1v3.1h-3.1zm-3.2-3.2h3.1v3.1h-3.1zm3.2 0V.5H20M32.5 13V6.8h-3.1M29.4 29.4h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M26.3 26.3h3.1v3.1h-3.1zm-3.2 0h3.1v3.1h-3.1zm3.2-3.2h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M29.4 26.3h3.1V20M20 32.5h6.3v-3.1'/%3E%3Cg%3E%3Cpath class='st1' d='M.5 29.4h3.1v3.1H.5zm3.1-3.1h3.1v3.1H3.6zm0-3.2h3.1v3.1H3.6zm3.2 3.2h3.1v3.1H6.8zM6.8 29.4v3.1H13M.5 20v6.3h3.1'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");

/* Degrees of success */
Expand Down Expand Up @@ -182,10 +186,10 @@
i.icon {
color: var(--inline-icon-color);
}
}

[data-visibility]:not([data-visibility="all"])[data-visibility="gm"] {
color: black;
}
[data-visibility]:not([data-visibility="all"])[data-visibility="gm"] {
color: black;
}

i[data-pf2-repost] {
Expand Down
1 change: 1 addition & 0 deletions sass/ui-theme/foundry-core/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
@import "notifications";
@import "placeable-hud";
@import "sidebar";
@import "window-apps";
15 changes: 15 additions & 0 deletions sass/ui-theme/foundry-core/_window-apps.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[data-dorako-ui-theme] {
&.filepicker .display-modes a {
@include f2-button-warm;
}

&.filepicker .private button.privacy {
@include f2-button-warm;
--button-background-color: #7331ff;
}
&.filepicker .filepicker-header .quick-link-input-button {
--box-shadow: none;
--button-hover-background-color: none;
--button-hover-border-color: transparent;
}
}
23 changes: 16 additions & 7 deletions sass/ui-theme/pf2e-system/_hazard-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,27 @@
background: #19302c;
border-top-left-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
color: #ffffff !important;
}

&.sheet.hazard.window-app.minimized .window-header {
border-radius: var(--border-radius);
}

&.sheet.hazard .section-container.publication .section-body input[type="text"],
&.sheet.hazard input[type="text"],
&.sheet.hazard input[type="number"] {
&.sheet.hazard .container input[type="text"],
&.sheet.hazard .container input[type="number"],
&.sheet.hazard .container select {
@include f2-input;
}

&.sheet.hazard form > header input[type="text"]:hover:not(:disabled),
&.sheet.hazard form > header input[type="text"]:focus,
&.sheet.hazard form > header input[type="number"]:hover:not(:disabled),
&.sheet.hazard form > header input[type="number"]:focus {
@include f2-input;
&.sheet.hazard form > header {
--text-dark: black;
}

&.sheet.hazard .section-container,
&.sheet.hazard form > header {
--input-text-color: white;
}

&.sheet.hazard form > header .details {
Expand Down Expand Up @@ -55,6 +60,10 @@
}
}

&.sheet.hazard .section-container .section-header h4 {
color: var(--color-light-2);
}

&.sheet.hazard .section-container {
@include f2-app;
padding: unset;
Expand Down
8 changes: 2 additions & 6 deletions sass/ui-theme/pf2e-system/_loot-sheet.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[data-dorako-ui-theme] {
&.sheet.actor.loot {
--text-dark: var(--color-light-2);
--primary: var(--color-warm-2);
// --text-dark: var(--color-light-2);
// --primary: var(--color-warm-2);
}

&.sheet.actor.loot section.sidebar {
Expand Down Expand Up @@ -35,10 +35,6 @@
@include f2-input;
}

// &.sheet.actor.loot form section.sidebar .gm-settings .loot-distribution button:not(:hover) {
// box-shadow: unset;
// }

&.sheet.actor.loot form section.sidebar .gm-settings .loot-distribution button {
@include f2-button-warm;
}
Expand Down
10 changes: 10 additions & 0 deletions sass/ui-theme/pf2e-system/_npc-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
@include f2-input;
}

// prettier-ignore
&.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .ammo select.linked {
padding: 3px;
}

&.actor.npc.sheet form .sheet-body .actions-list li.action:not(:last-child),
&.actor.npc.sheet form .sheet-body .attacks-list li.action:not(:last-child) {
border-color: var(--section-border-color);
Expand All @@ -91,6 +96,11 @@
color: black;
text-shadow: unset;
}

&.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.action .item-name,
&.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .item-name {
gap: 5px; // aligns buttons
}
}

[data-dorako-ui-theme] {
Expand Down
2 changes: 2 additions & 0 deletions sass/ui-theme/pf2e-system/_pc-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@
/* Theme */
/* ----------------------------------------- */
[data-dorako-ui-theme][data-dorako-ui-scope="limited"]:not([data-dorako-ui-theme^="crb"][data-color-scheme="light"]) {
--color-text-dark-4: var(--color-light-5);

&.actor.sheet .crb-style .sheet-body {
background: unset;

Expand Down
16 changes: 6 additions & 10 deletions sass/ui-theme/themes/_bg3.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
--bg3-text-2: #d1c9b9;
--bg3-text-3: #b0947b;
--bg3-text-4: #e8dea8;
--bg3-accent-light: #fc7e9e;
--bg3-accent: #ea4a72;
--bg3-accent-dark: #c13155;
--bg3-accent-color-light: #fc7e9e;
--bg3-accent-color: #ea4a72;
--bg3-accent-color-dark: #c13155;
--bg3-color-scrollbar: #ecc090;
--bg3-color-scrollbar-border: #6c5842;
}
Expand Down Expand Up @@ -50,12 +50,6 @@
--color-text-dark-primary: var(--color-light-3);
--color-text-dark-secondary: var(--color-light-5);
// --color-bg-option: var(--color-cool-4);

// System rarities
--color-rarity-common: #e1d8cf;
--color-rarity-uncommon: #c45500;
--color-rarity-rare: #5362ff;
--color-rarity-unique: #e127e1;
}

/* ----------------------------------------- */
Expand Down Expand Up @@ -128,7 +122,9 @@
/* Scrollbar and accent variables */
--color-scrollbar: var(--bg3-color-scrollbar);
--color-scrollbar-border: var(--bg3-color-scrollbar-border);
--accent-color: #ea4a72;
--accent-color-light: var(--bg3-accent-color-light);
--accent-color: var(--bg3-accent-color);
--accent-color-dark: #var(--bg3-accent-color-dark);
}

/* ----------------------------------------- */
Expand Down
22 changes: 12 additions & 10 deletions sass/ui-theme/themes/_crb-dark.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* ----------------------------------------- */
/* Map v1 styling to v2 values */
/* ----------------------------------------- */

[data-dorako-ui-theme="crb"][data-color-scheme="dark"] {
// --color-shadow-primary: transparent;
// --color-shadow-highlight: transparent;
// --color-border-light-highlight: var(--color-cool-3);
--color-border-light-highlight: black;
// --color-border-light-primary: var(--color-cool-4);
// --color-border-light-secondary: var(--color-cool-4);
// --color-border-light-tertiary: var(--color-cool-4);
Expand All @@ -29,16 +28,10 @@
--color-text-dark-primary: var(--color-light-3);
--color-text-dark-secondary: var(--color-light-5);
// --color-bg-option: var(--color-cool-4);

// System rarities
--color-rarity-common: #e1d8cf;
--color-rarity-uncommon: #c45500;
--color-rarity-rare: #5362ff;
--color-rarity-unique: #e127e1;
}

/* ----------------------------------------- */
/* Unlimited */
/* Limited */
/* ----------------------------------------- */
[data-dorako-ui-theme="crb"][data-color-scheme="dark"][data-dorako-ui-scope="limited"] {
--input-background-color: var(--glass-bg);
Expand All @@ -50,7 +43,6 @@
/* ----------------------------------------- */
/* Unlimited */
/* ----------------------------------------- */

[data-dorako-ui-theme="crb"][data-color-scheme="dark"][data-dorako-ui-scope="unlimited"] {
select,
input,
Expand Down Expand Up @@ -79,6 +71,8 @@
--input-background-color: var(--glass-bg);
--input-focus-text-color: var(--color-light-2);
--input-placeholder-color: var(--color-light-5);
--input-disabled-background-color: black;
--input-disabled-border-color: black;
--color-border-medium: var(--tertiary) !important;
--color-border-divider: var(--tertiary) !important;
--bg: rgba(0, 0, 0, 0.5);
Expand All @@ -90,6 +84,14 @@
// .spell-button button {
// background: var(--primary);
// }

input[type="range"] + .range-value {
color: black;
text-shadow: none;
font-weight: 800;
--input-focus-text-color: black;
}
--text-dark: var(--color-light-2);
}

/* ----------------------------------------- */
Expand Down
Loading

0 comments on commit 0514cca

Please sign in to comment.