Merge pull request gridstack#2298 from adumesny/master

adumesny · web-flow · commit 83b0bc4ffe95 · 2023-04-30T17:15:53.000-07:00
more CSS tweaks
diff --git a/README.md b/README.md
@@ -250,7 +250,7 @@ Better yet, here is a SASS code snippet, you can use sites like [sassmeister.com
 ```sass
 $columns: 12;
 @function fixed($float) {
-  @return calc(round($float * 1000) / 1000);
+  @return calc(round($float * 100) / 100); // total 4 digits being %
 }
 .grid-stack-#{$columns} > .grid-stack-item {
 
diff --git a/src/gridstack-extra.scss b/src/gridstack-extra.scss
@@ -6,19 +6,16 @@ $gridstack-columns-start: 2 !default;
 $gridstack-columns: 11 !default;
 
 @function fixed($float) {
-  @return calc(round($float * 1000) / 1000);
+  @return calc(round($float * 100) / 100); // total 4 digits being %
 }
 
 @mixin grid-stack-items($columns) {
-  .grid-stack-#{$columns} {
+  .grid-stack-#{$columns} > .grid-stack-item {
+    min-width: fixed(calc(100% / $columns));
 
-    > .grid-stack-item {
-      min-width: fixed(calc(100% / $columns));
-
-      @for $i from 1 through $columns - 1 {
-        &[gs-x='#{$i}'] { left: fixed(calc(100% / $columns) * $i); }
-        &[gs-w='#{$i+1}'] { width: fixed(calc(100% / $columns) * ($i+1)); }
-      }
+    @for $i from 1 through $columns - 1 {
+      &[gs-x='#{$i}'] { left: fixed(calc(100% / $columns) * $i); }
+      &[gs-w='#{$i+1}'] { width: fixed(calc(100% / $columns) * ($i+1)); }
     }
   }
 }
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -7,7 +7,7 @@ $columns: 12 !default;
 $animation_speed: .3s !default;
 
 @function fixed($float) {
-  @return calc(round($float * 1000) / 1000);
+  @return calc(round($float * 100) / 100); // total 4 digits being %
 }
 
 @mixin vendor($property, $value...){

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ Better yet, here is a SASS code snippet, you can use sites like [sassmeister.com`
`250`	`250`	```sass
`251`	`251`	`$columns: 12;`
`252`	`252`	`@function fixed($float) {`
`253`		`- @return calc(round($float * 1000) / 1000);`
	`253`	`+ @return calc(round($float * 100) / 100); // total 4 digits being %`
`254`	`254`	`}`
`255`	`255`	`.grid-stack-#{$columns} > .grid-stack-item {`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,16 @@ $gridstack-columns-start: 2 !default;`
`6`	`6`	`$gridstack-columns: 11 !default;`
`7`	`7`
`8`	`8`	`@function fixed($float) {`
`9`		`- @return calc(round($float * 1000) / 1000);`
	`9`	`+ @return calc(round($float * 100) / 100); // total 4 digits being %`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`@mixin grid-stack-items($columns) {`
`13`		`- .grid-stack-#{$columns} {`
	`13`	`+ .grid-stack-#{$columns} > .grid-stack-item {`
	`14`	`+ min-width: fixed(calc(100% / $columns));`
`14`	`15`
`15`		`- > .grid-stack-item {`
`16`		`- min-width: fixed(calc(100% / $columns));`
`17`		`-`
`18`		`- @for $i from 1 through $columns - 1 {`
`19`		`- &[gs-x='#{$i}'] { left: fixed(calc(100% / $columns) * $i); }`
`20`		`- &[gs-w='#{$i+1}'] { width: fixed(calc(100% / $columns) * ($i+1)); }`
`21`		`- }`
	`16`	`+ @for $i from 1 through $columns - 1 {`
	`17`	`+ &[gs-x='#{$i}'] { left: fixed(calc(100% / $columns) * $i); }`
	`18`	`+ &[gs-w='#{$i+1}'] { width: fixed(calc(100% / $columns) * ($i+1)); }`
`22`	`19`	`}`
`23`	`20`	`}`
`24`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ $columns: 12 !default;`
`7`	`7`	`$animation_speed: .3s !default;`
`8`	`8`
`9`	`9`	`@function fixed($float) {`
`10`		`- @return calc(round($float * 1000) / 1000);`
	`10`	`+ @return calc(round($float * 100) / 100); // total 4 digits being %`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@mixin vendor($property, $value...){`