Merge branch 'master' of https://github.com/radiolips/gridstack.js

radiolips · radiolips · commit 110403a34f92 · 2018-05-09T12:19:34.000-04:00
# Conflicts:
#	doc/CHANGES.md
diff --git a/README.md b/README.md
@@ -216,18 +216,18 @@ For 4-column grid it should be:
 
 and so on.
 
-Here is a SASS code snipped which can make life easier (Thanks to @ascendantofrain, [#81](https://github.com/gridstack/gridstack.js/issues/81)):
+Here is a SASS code snippet which can make life easier (Thanks to @ascendantofrain, [#81](https://github.com/gridstack/gridstack.js/issues/81) and @StefanM98, [#868](https://github.com/gridstack/gridstack.js/issues/868)):
 
 ```sass
-.grid-stack-item {
+.grid-stack > .grid-stack-item {
 
     $gridstack-columns: 12;
 
     @for $i from 1 through $gridstack-columns {
         &[data-gs-width='#{$i}'] { width: (100% / $gridstack-columns) * $i; }
         &[data-gs-x='#{$i}'] { left: (100% / $gridstack-columns) * $i; }
-        &.grid-stack-item[data-gs-min-width='#{$i}'] { min-width: (100% / $gridstack-columns) * $i; }
-        &.grid-stack-item[data-gs-max-width='#{$i}'] { max-width: (100% / $gridstack-columns) * $i; }
+        &[data-gs-min-width='#{$i}'] { min-width: (100% / $gridstack-columns) * $i; }
+        &[data-gs-max-width='#{$i}'] { max-width: (100% / $gridstack-columns) * $i; }
     }
 }
 ```
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -29,6 +29,7 @@ Change log
 - widget x and y are now ints (thanks [@DonnchaC](https://github.com/donnchac))
 - allow all droppable options (thanks [@vigor-vlad](https://github.com/vigor-vlad))
 - properly track mouse position in `getCellFromPixel` (thanks [@aletorrado](https://github.com/aletorrado))
+- remove instance of `!important` (thanks [@krilllind](https://github.com/krilllind))
 - scroll when moving widget up or down out of viewport ([#827](https://github.com/troolee/gridstack.js/issues/827))
 
 ## v0.3.0 (2017-04-21)
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1020,14 +1020,14 @@
         if (typeof maxHeight == 'undefined') {
             maxHeight = this._styles._max;
         }
-        if (this._styles._max !== 0 && maxHeight <= this._styles._max) { // Keep this._styles._max increasing
-            return ;
-        }
         this._initStyles();
         this._updateContainerHeight();
         if (!this.opts.cellHeight) { // The rest will be handled by CSS
             return ;
         }
+        if (this._styles._max !== 0 && maxHeight <= this._styles._max) { // Keep this._styles._max increasing
+            return ;
+        }
 
         if (!this.opts.verticalMargin || this.opts.cellHeightUnit === this.opts.verticalMarginUnit) {
             getHeight = function(nbRows, nbMargins) {
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -50,7 +50,7 @@ $animation_speed: .3s !default;
             right: $horizontal_padding / 2;
             bottom: 0;
             width: auto;
-            z-index: 0 !important;
+            z-index: 0;
             overflow-x: hidden;
             overflow-y: auto;
         }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ $animation_speed: .3s !default;`
`50`	`50`	`right: $horizontal_padding / 2;`
`51`	`51`	`bottom: 0;`
`52`	`52`	`width: auto;`
`53`		`- z-index: 0 !important;`
	`53`	`+ z-index: 0;`
`54`	`54`	`overflow-x: hidden;`
`55`	`55`	`overflow-y: auto;`
`56`	`56`	`}`