Skip to content

Commit

Permalink
1.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorako committed Feb 18, 2023
1 parent 0db31c7 commit ad80415
Show file tree
Hide file tree
Showing 14 changed files with 449 additions and 72 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 1.12.1

- (Module) Added support for Chat Reactions.
- (Fix) Fixed an issue where Monk's Enhanced Journals would under some circumstances not have a background.
- (Refinement) Extended dark theme support for chat messages sent via Monk's Enhanced Journals.

# 1.12.0

- (Overhaul) Replaced the setting submenus with groups. This allows modules like Force Client Settings to easily work again.
Expand Down
6 changes: 1 addition & 5 deletions languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,14 @@

"enable-debug-mode": {
"name": "Enable debug mode?",
"hint": "Adds buttons to toggle dorako-ui styling for windows."
"hint": "Adds buttons to toggle dorako-ui and dark-theme styling for windows"
},

"send-to-chat": {
"name": "Add 'Send' button to window header?",
"hint": "Sends content to chat as if sent via sheet"
},

"skin-combat-carousel": {
"name": "Enable styling for Combat Carousel?"
},

"skin-crb-journal": {
"name": "Enable CRB styling for journals?",
"hint": "Instructions at www.shorturl.at/mrzN1"
Expand Down
24 changes: 24 additions & 0 deletions modules/settings/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,30 @@ Hooks.once("init", async () => {
type: String,
});

const refresh = () => {
game.canvas?.tokens?.placeables.forEach((token) => {
void token.drawEffects();
});
};

game.settings.register("pf2e-dorako-ui", "effectIconsLayout", {
scope: "client",
config: true,
default: "above",
type: String,
choices: ["horizontal", "vertical", "above"],
onChange: refresh,
});

game.settings.register("pf2e-dorako-ui", "effectIconsPerRow", {
scope: "client",
config: true,
default: 10,
type: String,
onChange: refresh,
range: { min: 2, max: 10, step: 1 },
});

// game.settings.registerMenu("pf2e-dorako-ui", "theme", {
// name: "pf2e-dorako-ui.settings.theme.name",
// label: "pf2e-dorako-ui.settings.theme.label",
Expand Down
6 changes: 6 additions & 0 deletions sass/foundry/_app-ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
}
}

&.window-app.maximized {
border-radius: 0;
margin: 0px;
box-shadow: none;
}

&.window-app.minimized.hazard {
background-color: #1c3531;
}
Expand Down
3 changes: 2 additions & 1 deletion sass/foundry/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
}
}

.dorako-ui form button:not(.pm-dropdown) {
.dorako-ui form button {
//:not(.pm-dropdown)
@include quick-transition;
border: 1px solid var(--color-border-light-primary);

Expand Down
60 changes: 60 additions & 0 deletions sass/module/_chat-reactions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
.dorako-ui {
.message-metadata {
max-height: unset;
}
form button.emojiPickerButton {
display: flex;
@include glass;
@include quick-transition;
text-shadow: 0px 0px 3px black;
background-color: #f7ce64;

&:hover {
background-color: #cfa436;
}
}
}

.dorako-ui.light-theme {
.emoji-button {
@include sheet;
@include gold-border-shadow;
background-image: var(--sheet-dark);
text-shadow: 0px 0px 3px black;
margin-right: 5px;
&:hover {
background-color: var(--primary);
background-blend-mode: color-dodge;
}
}
.trigger {
background: none;
box-shadow: none;
&:hover {
background: none;
box-shadow: none;
}
}
}

.dorako-ui.dark-theme {
.emoji-button {
@include glass;
@include quick-transition;
text-shadow: 0px 0px 3px black;
&:hover {
background-color: var(--primary);
}
}
.trigger {
background-color: #f7ce64;
height: 20px;
width: 20px;
place-self: center;
display: flex;
text-align: center;
&:hover {
background-color: #cfa436;
}
}
}
2 changes: 1 addition & 1 deletion sass/module/_dalvyn-journal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
}

.dalvyn-journal {
.dalvyn-journal .journal-entry:not(.pf2e-av) {
/* By Dalvyn */
/* Custom CSS - PF2 STYLE v2.1 */
/* TITRES
Expand Down
4 changes: 2 additions & 2 deletions sass/module/_dfce.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
.message-header {
background: transparent;
box-shadow: none;
text-shadow: 0px 0px 1px white;
// text-shadow: 0px 0px 1px white;
margin: 0px;
padding: 0px;
padding-right: 5px;
color: var(--color-text-dark-primary);
// color: var(--color-text-dark-primary);
}
.header-meta {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion sass/module/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
@import "cautious-gamemasters-pack", "combat-carousel", "custom-hotbar", "damage-log", "dfce", "dice-tray", "dorako-ui",
"enhancen-terrain-layer", "filepicker-plus", "koboldworks-turn-announcer", "macros", "monarch", "monks", "polyglot",
"scene-preview", "speaking-as", "target-damage", "token-action-hud", "workbench", "party-overview", "pf2e-dailies",
"dalvyn-journal", "swade";
"dalvyn-journal", "swade", "chat-reactions";
95 changes: 95 additions & 0 deletions sass/module/_monks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,88 @@
/* Monk's Enhanced Journal */
/* ----------------------------------------- */

.dorako-ui.dark-theme {
&.monks-journal-sheet.sheet .items-list .item .item-name,
.monks-journal-sheet.sheet .items-list .item .item-name {
color: var(--body);
}
&.monks-journal-sheet.sheet .items-list,
.monks-journal-sheet.sheet .items-list {
color: var(--color-text-light-heading-highlight);
}
&.monks-journal-sheet.sheet .items-list .items-header,
.monks-journal-sheet.sheet .items-list .items-header {
@include glass;
background: var(--glass-bg-light);
color: var(--tertiary);
}
&.monks-journal-sheet.sheet .sheet-navigation,
.monks-journal-sheet.sheet .sheet-navigation {
@include glass;
background: var(--glass-bg-light);
// color: var(--tertiary);
// text-shadow: 0px 0px 10px var(--tertiary);
}
&.monks-enhanced-journal footer,
&.monks-enhanced-journal .mainbar .navigation {
@include glass;
background: var(--glass-bg-light);
}
&.monks-enhanced-journal .mainbar .navigation .nav-button,
&.monks-enhanced-journal footer.navigation .nav-button {
@include glass;
@include quick-transition;
text-shadow: 0px 0px 3px black;
color: var(--color-text-light-heading);
&:hover {
background-color: var(--primary);
color: var(--color-text-light-highlight);
}
}

.monks-enhanced-journal.request-item .request-buttons {
gap: 5px;
button {
@include glass;
@include quick-transition;
text-shadow: 0px 0px 3px black;
color: var(--color-text-light-heading);
&:hover {
background-color: var(--primary);
color: var(--color-text-light-highlight);
}
&.request-accept:hover {
background-color: green;
}
}
}
}

.system-pf2e .monks-enhanced-journal.request-item.item-card {
height: unset;
padding: unset;
}

// Player point-of-view
.monks-journal-sheet.sheet .person-container,
.monks-journal-sheet.sheet .place-container,
.monks-journal-sheet.sheet .quest-container,
.monks-journal-sheet.sheet .organization-container,
.monks-journal-sheet.sheet .shop-container,
.monks-journal-sheet.sheet .loot-container,
.monks-journal-sheet.sheet .poi-container,
.monks-journal-sheet.sheet .event-container {
@include sheet;
box-shadow: 0 0 0 1px var(--gold-brown) inset, 0 0 0 2px var(--tertiary) inset;
}

.monks-enhanced-journal.request-item img {
@include gold-border;
border-radius: 3px;
object-fit: contain;
background-color: white;
}

.monks-journal-sheet.sheet .sheet-navigation,
.monks-journal-sheet.sheet .sheet-header .header-details {
font-family: var(--font-primary);
Expand Down Expand Up @@ -586,6 +668,19 @@ section.readaloud {
border-image: linear-gradient(90deg, #f1edea, #d5cac1) 1 repeat;
border-width: 0 0 1px;
}
.dorako-ui.dark-theme .monks-journal-sheet.sheet .items-list .item {
border-image: linear-gradient(90deg, rgba(241, 237, 234, 0), black) 1;
}

#journal-directory .directory-item.journalentry .permissions {
background-color: var(--glass-bg-light);
box-shadow: var(--glassy);
> div {
color: var(--tertiary);
box-shadow: var(--gold-and-glow), 0px 1px 3px black;
margin-top: 1px;
}
}

/* ----------------------------------------- */
/* Monk's Scene Navigation */
Expand Down
11 changes: 8 additions & 3 deletions styles/dorako-ui.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion styles/dorako-ui.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit ad80415

Please sign in to comment.