Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes numCols calculation to allow for full container width responsive implementations #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes numCols calculation to allow for full container width responsive implementations #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
.DS_Store

node_modules
2 changes: 1 addition & 1 deletion dist/magic-grid.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ MagicGrid.prototype.colWidth = function colWidth () {
MagicGrid.prototype.setup = function setup () {
var width = this.container.getBoundingClientRect().width;
var colWidth = this.colWidth();
var numCols = Math.floor(width/colWidth) || 1;
var numCols = Math.floor((width + this.gutter)/colWidth) || 1;
var cols = [];

if (this.maxColumns && numCols > this.maxColumns) {
Expand Down
2 changes: 1 addition & 1 deletion dist/magic-grid.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ MagicGrid.prototype.colWidth = function colWidth () {
MagicGrid.prototype.setup = function setup () {
var width = this.container.getBoundingClientRect().width;
var colWidth = this.colWidth();
var numCols = Math.floor(width/colWidth) || 1;
var numCols = Math.floor((width + this.gutter)/colWidth) || 1;
var cols = [];

if (this.maxColumns && numCols > this.maxColumns) {
Expand Down
2 changes: 1 addition & 1 deletion dist/magic-grid.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class MagicGrid {
setup () {
let width = this.container.getBoundingClientRect().width;
let colWidth = this.colWidth();
let numCols = Math.floor(width/colWidth) || 1;
let numCols = Math.floor((width + this.gutter)/colWidth) || 1;
let cols = [];

if (this.maxColumns && numCols > this.maxColumns) {
Expand Down
74 changes: 74 additions & 0 deletions test/grid-responsive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<!DOCTYPE html>
<html lang="en">
<head>

<meta charset="UTF-8">
<title>Magic Grid</title>

<style>
.container div {
width: 1200px;
height: 500px;
background-color: antiquewhite;
display: flex;
justify-content: center;
align-items: center;
border-radius: 8px;
}

/* 2 column */
.container .item {
background-color: wheat;

/* (100% - (1 gutter * gutter size)) / numCols */
width: calc((100% - 25px) / 2);
}

/* 4 column */
@media only screen and (min-width: 768px) {
.container .item {
/* (100% - (3 gutters * gutter size)) / numCols */
width: calc((100% - (3 * 25px)) / 4);
}
}

.container .item1 { height: 200px; }
.container .item4 { height: 800px; }
.container .item6 { height: 600px; }
.container .item11 { height: 400px; }
</style>

</head>
<body>

<div class="container">
<div class="item item1">1</div>
<div class="item item2">2</div>
<div class="item item3">3</div>
<div class="item item4">4</div>
<div class="item item5">5</div>
<div class="item item6">6</div>
<div class="item item7">7</div>
<div class="item item8">8</div>
<div class="item item9">9</div>
<div class="item item10">10</div>
<div class="item item11">11</div>
<div class="item item12">12</div>
<div class="item item13">13</div>
</div>

<script src="../dist/magic-grid.min.js"></script>
<script>
let magicGrid = new MagicGrid({
container: '.container',
animate: true,
gutter: 25,
static: true,
useMin: true
});

magicGrid.listen();
</script>

</body>
</html>