Merge branch 'dev' into dev_skillslist

# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html

system/styles/scss/dices.scss

@@ -118,7 +118,7 @@
 
 // Dice Picker
 .dice-picker-dialog {
-    min-width: 600px;
+    min-width: 35rem;
     min-height: auto;
     // Utility
     * {
@@ -225,6 +225,7 @@
         background: none;
         border: none;
         font-size: large;
+        padding: 0;
 
         &-ring {
             color: #f0f0e0;

system/styles/scss/npc.scss

@@ -96,7 +96,7 @@
         width: 100%;
         line-height: 2rem;
         font-size: 0.75rem;
-        margin: 0 0 0.5rem;
+        margin: 0.5rem 0;
         text-align: center;
         li {
             flex: 1;

system/styles/scss/sheets.scss

@@ -1,11 +1,13 @@
 /** Sheets **/
 &.sheet {
-    min-width: 600px;
+    min-width: 37rem;
+
     label {
         &:hover {
             text-shadow: 0 0 2px $red;
         }
     }
+
     .l5r-buttons-bar {
         display: flex;
         flex: 0 0 100%;
@@ -21,9 +23,9 @@
             margin: 0 0 0 8px;
         }
     }
+
     &.actor {
         .sheet-header {
-            height: 26rem;
             h1 {
                 flex: auto;
                 margin: 0 0 0.25rem 0.5rem;
@@ -45,15 +47,49 @@
             font-size: 1rem;
         }
     }
+
     form {
         display: flex;
         flex-wrap: wrap;
         align-content: flex-start;
     }
+
     .sheet-body {
         flex: 0 0 100%;
         align-items: flex-start;
+        .effects {
+            clear: both;
+            display: flex;
+            flex-wrap: wrap;
+            gap: 2px 4px;
+            .effect-container {
+                border: 1px solid #5a6e5a;
+                border-radius: 4px;
+                background-color: rgba(0, 0, 0, 0.4);
+                padding: 3px;
+            }
+            .effect-icon {
+                width: 16px;
+                height: 16px;
+                background-repeat: no-repeat;
+                background-size: contain;
+                float: left;
+            }
+            .effect-name {
+                vertical-align: top;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                color: $white;
+                float: right;
+                margin-left: 4px;
+                font-size: 14px;
+                line-height: 16px;
+                max-width: 140px;
+            }
+        }
     }
+
     section,
     article {
         &.tab[data-tab] {
@@ -63,6 +99,7 @@
             }
         }
     }
+
     .sheet-header {
         flex: 0 0 100%;
         align-items: flex-start;
@@ -127,13 +164,9 @@
             }
         }
         .header-fields {
-            position: relative;
-            flex: 0 0 100%;
             h2 {
                 font-family: $font-secondary;
                 font-size: 1rem;
-                float: left;
-                width: 30%;
                 padding: 0.25rem 0.25rem 0;
                 margin: 1rem 20% 0 0;
                 text-align: center;
@@ -234,18 +267,22 @@
                 }
             }
         }
-        .rings {
-            float: left;
+        .mid-wrapper {
+            display: flex;
+        }
+        .side-col {
+            width: 30%;
+        }
+        .central-col {
             width: 40%;
+        }
+        .rings {
             padding: 0;
-            position: relative;
-            top: -1.5rem;
+            margin-top: 1rem;
         }
         .social-content,
         .attributes-wrapper {
             flex: none;
-            float: left;
-            width: 30%;
             flex-wrap: wrap;
             display: flex;
             padding: 0.5rem 0 0 0.25rem;
@@ -545,6 +582,7 @@
             }
         }
     }
+
     article {
         background: $l5r5e-white-light;
         padding: 0.5rem;
@@ -710,6 +748,7 @@
             flex: 0 0 calc(50% - 0.5rem);
         }
     }
+
     .xp,
     .money-wrapper {
         flex: 100%;
@@ -728,6 +767,7 @@
             line-height: 13px;
         }
     }
+
     table {
         font-size: 0.85rem;
         color: $black-light;
@@ -794,6 +834,7 @@
             }
         }
     }
+
     .inventory {
         .items-wrapper {
             h3 {
@@ -888,6 +929,7 @@
             }
         }
     }
+
     nav {
         &.sheet-tabs {
             flex: 100%;
@@ -904,7 +946,6 @@
             margin: 0.5rem 0 0.5rem 1.5rem;
             padding: 0;
         }
-
     }
 }
 // Lang Adjust.

system/styles/scss/ui.scss

@@ -14,6 +14,10 @@ button {
     .system {
         overflow: auto;
         border-bottom: 1px solid var(--color-border-light-highlight);
+
+        .system-title {
+            white-space: break-spaces;
+        }
     }
 }
 
@@ -28,8 +32,7 @@ button {
     overflow: initial;
     height: calc(100% - 1.1rem);
     top: 0.2rem;
-    width: 320px;
-    min-width: 40px;
+    min-width: 20rem;
     letter-spacing: 0.1rem;
     position: relative;
     margin-right: 0.5rem;
@@ -168,6 +171,9 @@ button {
         }
     }
     &.collapsed {
+        min-width: 0;
+        width: 3rem !important;
+
         #sidebar-tabs {
             > .item {
                 &.active {