2.11.1

Dorako · Oct 22, 2023 · 72b4f29 · 72b4f29
1 parent be270a5
commit 72b4f29
Show file tree

Hide file tree

Showing 8 changed files with 329 additions and 154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.11.1
+
+- (New) Added Foundry 2 styling for Forien's Quest Log.
+
 # 2.11.0
 
 - (Refactor) Massive internal refactor.

diff --git a/esmodules/dorako-ux/customization.js b/esmodules/dorako-ux/customization.js
@@ -98,7 +98,7 @@ Hooks.once("init", async () => {
 
   util.debug(`${MODULE_NAME} | INJECTING CSS`);
 
-  injectCSS("dorako-ux/dorako-ux");
+  //   injectCSS("dorako-ux/dorako-ux");
   injectCSS("fonts");
 
   util.debug(`${MODULE_NAME} | INJECTING CSS VARIABLES`);

diff --git a/esmodules/settings/settings.js b/esmodules/settings/settings.js
@@ -81,7 +81,7 @@ Hooks.once("init", async () => {
   // injectCSS("dorako-theme/dorako-theme");
   // injectCSS("foundry2-theme/foundry2-theme");
   // injectCSS("dorako-ux/dorako-ux");
-  injectCSS("fonts");
+  // injectCSS("fonts");
 
   // const root = document.querySelector(":root").style;
 

diff --git a/sass/module-support/_dfce.scss b/sass/module-support/_dfce.scss
@@ -1,16 +1,69 @@
 /* ----------------------------------------- */
-/* DF Chat Enhancements                      */
+/* DFCE Rolltype Buttons                     */
 /* ----------------------------------------- */
 
-.message.chat-message.dorako-ui.dark-theme {
-  &.dfce-cm-middle .message-delete,
-  &.dfce-cm-bottom .message-delete {
-    color: white;
-    top: 5px;
-    text-shadow: 0px 0px 1px black;
+#chat-controls {
+  padding: 0px;
+  gap: var(--sidebar-gap);
+  .buttons {
+    gap: var(--sidebar-gap);
+    flex-wrap: nowrap;
+  }
+}
+
+#dorako-rt-buttons {
+  flex: 1 0 170px;
+}
+
+#dorako-nonrt-buttons {
+  flex: 1 1 30px !important; // Chat reactions unsets this
+
+  &:empty {
+    display: none;
+  }
+
+  > button {
+    flex: 1 1 32px;
   }
 }
 
+// Dorako Theme
+.dorako-ui {
+  #chat-controls .buttons {
+    gap: 4px;
+
+    button {
+      @include glass;
+      @include quick-transition;
+      color: var(--color-text-light-heading);
+      background-color: var(--glass-bg-light);
+      text-shadow: 0px 0px 3px black;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &:hover {
+        color: var(--color-text-light-highlight);
+        background-color: var(--primary-light);
+      }
+
+      &.toggle {
+        &:hover {
+          background-color: var(--secondary);
+        }
+        &.active {
+          color: var(--color-text-light-highlight);
+          background-color: var(--secondary-light);
+        }
+      }
+    }
+  }
+}
+
+/* ----------------------------------------- */
+/* DFCE Chat Merge                           */
+/* ----------------------------------------- */
+
 .message.chat-message {
   .message-delete {
     z-index: 1;
@@ -66,53 +119,15 @@
   }
 }
 
-#chat-controls {
-  padding: 0px;
-}
-
-#dorako-nonrt-buttons {
-  flex-grow: 0;
-}
-
-.dorako-ui #chat-controls .buttons {
-  display: flex;
-  gap: 2.5px;
-
-  button {
-    @include glass;
-    @include quick-transition;
-    color: var(--color-text-light-heading);
-    background-color: var(--glass-bg-light);
-    text-shadow: 0px 0px 3px black;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 32px;
-    flex: 1 1 32px;
-    width: 32px;
-
-    &:hover {
-      color: var(--color-text-light-highlight);
-      background-color: var(--primary-light);
-    }
-
-    &.toggle {
-      &:hover {
-        background-color: var(--secondary);
-      }
-      &.active {
-        color: var(--color-text-light-highlight);
-
-        background-color: var(--secondary-light);
-      }
-    }
+.message.chat-message.dorako-ui.dark-theme {
+  &.dfce-cm-middle .message-delete,
+  &.dfce-cm-bottom .message-delete {
+    color: white;
+    top: 5px;
+    text-shadow: 0px 0px 1px black;
   }
 }
 
-/* ----------------------------------------- */
-/* DFCE Chat Merge                           */
-/* ----------------------------------------- */
-
 .dorako-ui.light-theme {
   &.dfce-cm-bottom,
   &.dfce-cm-middle {
@@ -144,33 +159,3 @@
     }
   }
 }
-
-/* ----------------------------------------- */
-/* Foundry2                                  */
-/* ----------------------------------------- */
-
-.foundry2 {
-  #chat-controls {
-    gap: var(--sidebar-gap);
-    .buttons {
-      gap: var(--sidebar-gap);
-      flex-wrap: nowrap;
-    }
-  }
-
-  #dorako-rt-buttons {
-    flex: 1 0 170px;
-  }
-
-  #dorako-nonrt-buttons {
-    flex: 1 1 30px !important; // Chat reactions unsets this
-
-    &:empty {
-      display: none;
-    }
-
-    > button {
-      flex: 1 1 32px;
-    }
-  }
-}
diff --git a/sass/module-support/_forien-quest-log.scss b/sass/module-support/_forien-quest-log.scss
@@ -0,0 +1,74 @@
+.foundry2 {
+  &#forien-quest-log nav.tabs,
+  &.window-app.forien-quest-preview nav.tabs {
+    background: unset;
+  }
+
+  &#forien-quest-log nav.tabs .item.active,
+  &#forien-quest-log nav.tabs .item.active:hover,
+  &.window-app.forien-quest-preview nav.tabs .item.active,
+  &.window-app.forien-quest-preview nav.tabs .item.active:hover {
+    font-weight: unset;
+    color: var(--color-light-1);
+    text-shadow: 0px 1px 2px black;
+  }
+
+  &#forien-quest-log nav.tabs .item:hover,
+  &.window-app.forien-quest-preview nav.tabs .item:hover {
+    text-shadow: 0px 1px 2px black;
+  }
+
+  &#forien-quest-log .quest-log.bookmarks nav.log-tabs .item {
+    @include f2-app;
+    background: var(--app-background) !important;
+    border-radius: var(--border-radius) 0 0 var(--border-radius);
+    border-right: 1px solid transparent;
+    margin: 0 6px 8px;
+    &:hover,
+    &.active {
+      font-weight: unset;
+      border-right: 1px solid transparent;
+      border-color: var(--color-warm-1);
+      background: var(--color-warm-2) !important;
+      color: var(--color-light-1);
+    }
+  }
+
+  &.window-app.forien-quest-preview .quest-body .management .quest-splash .delete-splash,
+  &.window-app.forien-quest-preview .quest-body .management .quest-splash .change-splash-pos,
+  &.window-app.forien-quest-preview .quest-body .details-header .quest-giver-gc .deleteQuestGiver {
+    @include f2-button-warm;
+  }
+
+  &#forien-quest-log .editor,
+  &.window-app.forien-quest-preview .editor {
+    background: var(--color-cool-4);
+    border: 1px solid var(--color-cool-3);
+    .editor-content {
+      color: var(--color-light-3);
+    }
+    .tox.tox-tinymce {
+      background: white;
+    }
+  }
+
+  &#forien-quest-log .quest-log .table ul li.drag-quest,
+  &.window-app.forien-quest-preview .quest-body .details-header .quest-giver-gc .drop-info,
+  &.window-app.forien-quest-preview .quest-body .management .quest-splash .drop-info,
+  &.window-app.forien-quest-preview .quest-body .details-header .quest-setup section,
+  &.window-app.forien-quest-preview .quest-body .management .subquests .subquests-box li,
+  &.window-app.forien-quest-preview .quest-body .quest-info .quest-col-right .quest-rewards ul li,
+  &.window-app.forien-quest-preview .quest-body .quest-info .quest-col-right .quest-tasks ul li {
+    @include f2-app;
+    border-color: var(--color-scrollbar-border);
+    background: var(--color-warm-3);
+  }
+
+  &#forien-quest-log .actions i,
+  &.window-app.forien-quest-preview .actions i {
+    color: var(--color-light-2);
+    &:hover {
+      color: var(--color-warm-1);
+    }
+  }
+}
diff --git a/sass/module-support/_index.scss b/sass/module-support/_index.scss
@@ -14,6 +14,7 @@
 @import "enhancen-terrain-layer";
 @import "filepicker-plus";
 @import "forien-easy-polls";
+@import "forien-quest-log";
 @import "global-progress-clocks";
 @import "item-piles";
 @import "koboldworks-turn-announcer";