2.11.10

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.11.10
+
+- (Refinement) Added Foundry 2 styling for Item Piles.
+- (Refinement) Made adjustments to degree of success colors in Foundry 2 theme.
+- (Fix) Fixed some occurances of missing styles for Foundry 2 theme.
+
 # 2.11.9
 
 - (Refinement) Added Foundry 2 styling for Monk's TokenBar.

esmodules/dorako-theme.js

@@ -32,6 +32,8 @@ for (const appName of [...baseThemeApplications]) {
 // });
 
 Hooks.on("renderSvelteApplication", (app) => {
+  const theme = game.settings.get("pf2e-dorako-ui", "theme.application-theme");
+  if (theme === "no-theme" || theme === "foundry2-theme") return;
   app.element[0].classList.add("dorako-ui");
 });
 

esmodules/foundry2-theme.js

@@ -1,6 +1,12 @@
 import { baseThemeApplications, baseThemePf2eSheets, MODULE_NAME, premiumModuleSelector } from "./consts.js";
 import { isPremiumApplication } from "./premium-module-hooks.js";
 
+Hooks.on("renderSvelteApplication", (app, html, data) => {
+  const theme = game.settings.get("pf2e-dorako-ui", "theme.application-theme");
+  if (theme !== "foundry2-theme") return;
+  app.element[0].classList.add("foundry2");
+});
+
 for (const appName of [...baseThemeApplications]) {
   Hooks.on("render" + appName, (app, html, data) => {
     if (app.constructor.name.startsWith("SWPF")) return; // SWPFCompendiumTOC, SWPFSheet

sass/_colors.scss

@@ -156,6 +156,16 @@ $adjusted-lower: #cc3311 !default;
   --hotbar-width: unset;
   // --controls-alignment: controlled in code
   --controls-margin: 8px;
+
+  /* Degrees of success */
+  --degree-success-critical: rgb(0, 128, 0);
+  --degree-success: rgb(0, 0, 255);
+  --degree-failure: rgb(255, 69, 0);
+  --degree-failure-critical: rgb(255, 0, 0);
+
+  /* Value adjustments (e.g. weak/elite) */
+  --adjusted-higher: #009988;
+  --adjusted-lower: #cc3311;
 }
 
 :root {

sass/dorako-theme/_messages.scss

@@ -109,68 +109,6 @@
   margin-bottom: 0px;
 }
 
-/* ----------------------------------------- */
-/* .message-header fixes                     */
-/* ----------------------------------------- */
-
-.chat-message .dmgBtn-container {
-  display: flex;
-  flex-direction: row;
-}
-
-.chat-message ul.notes {
-  padding: 0px;
-}
-
-.chat-message .flavor-text h4.action {
-  font-weight: 700;
-  line-height: 1.5em;
-  margin: 0;
-}
-.chat-message .flavor-text .target-dc-result {
-  line-height: 0.75rem;
-  margin-bottom: 4px;
-}
-.chat-message .flavor-text .target-dc-result .target-dc,
-.chat-message .flavor-text .target-dc-result .result {
-  display: block;
-  margin: 1px 0;
-  width: fit-content;
-}
-.chat-message .flavor-text .target-dc-result .unadjusted {
-  text-decoration: line-through;
-}
-.chat-message .flavor-text .target-dc-result .adjusted {
-  text-decoration: underline dotted;
-}
-.chat-message .flavor-text .target-dc-result .adjusted.increased {
-  color: rgb(0, 128, 0);
-}
-.chat-message .flavor-text .target-dc-result .adjusted.decreased {
-  color: rgb(255, 0, 0);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .criticalSuccess {
-  color: rgb(0, 128, 0);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .success {
-  color: rgb(0, 0, 255);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .failure {
-  color: rgb(255, 69, 0);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .criticalFailure {
-  color: rgb(255, 0, 0);
-}
-.chat-message .flavor-text .effect {
-  display: flex;
-  align-items: center;
-  column-gap: 5px;
-}
-.chat-message .flavor-text .effect img {
-  height: 32px;
-  width: 32px;
-}
-
 /* ----------------------------------------- */
 /* Damage buttons                            */
 /* ----------------------------------------- */

sass/dorako-ux/_dorako-ui.scss

@@ -91,6 +91,68 @@ section.readaloud {
   margin-top: 5px;
 }
 
+/* ----------------------------------------- */
+/* .message-header fixes (all themes)        */
+/* ----------------------------------------- */
+
+.chat-message .dmgBtn-container {
+  display: flex;
+  flex-direction: row;
+}
+
+.chat-message ul.notes {
+  padding: 0px;
+}
+
+.chat-message .flavor-text h4.action {
+  font-weight: 700;
+  line-height: 1.5em;
+  margin: 0;
+}
+.chat-message .flavor-text .target-dc-result {
+  line-height: 0.75rem;
+  margin-bottom: 4px;
+}
+.chat-message .flavor-text .target-dc-result .target-dc,
+.chat-message .flavor-text .target-dc-result .result {
+  display: block;
+  margin: 1px 0;
+  width: fit-content;
+}
+.chat-message .flavor-text .target-dc-result .unadjusted {
+  text-decoration: line-through;
+}
+.chat-message .flavor-text .target-dc-result .adjusted {
+  text-decoration: underline dotted;
+}
+.chat-message .flavor-text .target-dc-result .adjusted.increased {
+  color: var(--adjusted-higher);
+}
+.chat-message .flavor-text .target-dc-result .adjusted.decreased {
+  color: var(--adjusted-lower);
+}
+.chat-message .flavor-text .target-dc-result .degree-of-success .criticalSuccess {
+  color: var(--degree-success-critical);
+}
+.chat-message .flavor-text .target-dc-result .degree-of-success .success {
+  color: var(--degree-success);
+}
+.chat-message .flavor-text .target-dc-result .degree-of-success .failure {
+  color: var(--degree-failure);
+}
+.chat-message .flavor-text .target-dc-result .degree-of-success .criticalFailure {
+  color: var(--degree-failure-critical);
+}
+.chat-message .flavor-text .effect {
+  display: flex;
+  align-items: center;
+  column-gap: 5px;
+}
+.chat-message .flavor-text .effect img {
+  height: 32px;
+  width: 32px;
+}
+
 .chat-message {
   .flavor-text {
     h4.action {
@@ -117,25 +179,25 @@ section.readaloud {
       .adjusted {
         text-decoration: underline dotted;
         &.increased {
-          color: $degree-success-critical;
+          // color: $degree-success-critical;
         }
         &.decreased {
-          color: $degree-failure-critical;
+          // color: $degree-failure-critical;
         }
       }
 
       .degree-of-success {
         .criticalSuccess {
-          color: $degree-success-critical;
+          // color: $degree-success-critical;
         }
         .success {
-          color: $degree-success;
+          // color: $degree-success;
         }
         .failure {
-          color: $degree-failure;
+          // color: $degree-failure;
         }
         .criticalFailure {
-          color: $degree-failure-critical;
+          // color: $degree-failure-critical;
         }
       }
     }

sass/foundry2-theme/foundry-core/_app-ui.scss

@@ -109,6 +109,16 @@
   --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 */
+  --degree-success-critical: rgb(107, 255, 0);
+  --degree-success: rgb(0, 241, 255);
+  --degree-failure: rgb(255, 129, 0);
+  --degree-failure-critical: rgb(255, 0, 0);
+
+  /* Value adjustments (e.g. weak/elite) */
+  --adjusted-higher: #009988;
+  --adjusted-lower: #cc3311;
+
   --input-height: 24px;
 
   --input-background-color: var(--color-cool-4);
@@ -383,6 +393,7 @@
 /* Application specific                      */
 /* ----------------------------------------- */
 
+.foundry2-pc,
 [data-theme="foundry2"],
 .foundry2 {
   // System compat mode

sass/foundry2-theme/pf2e-system/_loot-sheet.scss

@@ -34,4 +34,17 @@
   &.sheet.actor.loot .sheet-header h1 > input {
     @include f2-input;
   }
+
+  &.sheet.actor.loot .sheet-header h1 > input {
+    --input-height: 40px;
+    --font-size: inherit;
+  }
+
+  &.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;
+  }
 }

sass/foundry2-theme/pf2e-system/_messages.scss

@@ -10,6 +10,11 @@
   --color-text-light-6: var(--color-cool-4);
   --color-text-dark-secondary: var(--color-light-4); // 5 is too dark on colored message backgrounds
 
+  > .message-content .message-buttons button .cue i {
+    --fa-primary-color: var(--color-light-1);
+    --fa-secondary-color: var(--color-light-3);
+  }
+
   &.whisper {
     border-color: var(--color-cool-1);
     background: var(--color-cool-3-75);

sass/module-support/_item-piles.scss

@@ -26,3 +26,14 @@
     border-bottom: 2px solid var(--tertiary-dark);
   }
 }
+
+.foundry2 {
+  --item-piles-minor-inactive: var(--color-warm-3);
+  --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-img-container {
+    @include f2-app;
+    border-color: var(--color-warm-1);
+  }
+}