2.6.1

Dorako · Aug 29, 2023 · 2b0de8e · 2b0de8e
1 parent eb59232
commit 2b0de8e
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.6.1
+
+- (New) Styling of Party Sheet's "clown car" button to make it fit with other control buttons.
+- (Maintenance) Keeping up to date with system for PC sheets.
+- (New) Initial support for Kineticist in PC sheets.
+- (Maintenance) Minor adjustments to the "inline button"-family of buttons.
+
 # 2.6.0
 
 - (Refinement) Updated styling of Idle's Token Tooltip courtesy of Symon.

diff --git a/sass/_misc.scss b/sass/_misc.scss
@@ -26,11 +26,18 @@ a.inline-roll:not(.inline-result) {
 }
 
 // Undoes padding 1px 4px by system, which adds whitespace to the right of the repost button, and causes it to hover 1px
+a.inline-check,
+span[data-pf2-check],
 span[data-pf2-effect-area].with-repost {
   padding: 0px;
   padding-left: 4px;
 }
 
+// Fixes issue where hidden DC is too 'tall'
+[data-visibility]:not([data-visibility="all"]) {
+  padding: unset;
+}
+
 .dorako-ui.dark-theme {
   a.content-link.broken {
     background: rgba(255, 0, 0, 0.5);

diff --git a/sass/foundry/_token-hud.scss b/sass/foundry/_token-hud.scss
@@ -1,4 +1,4 @@
-#token-hud {
+#token-hud.dorako-ui {
   .status-effects {
     background: none;
     box-shadow: none;
@@ -125,135 +125,140 @@
     }
   }
 
-  &.placeable-hud .control-icon {
-    .effect-control.valued .badge,
-    .effect-control .badge {
-      font-size: var(--font-size-16);
-      font-weight: 600;
-      line-height: var(--font-size-17);
-      border-radius: 0px var(--border-radius) 0px var(--border-radius);
-      background: var(--primary-light);
-      // background: white;
-      margin: 1px;
-      // color: black;
-      color: white;
-      text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
-      height: 1.1rem;
-      width: 1.1rem;
-      border: 1px solid var(--gold-brown);
-      box-shadow: -1px 1px 0px var(--tertiary);
-    }
-
-    .badge.fa-lock:before {
-      position: relative;
-      top: -2.5px;
-      font-size: var(--font-size-10);
-    }
-  }
-}
-
-.placeable-hud {
-  input[type="text"] {
-    @include glass;
-    text-shadow: 0px 0px 3px black;
-    &:focus {
-      box-shadow: var(--gold-and-glow), var(--glassy);
-      border: none;
+  &.placeable-hud {
+    input[type="text"] {
+      @include glass;
+      text-shadow: 0px 0px 3px black;
+      &:focus {
+        box-shadow: var(--gold-and-glow), var(--glassy);
+        border: none;
+      }
     }
-  }
+    .control-icon {
+      @include glass;
+      @include quick-transition;
+      text-shadow: 0px 0px 3px black;
 
-  .control-icon {
-    @include glass;
-    @include quick-transition;
-    text-shadow: 0px 0px 3px black;
+      .badge {
+        text-shadow: none;
+      }
 
-    .badge {
-      text-shadow: none;
-    }
+      // These can become toggled on with a click, but not toggled off with a click
+      &[data-action="overhead"],
+      &[data-action="underfoot"] {
+        background-color: var(--primary-dark);
 
-    // These can become toggled on with a click, but not toggled off with a click
-    &[data-action="overhead"],
-    &[data-action="underfoot"] {
-      background-color: var(--primary-dark);
+        &:hover,
+        &.active {
+          background-color: var(--primary-light);
+          > img {
+            filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+          }
 
-      &:hover,
-      &.active {
-        background-color: var(--primary-light);
-        > img {
-          filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+          &:hover {
+            background-color: var(--primary-light);
+          }
         }
+      }
 
+      // These can be clicked, but do not become active
+      // 'trigger' is from Monk's Active Tiles
+      // 'pf2e-perception' is from PF2e Perception by Idle
+      // 'clown-car' from system
+      &[data-action="sort-up"],
+      &[data-action="sort-down"],
+      &[data-action="config"],
+      &[data-action="trigger"],
+      &[data-action="pf2e-perception"],
+      &[data-action="clown-car"] {
         &:hover {
           background-color: var(--primary-light);
+          > img {
+            filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+          }
         }
       }
-    }
 
-    // These can be clicked, but do not become active
-    // 'trigger' is from Monk's Active Tiles
-    // 'pf2e-perception' is from PF2e Perception by Idle
-    &[data-action="sort-up"],
-    &[data-action="sort-down"],
-    &[data-action="config"],
-    &[data-action="trigger"],
-    &[data-action="pf2e-perception"] {
-      &:hover {
-        background-color: var(--primary);
-        > img {
-          filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+      // These are toggles, inactive -> active -> inactive
+      // 'active' is from Monk's Active Tiles
+      // 'mystify' is from Workbench
+      &[data-action="visibility"],
+      &[data-action="effects"],
+      &[data-action="combat"],
+      &[data-action="locked"],
+      &[data-action="target"],
+      &[data-action="active"],
+      &[data-action="mystify"] {
+        background-color: var(--secondary-dark);
+
+        &:hover,
+        &.active {
+          background-color: var(--secondary-light);
+          > img {
+            filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+          }
         }
       }
-    }
 
-    // These are toggles, inactive -> active -> inactive
-    // 'active' is from Monk's Active Tiles
-    // 'mystify' is from Workbench
-    &[data-action="visibility"],
-    &[data-action="effects"],
-    &[data-action="combat"],
-    &[data-action="locked"],
-    &[data-action="target"],
-    &[data-action="active"],
-    &[data-action="mystify"] {
-      background-color: var(--secondary-dark);
+      &[data-action="clown-car"] img {
+        margin: unset; // the margin doesn't suit the system image
+      }
+
+      // Unknown HUD elements from modules etc. are treated as if they potentially could become active
+      // Since it is unknown whether they can de-activate via a click, active buttons should not darken on hover
+      &:hover {
+        background-color: var(--secondary);
+        color: var(--color-text-light-highlight);
+      }
 
-      &:hover,
       &.active {
+        color: var(--color-text-light-highlight);
         background-color: var(--secondary-light);
+        border: none;
+
+        // &:hover {
+        //     background-color: var(--secondary-dark);
+        //     color: white;
+        //     > img {
+        //         filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+        //     }
+        // }
+
         > img {
           filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
         }
       }
-    }
-
-    // Unknown HUD elements from modules etc. are treated as if they potentially could become active
-    // Since it is unknown whether they can de-activate via a click, active buttons should not darken on hover
-    &:hover {
-      background-color: var(--secondary);
-      color: var(--color-text-light-highlight);
-    }
-
-    &.active {
-      color: var(--color-text-light-highlight);
-      background-color: var(--secondary-light);
-      border: none;
-
-      // &:hover {
-      //     background-color: var(--secondary-dark);
-      //     color: white;
-      //     > img {
-      //         filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
-      //     }
-      // }
 
       > img {
-        filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+        opacity: 1;
+        filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
       }
     }
+  }
 
-    > img {
-      opacity: 1;
-      filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+  &.placeable-hud .control-icon {
+    .effect-control.valued .badge,
+    .effect-control .badge {
+      font-size: var(--font-size-16);
+      font-weight: 600;
+      line-height: var(--font-size-17);
+      border-radius: 0px var(--border-radius) 0px var(--border-radius);
+      background: var(--primary-light);
+      // background: white;
+      margin: 1px;
+      // color: black;
+      color: white;
+      text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+      height: 1.1rem;
+      width: 1.1rem;
+      border: 1px solid var(--gold-brown);
+      box-shadow: -1px 1px 0px var(--tertiary);
+    }
+
+    .badge.fa-lock:before {
+      position: relative;
+      top: -2.5px;
+      font-size: var(--font-size-10);
     }
   }
 }
diff --git a/sass/pf2e/_actor-sheet-dark.scss b/sass/pf2e/_actor-sheet-dark.scss
@@ -52,6 +52,7 @@
   }
 
   // prettier-ignore
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .attributes .attribute .abbreviation,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .attribute-modifiers .attribute .attribute-name,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .ability-scores .ability .ability-name {
     color: var(--color-border-light-primary);
@@ -71,9 +72,11 @@
   }
 
   // prettier-ignore
+  &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.action, 
+  &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike,
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action,
     &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.effects .effects-list .item {
-      border-image: linear-gradient(90deg, #f1edea00, black) 1;
+      border-image: linear-gradient(90deg, #f1edea00, var(--tertiary)) 1;
     }
 
   &.actor.sheet .inventory .list-row .item-controls .item-control .fa-stack .fa-1,
@@ -104,10 +107,27 @@
       background-color: var(--tertiary-dark);
     }
 
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .attributes .attribute .label,
   .crb-style .details-label {
     color: var(--tertiary);
   }
 
+  &.actor.sheet .inventory .list-row .item-controls .item-control.toggle-invested,
+  &.actor.sheet .inventory .list-row .item-controls .item-control.item-carry-type {
+    color: var(--tertiary-dark);
+  }
+
+  &.actor.sheet .inventory .list-row .item-controls .item-control.toggle-invested.active,
+  &.actor.sheet .inventory .list-row .item-controls .item-control.item-carry-type.active {
+    color: var(--tertiary);
+  }
+
+  // prettier-ignore
+  &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.action .item-name .actions-title .action-name > h4:hover,
+  &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .item-name .actions-title .action-name > h4:hover {
+    color: var(--tertiary);
+  }
+
   // prettier-ignore
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .ability-scores .ability .ability-id,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .attribute-modifiers .attribute .attribute-id {
@@ -239,9 +259,10 @@
   }
 
   // prettier-ignore
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .button-group,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list.strikes-list li.strike .button-group {
       gap: 3px;
-      button {
+      button.tag {
         @include glass;
         @include quick-transition;
         text-shadow: 0px 0px 3px black;

diff --git a/sass/pf2e/_actor-sheet.scss b/sass/pf2e/_actor-sheet.scss
@@ -20,6 +20,14 @@
     border-radius: 2px;
   }
 
+  &.actor.sheet button.use-action {
+    text-shadow: unset !important;
+    color: black !important;
+    select {
+      box-shadow: unset !important;
+    }
+  }
+
   &.actor.sheet .crb-style aside .modifiers_button {
     text-shadow: none;
 
@@ -45,6 +53,7 @@
   }
 
   // prettier-ignore
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .attributes .attribute h3.modifier,
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action.expanded .item-summary,
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels .actions-options,
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .crafting-options,