Merge pull request #2479 from adumesny/master

adumesny · web-flow · commit 52d2f712edc6 · 2023-09-30T10:27:48.000-07:00
scale demo cleanup
diff --git a/demo/index.html b/demo/index.html
@@ -16,26 +16,25 @@ <h1>Demos</h1>
     <li><a href="knockout.html">Knockout.js</a></li>
     <li><a href="mobile.html">Mobile touch</a></li>
     <li><a href="nested.html">Nested grids</a></li>
-    <li><a href="nested_constraint.html">Nested Constraint grids</a></li>
     <li><a href="nested_advanced.html">Nested Advanced grids</a></li>
-    <li><a href="offset.html">Offset parent</a></li>
-    <li><a href="react-hooks.html">ReactJS (Hooks)</a></li>
+    <li><a href="nested_constraint.html">Nested Constraint grids</a></li>
     <li><a href="react-hooks-controlled-multiple.html">ReactJS (Hooks), multiple grid, controlled (NOT Ideal)</a></li>
+    <li><a href="react-hooks.html">ReactJS (Hooks)</a></li>
     <li><a href="react.html">ReactJS</a></li>
     <li><a href="responsive.html">Responsive</a></li>
     <li><a href="right-to-left(rtl).html">Right-To-Left (RTL)</a></li>
     <li><a href="serialization.html">Serialization</a></li>
-    <li><a href="scale.html">Scale</a></li>
     <li><a href="sizeToContent.html">Size To Content</a></li>
     <li><a href="static.html">Static</a></li>
     <li><a href="title_drag.html">Title drag</a></li>
+    <li><a href="transform.html">Transform (scale+offset)</a></li>
     <li><a href="two.html">Two grids</a></li>
     <li><a href="two_vertical.html">Two grids Vertical</a></li>
     <li><a href="vue2js.html">Vue2.js</a></li>
     <li><a href="vue3js.html">Vue3.js</a></li>
-    <li><a href="vue3js_v-for.html">Vue3 with v-for</a></li>
-    <li><a href="vue3js_dynamic-render_grid-item.html">Vue3: Gridstack Controls Vue Rendering Grid Item</a></li>
     <li><a href="vue3js_dynamic-render_grid-item-content.html">Vue3: Gridstack Controls Vue Rendering Grid Item Content</a></li>
+    <li><a href="vue3js_dynamic-render_grid-item.html">Vue3: Gridstack Controls Vue Rendering Grid Item</a></li>
+    <li><a href="vue3js_v-for.html">Vue3 with v-for</a></li>
     <li><a href="web-comp.html">Web Component</a></li>
     <li><a href="web1.html">Website demo 1</a></li>
     <li><a href="web2.html">Website demo 2</a></li>
diff --git a/demo/offset.html b/demo/offset.html
diff --git a/demo/transform.html b/demo/transform.html
@@ -13,14 +13,14 @@
 <body>
   <div class="container-fluid">
     <h1>Transform Parent demo</h1>
-    <p>example where the grid parent has a scale (0.5, 0.5)</p>
+    <p>example where the grid parent has a translate(50px, 100px) scale(0.5, 0.5) </p>
     <div>
       <a class="btn btn-primary" onClick="addNewWidget()" href="#">Add Widget</a>
       <a class="btn btn-primary" onClick="zoomIn()" href="#">Zoom in</a>
       <a class="btn btn-primary" onClick="zoomOut()" href="#">Zoom out</a>
     </div>
     <br><br>
-    <div style="transform: scale(var(--global-scale), var(--global-scale)); transform-origin: 0 0;">
+    <div style="transform: translate(50px, 100px) scale(var(--global-scale), var(--global-scale)); transform-origin: 0 0;">
       <div class="grid-stack"></div>
     </div>
   </div>
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [9.2.2-dev (TBD)](#922-dev-tbd)
 - [9.2.2 (2023-09-27)](#922-2023-09-27)
 - [9.2.1 (2023-09-20)](#921-2023-09-20)
 - [9.2.0 (2023-09-10)](#920-2023-09-10)
@@ -100,6 +101,9 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## 9.2.2-dev (TBD)
+* fix [#1275](https://github.com/gridstack/gridstack.js/issues/1275) div scale support - Thank you [VincentMolinie](https://github.com/VincentMolinie) for implementing this
+
 ## 9.2.2 (2023-09-27)
 * fix - sub-grid styles now look for immediate correct parent, not any depth above.
 * fix [#2469](https://github.com/gridstack/gridstack.js/issues/2469) "Invalid height" error CSS minHeight
