Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions demo/css/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ body.offsetopened {
padding-right: 0;
width: 100%;
overflow-x: hidden; }
.ms-grid.fluid .ms-row {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid.fluid .ms-row > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid.fixed .ms-row {
margin-left: -2px;
margin-right: -2px; }
Expand Down Expand Up @@ -144,6 +154,16 @@ body.offsetopened {
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid .ms-row.zero-margin {
margin-left: 0;
margin-right: 0; }
Expand Down
2 changes: 1 addition & 1 deletion dist/css/min/mscom-grid-ltr.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/min/mscom-grid-mixed.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/min/mscom-grid-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/min/mscom-grid.min.css

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions dist/css/mscom-grid-ltr.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
padding-right: 0;
width: 100%;
overflow-x: hidden; }
.ms-grid.fluid .ms-row {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid.fluid .ms-row > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid.fixed .ms-row {
margin-left: -2px;
margin-right: -2px; }
Expand Down Expand Up @@ -82,6 +92,16 @@
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid .ms-row.zero-margin {
margin-left: 0;
margin-right: 0; }
Expand Down
20 changes: 20 additions & 0 deletions dist/css/mscom-grid-mixed.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
padding-right: 0;
width: 100%;
overflow-x: hidden; }
.ms-grid.fluid .ms-row {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid.fluid .ms-row > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid.fixed .ms-row {
margin-left: -2px;
margin-right: -2px; }
Expand Down Expand Up @@ -82,6 +92,16 @@
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid .ms-row.zero-margin {
margin-left: 0;
margin-right: 0; }
Expand Down
20 changes: 20 additions & 0 deletions dist/css/mscom-grid-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
padding-right: 0;
width: 100%;
overflow-x: hidden; }
.ms-grid.fluid .ms-row {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid.fluid .ms-row > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid.fixed .ms-row {
margin-left: -2px;
margin-right: -2px; }
Expand Down Expand Up @@ -82,6 +92,16 @@
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid .ms-row.zero-margin {
margin-left: 0;
margin-right: 0; }
Expand Down
20 changes: 20 additions & 0 deletions dist/css/mscom-grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
padding-right: 0;
width: 100%;
overflow-x: hidden; }
.ms-grid.fluid .ms-row {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid.fluid .ms-row > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid.fixed .ms-row {
margin-left: -2px;
margin-right: -2px; }
Expand Down Expand Up @@ -82,6 +92,16 @@
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid {
margin-left: -1em;
margin-right: -1em;
margin-left: -1vw;
margin-right: -1vw; }
.ms-grid .ms-row.fluid > [class*="col-"] {
padding-left: 1em;
padding-right: 1em;
padding-left: 1vw;
padding-right: 1vw; }
.ms-grid .ms-row.zero-margin {
margin-left: 0;
margin-right: 0; }
Expand Down
1 change: 1 addition & 0 deletions src/sass/_config.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$max-grid-width: 1600px !default;
$fluid-margin: 1em, 1vw;
$fixed-standard: 2px !default;
$fixed-small-margin: 2px !default; //4px fixed margin for start of small fixed option which steps up, 4px, 12px, 24px
$fixed-large-margin: 4px !default; //8px fixed margin for start of large fixed option which steps up, 8px, 24px, 48px
Expand Down
18 changes: 13 additions & 5 deletions src/sass/_grid-helpers.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
@mixin row($padding) {
.#{$grid-prefix}row {
margin-left: -$padding;
margin-right: -$padding;
@each $val in $padding {
margin-left: -$val;
margin-right: -$val;
}

& > [class*="col-"] {
padding-left: $padding;
padding-right: $padding;
@each $val in $padding {
padding-left: $val;
padding-right: $val;
}
}
}
}
Expand All @@ -16,7 +20,11 @@
padding-right: 0;
width: 100%;
overflow-x: hidden;
}
}

&.fluid {
@include row($fluid-margin);
}

&.fixed {
@include row($fixed-standard);
Expand Down
16 changes: 12 additions & 4 deletions src/sass/_row-helpers.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
@mixin row($padding) {
margin-left: -$padding;
margin-right: -$padding;
@each $val in $padding {
margin-left: -$val;
margin-right: -$val;
}

& > [class*="col-"] {
padding-left: $padding;
padding-right: $padding;
@each $val in $padding {
padding-left: $val;
padding-right: $val;
}
}
}

Expand All @@ -17,6 +21,10 @@
margin-left: -1vw;
margin-right: -1vw;

&.fluid {
@include row($fluid-margin);
}

&.zero-margin {
@include row(0);
}
Expand Down