Minor compatibility favoured adjustments

saif-ellafi · May 4, 2021 · 1525c41 · 1525c41
1 parent 265ba9b
commit 1525c41
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-### 0.9.4
+### 0.9.6
+* Compatibility: Default setting values prioritize a smoother first-experience and compatibility with other modules
+* Compatibility: Adjusted styles for left control buttons to behave more predictable with external modules that alter them
+* Bugfix: Lock button now uses Minimal UI colors
+* Bugfix: Some Minimize optional features now disabled by default
+* Bugfix: Better explained setting descriptions
+
+### 0.9.5
 * Bugfix: Fine-tuning of maximized window size values
 
 ### 0.9.4

diff --git a/lang/en.json b/lang/en.json
@@ -78,9 +78,9 @@
   "MinimalUI.SidebarStyleHint": "Whether the right side panel starts collapsed or not",
 
   "MinimalUI.BorderColorName": "Border Colors",
-  "MinimalUI.BorderColorHint": "Default: #ff4900bd",
+  "MinimalUI.BorderColorHint": "Color of borders for sidebars and buttons",
   "MinimalUI.ShadowColorName": "Shadow Colors",
-  "MinimalUI.ShadowColorHint": "Default: #ff4900bd",
+  "MinimalUI.ShadowColorHint": "Color for shadows around borders and buttons",
   "MinimalUI.ShadowStrengthName": "Shadow Strength",
   "MinimalUI.ShadowStrengthHint": "How gloomy and shadow are the borders? Default: 5",
   "MinimalUI.ColorPicker": "Color Picker",
@@ -100,7 +100,7 @@
   "MinimalUI.EnrichedMinimizeHint": "Highlight the color of minimized windows with Right Click or on mouse over",
 
   "MinimalUI.OrganizedMaximizeName": "MINIMAL UI Organized Maximize",
-  "MinimalUI.OrganizedMaximizeHint": "Add a maximize button on resizeable windows to expand them to the maximum available size",
+  "MinimalUI.OrganizedMaximizeHint": "Add a maximize button on resizeable windows. May not work well with all systems",
 
   "MinimalUI.PinSidebar": "Pin Controls"
 

diff --git a/lang/es.json b/lang/es.json
@@ -78,9 +78,9 @@
   "MinimalUI.SidebarStyleHint": "Si se debe colapsar o no el panel lateral derecho",
 
   "MinimalUI.BorderColorName": "Colores del borde",
-  "MinimalUI.BorderColorHint": "Por defecto: #ff4900bd",
+  "MinimalUI.BorderColorHint": "Color de los bordes de paneles y botones",
   "MinimalUI.ShadowColorName": "Color sombreado",
-  "MinimalUI.ShadowColorHint": "Por defecto: #ff4900bd",
+  "MinimalUI.ShadowColorHint": "Color de las sombras al rededor de paneles y botones",
   "MinimalUI.ShadowStrengthName": "Fuerza sombreado",
   "MinimalUI.ShadowStrengthHint": "Grado de sombreado y oscuridad de los bordes. Por defecto: 5",
   "MinimalUI.ColorPicker": "Escoger color",
@@ -100,7 +100,7 @@
   "MinimalUI.EnrichedMinimizeHint": "Resaltar el color de las ventanas minimizadas con click derecho o al pasar por encima",
 
   "MinimalUI.OrganizedMaximizeName": "Modo organizado Maximizar",
-  "MinimalUI.OrganizedMaximizeHint": "Añade un boton para maximizar las ventanas al máximo tamaño posible",
+  "MinimalUI.OrganizedMaximizeHint": "Añade un boton para maximizar las ventanas. Puede no funcionar correctamente en todos los sistemas.",
 
   "MinimalUI.PinSidebar": "Controles de chincheta"
 

diff --git a/module.json b/module.json
@@ -3,7 +3,7 @@
 	"title": "Minimal UI",
 	"author": "JeansenVaars#2857",
 	"description": "Minimal UI allows customizing Foundry interface, by hiding, collapsing or resizing specific parts.",
-	"version": "0.9.5",
+	"version": "0.9.6",
 	"minimumCoreVersion": "0.7.9",
 	"compatibleCoreVersion": "0.7.9",
 	"dependencies": [
@@ -26,5 +26,5 @@
 	],
 	"url": "https://github.com/saif-ellafi/foundryvtt-minimal-ui.git",
 	"manifest": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/latest/download/module.json",
-	"download": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/latest/download/foundryvtt-minimal-ui_0.9.5.zip"
+	"download": "https://github.com/saif-ellafi/foundryvtt-minimal-ui/releases/latest/download/foundryvtt-minimal-ui_0.9.6.zip"
 }
diff --git a/modules/component/controls.js b/modules/component/controls.js
@@ -10,8 +10,8 @@ export default class MinimalUIControls {
     static controlToolsHoverTransition;
 
     static cssControlsStartVisible = '0px';
-    static cssControlsHiddenPositionSmall = '-62px';
-    static cssControlsHiddenPositionStandard = '-72px';
+    static cssControlsHiddenPositionSmall = '-40px';
+    static cssControlsHiddenPositionStandard = '-50px';
 
     static cssControlsSubMenuSmall = '55px';
     static cssControlsSubMenuStandard = '65px';
@@ -21,8 +21,8 @@ export default class MinimalUIControls {
     static cssControlsPaddingHidden = '26px';
 
     static cssControlsSmallWidth = '25px';
-    static cssControlsSmallHeight = '28px';
-    static cssControlsSmallLineHeight = '30px';
+    static cssControlsSmallHeight = '24px';
+    static cssControlsSmallLineHeight = '25px';
     static cssControlsSmallFontSize = '15px';
 
     static revealControls() {
@@ -106,7 +106,7 @@ export default class MinimalUIControls {
             $(`
             <li id="sidebar-lock" class="scene-control"
             title="${game.i18n.localize("MinimalUI.PinSidebar")}">
-            <i class="fas ${locked}" style="color: red"></i>
+            <i class="fas ${locked} minui-lock"></i>
             </li>
             `)
         if (game.settings.get('minimal-ui', 'controlsBehaviour') === 'autohide') {
@@ -144,7 +144,7 @@ export default class MinimalUIControls {
                 "small": game.i18n.localize("MinimalUI.SettingsSmall"),
                 "standard": game.i18n.localize("MinimalUI.SettingsStandard")
             },
-            default: "small",
+            default: "standard",
             onChange: _ => {
                 window.location.reload()
             }

diff --git a/modules/component/hotbar.js b/modules/component/hotbar.js
@@ -19,7 +19,7 @@ export default class MinimalUIHotbar {
 
     static htmlHotbarLockButton =
         `
-        <a id="bar-lock">
+        <a class="minui-lock" id="bar-lock">
           <i class="fas fa-lock-open"></i>
         </a>
         `

diff --git a/modules/customization/theme.js b/modules/customization/theme.js
@@ -10,7 +10,7 @@ export default class MinimalUITheme {
             label: game.i18n.localize("MinimalUI.ColorPicker"),
             scope: "world",
             restricted: true,
-            defaultColor: "#ff4900bd",
+            defaultColor: "#ff490080",
             onChange: _ => {
                 rootStyle.setProperty('--bordercolor', game.settings.get('minimal-ui', 'borderColor'));
             }
@@ -22,7 +22,7 @@ export default class MinimalUITheme {
             label: game.i18n.localize("MinimalUI.ColorPicker"),
             scope: "world",
             restricted: true,
-            defaultColor: "#ff0000bd",
+            defaultColor: "#ff000060",
             type: String,
             onChange: _ => {
                 rootStyle.setProperty('--shadowcolor', game.settings.get('minimal-ui', 'shadowColor'));

diff --git a/modules/feature/minimize.js b/modules/feature/minimize.js
@@ -260,7 +260,7 @@ export default class MinimalUIMinimize {
                 "enabled": game.i18n.localize("MinimalUI.Enabled"),
                 "disabled": game.i18n.localize("MinimalUI.Disabled")
             },
-            default: "enabled",
+            default: "disabled",
             onChange: _ => {
                 window.location.reload();
             }
@@ -275,7 +275,7 @@ export default class MinimalUIMinimize {
                 "enabled": game.i18n.localize("MinimalUI.Enabled"),
                 "disabled": game.i18n.localize("MinimalUI.Disabled")
             },
-            default: "enabled",
+            default: "disabled",
             onChange: _ => {
                 window.location.reload()
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foundryvtt-minimal-ui",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Minimal UI allows customizing Foundry interface, by hiding, collapsing or resizing specific parts.",
   "main": "minimalui.js",
   "scripts": {

diff --git a/styles/component/controls.css b/styles/component/controls.css
@@ -4,8 +4,8 @@
     --controlsypos: 20vmin;
     --controlspad: 7px;
     --controlsw: 36px;
-    --controlsh: 36px;
-    --controlslh: 36px;
+    --controlsh: 30px;
+    --controlslh: 30px;
     --controlsfs: 24px;
     --controlssubleft: 60px;
     --controlssubstyle: contents;
@@ -18,7 +18,6 @@
     border-right: 1px solid var(--bordercolor);
     box-shadow: 3px 0 var(--shadowstrength) 0 var(--shadowcolor);
     transition: 0.5s;
-    padding-right: var(--controlspad);
     background: #0000003b;
 }
 
@@ -28,40 +27,28 @@
 
 #controls .control-tool.toggle {
     background: var(--shadowcolor);
-    border: 0 solid var(--bordercolor);
 }
 
 #controls .control-tool.toggle:hover {
     background: var(--bordercolor);
     box-shadow: 0 0 var(--shadowstrength) var(--shadowcolor);
+    border: 1px solid transparent;
 }
 
 #controls .control-tool.toggle.active {
     background: var(--bordercolor);
     box-shadow: 0 0 var(--shadowstrength) var(--bordercolor);
-}
-
-#controls .scene-control, #controls .control-tool {
-    margin: 0 0 2px;
+    border: 1px solid transparent;
 }
 
 #controls .scene-control.active, #controls .scene-control:hover {
     border: 1px solid transparent;
     color: orange;
     box-shadow: 1px 0 var(--shadowstrength) 0 var(--shadowcolor);
-    padding-right: 2px;
-    padding-left: 1px;
-}
-
-#controls .control-tool.toggle.active, #controls .control-tool.toggle:hover {
-    padding-right: 0;
-    padding-left: 1px;
 }
 
 #controls .control-tool.active, #controls .control-tool {
     border: 0 solid transparent;
-    padding-right: 0;
-    padding-left: 1px;
 }
 
 #controls .control-tool.active, #controls .control-tool:hover {
@@ -75,8 +62,7 @@
     height: var(--controlsh);
     line-height: var(--controlslh);
     font-size: var(--controlsfs);
-    padding-right: 0;
-    padding-left: 1px;
+    border: 1px solid transparent;
 }
 
 
@@ -85,11 +71,11 @@
     left: var(--controlssubleft);
     transition: 0.5s;
     background: #00000059;
-    border: solid 1px var(--bordercolor);
     box-shadow: 1px 0 var(--shadowstrength) 0 var(--shadowcolor);
     border-radius: 3px;
+    padding: 5px;
 }
 
 #controls:hover .active .control-tools {
     display: var(--controlssubstyle);
-}
+}
diff --git a/styles/customization/theme.css b/styles/customization/theme.css
@@ -2,4 +2,8 @@
     --bordercolor: #ff4900bd;
     --shadowcolor: #ff4900bd;
     --shadowstrength: 10px;
+}
+
+.minui-lock {
+    color: var(--shadowcolor);
 }