1.11.21

Dorako · Feb 14, 2023 · 5999d46 · 5999d46
1 parent eee0d1c
commit 5999d46
Show file tree

Hide file tree

Showing 8 changed files with 586 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.11.21
+
+- (Module) Added support for Monk's Enhanced Journals.
+
 # 1.11.20
 
 - (Fix) Fixed an issue where Monk's Enhanced Journals were unaffected by Dalvyn's CRB-styled journals.

diff --git a/modules/dark-theme-hooks.js b/modules/dark-theme-hooks.js
@@ -53,6 +53,16 @@ Hooks.on("renderApplication", (app, html, data) => {
   );
 });
 
+// Add .dorako-ui.dark-theme to the page if it is not a page included in a premium module-styled journal
+Hooks.on("renderJournalTextPageSheet", (app, html, data) => {
+  let journalFrame = app?.object?.parent?.sheet;
+  if (!journalFrame) return;
+  let frameHtml = journalFrame?.element;
+  if (!frameHtml || frameHtml.length == 0) return;
+  if (frameHtml[0].matches(premiumModuleSelector)) return;
+  frameHtml.closest(".app").find(".journal-entry-content").addClass("dorako-ui dark-theme");
+});
+
 // Maximum dark theme (All '.app' applications except blacklisted ones)
 for (const app of ["Application", ...baseThemePf2eSheets]) {
   Hooks.on("render" + app, (app, html, data) => {

diff --git a/sass/foundry/_navigation.scss b/sass/foundry/_navigation.scss
@@ -8,15 +8,15 @@ nav#navigation.dorako-ui {
 
   #nav-toggle {
     @include glass;
-    transition: 0.25s;
+    @include quick-transition;
     flex: 0 0 32px;
     height: 32px;
   }
 
   ol#scene-list {
     li.nav-item {
       @include glass;
-      transition: 0.25s;
+      @include quick-transition;
       text-shadow: 0px 0px 3px black;
 
       > a:hover {

diff --git a/sass/module/_monks.scss b/sass/module/_monks.scss
@@ -39,14 +39,6 @@
   border-bottom: 1px solid var(--tertiary);
 }
 
-/* ----------------------------------------- */
-/* Monk's Enhanced Journal                   */
-/* ----------------------------------------- */
-
-.monks-enhanced-journal.window-app .window-content {
-  padding: 0px;
-}
-
 /* ----------------------------------------- */
 /* Monk's tokenbar                           */
 /* ----------------------------------------- */
@@ -312,3 +304,279 @@
     }
   }
 }
+
+/* ----------------------------------------- */
+/* Monk's Enhanced Journal                   */
+/* ----------------------------------------- */
+
+.monks-journal-sheet.sheet .sheet-navigation,
+.monks-journal-sheet.sheet .sheet-header .header-details {
+  font-family: var(--font-primary);
+  font-size: var(--font-size-14);
+}
+
+.monks-journal-sheet.sheet .editor  {
+  padding: 5px;
+}
+
+.monks-journal-sheet.sheet .editor-parent {
+  padding: 5px;
+}
+
+.monks-enhanced-journal.window-app .window-content {
+  padding: 0px;
+  // background-color: rgba(0, 0, 0, 0.5);
+  // background-blend-mode: multiply;
+  background: none;
+  box-shadow: none;
+  border-radius: 0px 0px 0px 5px;
+}
+.monks-enhanced-journal .directory-sidebar {
+  background: var(--glass-bg);
+  background: none;
+  border: none;
+  box-shadow: 0px 0px 2px 1px rgb(0 0 0), 0px 0px 5px 0px rgb(0 0 0 / 50%);
+  box-shadow: none;
+
+  color: var(--color-text-light-highlight);
+}
+
+#journal-directory .noborder,
+#journal-directory .document-name {
+  font-weight: 400;
+}
+
+.monks-enhanced-journal .body {
+  @include sheet;
+  margin: unset; // messes with box-sizing
+  border-radius: 0px 10px 0px 0px;
+  box-shadow: 0 0 0 1px var(--gold-brown) inset, 0 0 0 2px var(--tertiary) inset;
+}
+
+.monks-enhanced-journal .collapse {
+  .body {
+    border-radius: 0px;
+  }
+  .directory-sidebar {
+    box-shadow: none;
+  }
+}
+
+.monks-enhanced-journal .collapse .tab-bar .tab-button.sidebar-toggle {
+  color: var(--color-text-dark-primary);
+}
+
+.monks-enhanced-journal .tab-bar .tab-button.sidebar-toggle {
+  color: var(--color-text-light-highlight);
+  padding-top: 5px;
+}
+
+#journal-directory .directory-header {
+  padding-top: 5px;
+}
+
+.sheet.journal-entry .journal-entry-content {
+  @include sheet;
+  box-shadow: var(--gold-and-glow), 0px 5px 6px rgba(0, 0, 0, 0.5);
+}
+
+#MonksEnhancedJournal .journal-sheet-container .sidebar.directory {
+  background: var(--glass-bg);
+  box-shadow: var(--glassy);
+}
+
+#journal-directory li.folder.collapsed > .folder-header:not(.customcolor),
+#journal-directory li.folder.collapsed > .folder-header .create-folder,
+#journal-directory li.folder.collapsed > .folder-header .create-document {
+  color: var(--color-text-light-highlight);
+}
+
+#journal-directory li.folder.collapsed .folder-header.customcolor {
+  color: var(--color-text-light-highlight);
+}
+
+#journal-directory li.document .document-name {
+  color: var(--color-text-light-highlight);
+}
+
+#MonksEnhancedJournal .sheet.journal-entry .journal-entry-content {
+  border-radius: 10px;
+  margin: 10px 12px;
+  height: calc(100% - 20px);
+}
+
+#journal-directory li.journalentry,
+#journal-directory li.journalentrypage {
+  border-left: none;
+}
+
+#MonksEnhancedJournal .sheet.journal-entry .scrollable {
+  padding-right: unset;
+}
+
+.monks-enhanced-journal footer,
+.monks-enhanced-journal .mainbar .navigation {
+  background-color: var(--bg);
+  box-shadow: 0 2px 4px rgb(0 0 0 / 18%);
+  border: 1px solid var(--color-border-light-primary);
+  border-left: none;
+  border-right: none;
+  margin-left: 1px;
+  margin-right: 1px;
+}
+
+.monks-enhanced-journal footer {
+  box-shadow: 0 -2px 4px rgb(0 0 0 / 18%);
+  border-bottom: none;
+  margin-bottom: 1px;
+  border-radius: 0px 0px 0px 5px;
+}
+
+.monks-journal-sheet.sheet .sheet-navigation {
+  background-color: var(--bg);
+  box-shadow: 0 2px 4px rgb(0 0 0 / 18%);
+  border: 1px solid var(--color-border-light-primary);
+  border-radius: 3px;
+  margin: 5px;
+  margin-left: 0px;
+  margin-right: 8px;
+}
+
+.monks-journal-sheet.sheet .sheet-navigation .item {
+  @include quick-transition;
+  border: none;
+  &:hover,
+  &.active {
+    border: none;
+    color: var(--secondary-light);
+    text-shadow: 0px 0px 10px;
+  }
+}
+
+.monks-journal-sheet.sheet .items-list .item .item-name .item-image {
+  @include gold-border;
+  background-color: var(--bg);
+  border-radius: 3px;
+  margin-right: 5px;
+}
+
+.monks-enhanced-journal .mainbar > div {
+  border: none;
+}
+
+.monks-enhanced-journal .tab-bar .journal-tab {
+  border-radius: 3px;
+}
+
+.monks-enhanced-journal .bookmark-bar .bookmark-button.add-bookmark {
+  @include glass;
+  @include quick-transition;
+  color: var(--color-text-light-heading);
+  text-shadow: 0px 0px 3px black;
+  &:hover {
+    background: var(--primary);
+    color: var(--color-text-light-heading);
+  }
+}
+
+.monks-enhanced-journal .mainbar .bookmark-bar {
+  margin-left: 8px;
+  margin-bottom: 5px;
+  column-gap: 8px;
+  row-gap: 4px;
+  .bookmark-button {
+    margin-left: unset;
+    padding: unset;
+    text-align: center;
+
+    > div {
+      @include glass;
+      @include quick-transition;
+      padding: 0px 5px;
+      color: var(--color-text-light-heading);
+      text-shadow: 0px 0px 3px black;
+      &:hover {
+        background: var(--primary);
+        color: var(--color-text-light-highlight);
+      }
+    }
+  }
+}
+
+.monks-enhanced-journal .mainbar .tab-row {
+  margin: 5px;
+  gap: 10px;
+
+  .tab-button {
+    @include glass;
+    @include quick-transition;
+    opacity: unset;
+    color: var(--color-text-light-heading);
+    text-shadow: 0px 0px 3px black;
+    &:hover {
+      background: var(--primary);
+      color: var(--color-text-light-highlight);
+    }
+  }
+  .close {
+    margin-left: 5px;
+  }
+  .journal-tab {
+    @include glass;
+    @include quick-transition;
+    text-shadow: 0px 0px 3px black;
+    color: var(--color-text-light-heading);
+    background-color: var(--secondary);
+    padding: 5px 10px;
+
+    &.active,
+    &:hover {
+      background: var(--secondary-light);
+      color: white;
+    }
+
+    &.active {
+      box-shadow: var(--gold-and-glow), var(--glassy);
+    }
+  }
+}
+
+// section.readaloud {
+//   background: var(--tertiary);
+//   color: var(--color-text-dark-primary);
+// }
+
+section.readaloud {
+  border-image-repeat: repeat;
+  border-image-slice: 11;
+  border-image-source: var(--ornamentation);
+  border-image-width: 14px;
+  border-style: double;
+  padding-left: 8px;
+  padding-right: 8px;
+  font-weight: 500;
+  margin: 0px;
+  margin-left: 5px;
+
+  background: none;
+  background-color: var(--bg);
+  &:before,
+  &:after {
+    background: none;
+  }
+}
+
+.monks-journal-sheet.sheet .sheet-header .sheet-image,
+.monks-journal-sheet.sheet header.sheet-header {
+  border: none;
+}
+
+.monks-journal-sheet.sheet .sheet-header .sheet-image {
+  @include gold-border-shadow;
+  background-color: var(--bg);
+  margin-right: 10px;
+  border-radius: 5px;
+  img {
+    border-radius: 5px;
+  }
+}
diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css