fixed some css & prosemirror

CHANGELOG.md

@@ -9,9 +9,13 @@ Date format : day/month/year
 ## 1.13.0 - ??/??/2025 - Foundry v13 Compatibility (Thx to Litasa)
 __! Be certain to carefully back up any critical user data before installing this update !__
 - Updated the System to FoundryVTT v13.
-- Added English compendium for `Children of the Five Winds`.
+- Compendiums
-- Added French translation for `Writ of the Wild`.
+  - Added English compendium for `Children of the Five Winds`.
-- Fix Compendium Typo : "Beseech Hida's MIght" -> "Beseech Hida's Might" (!59).
+  - Added French translation for `Writ of the Wild`.
+  - Fix Compendium Typo: "Beseech Hida's MIght" -> "Beseech Hida's Might" (!59).
+- Actor sheets: Technique types are now hidden when they are not checked in locked mode.
+- Fix 20Q: Technique message fixed (unallowed tech for School).
+- Switched wysiwyg editor engine to `prosemirror` for text editor (`tinymce` will be removed in Foundry v14).
 
 ## 1.12.3 - 13/03/2025 - Fixes and Compendiums Filters (Thx to Litasa)
 - Added Compendiums Filters (#41)

system/scripts/actors/twenty-questions-dialog.js

@@ -288,14 +288,12 @@ export class TwentyQuestionsDialog extends FormApplication {
                     // School Ability
                     if (stepKey === "step3.school_ability") {
                         if (item.system.technique_type !== "school_ability") {
-                            console.warn(
+                            console.warn(`L5R5E | 20Q | This technique is not a school ability : ${item.system.technique_type}`);
-                                `L5R5E | 20Q | This technique is not a school ability : ${item.system.technique_type}`
-                            );
                             return;
-                        } else if (!this.object.data.step3.allowed_techniques?.[item.system.technique_type]) {
-                            // Informative message : Tech not allowed
-                            ui.notifications.info("l5r5e.techniques.not_allowed", {localize: true});
                         }
+                    } else if (!this.object.data.step3.allowed_techniques?.[item.system.technique_type]) {
+                        // Informative message : Tech not allowed
+                        ui.notifications.info("l5r5e.techniques.not_allowed", {localize: true});
                     }
                     break;
 

system/styles/scss/army.scss

@@ -232,7 +232,7 @@
                 &.others {
                     flex-direction: column;
 
-                    .editor-content {
+                    .editor-container {
                         min-height: 8rem;
                         max-height: 14rem;
                     }

system/styles/scss/global-appv2.scss

@@ -1,10 +1,10 @@
 .application {
     color: var(--color-text-dark-primary);
-    
+
     .scrollable {
         --scroll-margin: 0;
     }
-    
+
     .window-header {
         background: linear-gradient(
             $l5r5e-linear-gradient-second,
@@ -22,7 +22,7 @@
     }
 }
 
-// More specifified stuff down here as to not make it too hard to read the overriden defaults
+// More specified stuff down here as to not make it too hard to read the overridden defaults
 .application {
     .window-content {
         table {

system/styles/scss/global.scss

@@ -19,7 +19,6 @@ body {
     .window-content {
         z-index: 1;
         position: relative;
-        background: rgb(255, 250, 230) url("../assets/imgs/bg-l5r.webp") no-repeat;
         background-size: cover;
         scrollbar-width: thin;
         padding: 0;
@@ -193,7 +192,7 @@ fieldset {
 
 // Editors
 .editor,
-.editor-content {
+.editor-container {
     flex: 1;
     height: 100%;
 }
@@ -232,7 +231,7 @@ sup {
     }
 }
 
-.editor-content,
+.editor-container,
 .item-description {
     ul {
         margin: 0.5rem 0;

system/styles/scss/items.scss

@@ -11,7 +11,7 @@
                 flex: 0 0 32px;
                 padding-right: 0.25rem;
                 img {
-                    border: 1px solid rgba(0, 0, 0, 0.1);
+                    border: none;
                 }
             }
             .item-name {
@@ -19,6 +19,7 @@
                 font-size: 1rem;
                 line-height: 1rem;
                 color: $l5r5e-bold;
+                align-content: center;
             }
             .removed {
                 text-decoration-line: line-through;
@@ -454,7 +455,7 @@
             .flx100 {
                 flex: 0 0 calc(100% - 0.5rem);
             }
-            .editor-content {
+            .editor-container {
                 min-height: 8rem;
                 max-height: 14rem;
             }

system/styles/scss/l5r5e-global.scss

@@ -37,6 +37,7 @@ textarea {
     color: $l5r5e-black;
     resize: vertical;
     border-radius: 0;
+    box-shadow: none;
     &[disabled] {
         background: $l5r5e-white-light;
     }

system/styles/scss/sheets.scss

@@ -520,17 +520,6 @@
         }
         .attribute-label {
             position: relative;
-            &:before {
-                z-index: -1;
-                content: "";
-                position: absolute;
-                height: calc(100% - 0.85rem);
-                width: 3.1rem;
-                border: 1px solid $l5r5e-title;
-                border-radius: 0;
-                top: 0.15rem;
-                left: 0.15rem;
-            }
         }
         .identity-content {
             .attribute-label {
@@ -629,19 +618,19 @@
             }
         }
         .narrative-fluff {
-            flex: 1;
             flex: 0 0 50%;
+            display: flex;
+            flex-direction: column;
 
-            .narrative-description {
+            .narrative-description,
-                max-height: 13rem;
-                font-size: 0.85rem;
-                flex: 1;
-            }
             .narrative-note {
+                flex: 1;
                 font-size: 0.85rem;
-            }
+                max-height: 24rem;
-            .editor-content {
+
-                min-height: 10rem;
+                .editor-container {
+                    min-height: 18rem;
+                }
             }
         }
         .techniques-wrapper {
@@ -765,10 +754,12 @@
     }
 
     table {
+        border: none;
         font-size: 0.85rem;
         color: $black-light;
         text-align: left;
         thead {
+            border: none;
             font-family: $font-secondary;
             font-weight: normal;
             th {
@@ -790,6 +781,7 @@
             }
         }
         tbody {
+            border: none;
             .curriculum {
                 flex: 0 0 2rem;
             }
@@ -827,8 +819,13 @@
                 width: 16px;
                 height: 16px;
                 border: none;
+                display: inline;
             }
         }
+        tfoot {
+            border: none;
+            text-align-last: center;
+        }
     }
 
     .inventory {

system/styles/scss/ui.scss

@@ -420,7 +420,6 @@ button {
     min-width: 240px;
 
     .window-content {
-        //background: rgb(255, 250, 230) url("../assets/imgs/bg-l5r.webp") no-repeat;
         [data-application-part="hidden_tabs"] {
             display: none;
         }

system/templates/actors/army/army.html

@@ -61,6 +61,6 @@
     </fieldset>
     <fieldset class="army-abilities">
         <legend>{{localize 'l5r5e.army.army_abilities'}}</legend>
-        {{editor data.enrichedHtml.army_abilities target="system.army_abilities" button=true editable=options.editable}}
+        {{editor data.enrichedHtml.army_abilities target="system.army_abilities" button=true editable=options.editable engine="prosemirror" collaborate=false}}
     </fieldset>
 </div>

system/templates/actors/army/others.html

@@ -1,23 +1,23 @@
 {{!-- Supplies and Logistics --}}
 <fieldset class="supplies_logistics">
     <legend class="text-block-header">{{localize 'l5r5e.army.supplies_logistics'}}</legend>
-    {{editor data.enrichedHtml.supplies_logistics target="system.supplies_logistics" button=true editable=options.editable}}
+    {{editor data.enrichedHtml.supplies_logistics target="system.supplies_logistics" button=true editable=options.editable engine="prosemirror" collaborate=false}}
 </fieldset>
 
 {{!-- Past Battles --}}
 <fieldset class="past_battles">
     <legend class="text-block-header">{{localize 'l5r5e.army.past_battles'}}</legend>
-    {{editor data.enrichedHtml.past_battles target="system.past_battles" button=true editable=options.editable}}
+    {{editor data.enrichedHtml.past_battles target="system.past_battles" button=true editable=options.editable engine="prosemirror" collaborate=false}}
 </fieldset>
 
 {{!-- Description (public) --}}
 <fieldset class="description">
     <legend class="text-block-header">{{localize 'l5r5e.sheets.description'}}</legend>
-    {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable}}
+    {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable engine="prosemirror" collaborate=false}}
 </fieldset>
 
 {{!-- Notes (private) --}}
 <fieldset class="note">
     <legend class="text-block-header">{{localize 'l5r5e.sheets.notes'}}</legend>
-    {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable}}
+    {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable engine="prosemirror" collaborate=false}}
 </fieldset>

system/templates/actors/character/experience.html

@@ -73,7 +73,7 @@
         </tbody>
     </table>
 </fieldset>
-{{!-- Others progession (does not count in school xp) --}}
+{{!-- Others progression (does not count in school xp) --}}
 <fieldset class="xp-spent xp-spent-body">
     <legend class="tools">
         {{localize 'l5r5e.advancements.title'}}

system/templates/actors/character/narrative.html

@@ -82,11 +82,11 @@
     {{!-- Description (public) --}}
     <fieldset class="narrative-description">
         <legend class="text-block-header">{{localize 'l5r5e.sheets.description' }}</legend>
-        {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable}}
+        {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable engine="prosemirror" collaborate=false}}
     </fieldset>
     {{!-- Notes (private) --}}
     <fieldset class="narrative-note">
         <legend class="text-block-header">{{localize 'l5r5e.sheets.notes' }}</legend>
-        {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable}}
+        {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable engine="prosemirror" collaborate=false}}
     </fieldset>
 </div>

system/templates/actors/character/techniques.html

@@ -3,10 +3,12 @@
     <div class="checklist">
         <i>{{localize 'l5r5e.techniques.type'}}</i>
         {{#each data.techniquesList as |technique|}}
+        {{#ifCond ../data.editable_not_soft_locked '||' (lookup ../data.system.techniques technique.id)}}
             <label>
                 <input type="checkbox" name="system.techniques.{{technique.id}}" {{checked (lookup ../data.system.techniques technique.id)}} {{^if ../data.editable_not_soft_locked}}disabled{{/if}} />
                 {{technique.label}}
             </label>
+        {{/ifCond}}
         {{/each}}
     </div>
     {{!-- technique list --}}

system/templates/actors/npc/narrative.html

@@ -78,11 +78,11 @@
     {{!-- Description (public) --}}
     <fieldset class="narrative-description">
         <legend class="text-block-header">{{localize 'l5r5e.sheets.description' }}</legend>
-        {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable}}
+        {{editor data.enrichedHtml.description target="system.description" button=true editable=options.editable engine="prosemirror" collaborate=false}}
     </fieldset>
     {{!-- Notes (private) --}}
     <fieldset class="narrative-note">
         <legend class="text-block-header">{{localize 'l5r5e.sheets.notes' }}</legend>
-        {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable}}
+        {{editor data.enrichedHtml.notes target="system.notes" button=true editable=options.editable engine="prosemirror" collaborate=false}}
     </fieldset>
 </div>

system/templates/actors/npc/techniques.html

@@ -6,10 +6,12 @@
     <div class="checklist">
         <i>{{localize 'l5r5e.techniques.type'}}</i>
         {{#each data.techniquesList as |technique|}}
+        {{#ifCond ../data.editable_not_soft_locked '||' (lookup ../data.system.techniques technique.id)}}
             <label>
                 <input type="checkbox" name="system.techniques.{{technique.id}}" {{checked (lookup ../data.system.techniques technique.id)}} {{^if ../data.editable_not_soft_locked}}disabled{{/if}} />
                 {{technique.label}}
             </label>
+        {{/ifCond}}
         {{/each}}
     </div>
     {{!-- technique list --}}

system/templates/items/army-cohort/army-cohort-sheet.html

@@ -52,7 +52,7 @@
         <article class="tab abilities" data-group="primary" data-tab="abilities">
             <fieldset class="attribute army-cohort-types flx100">
                     <legend class="text-block-header">{{localize 'l5r5e.army.cohort.abilities'}}</legend>
-                {{editor data.enrichedHtml.abilities target="system.abilities" button=true owner=owner editable=editable}}
+                {{editor data.enrichedHtml.abilities target="system.abilities" button=true owner=owner editable=editable engine="prosemirror" collaborate=false}}
             </fieldset>
         </article>
 

system/templates/items/item/item-infos.html

@@ -1,7 +1,7 @@
 <article class="tab infos active" data-group="primary" data-tab="infos">
     <fieldset>
         <legend class="text-block-header">{{localize 'l5r5e.sheets.description'}}</legend>
-        {{editor data.enrichedHtml.description target="system.description" button=true owner=owner editable=editable}}
+        {{editor data.enrichedHtml.description target="system.description" button=true owner=owner editable=editable engine="prosemirror" collaborate=false}}
     </fieldset>
     <label class="reference">
         {{localize 'l5r5e.sheets.source_reference.reference'}}