Merge branch 'feature/grid'

Cyber-Duck · Jun 12, 2021 · 4cc3d21 · 4cc3d21
2 parents b703afd + efbdac5
commit 4cc3d21
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 2 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/css/style.css.map b/css/style.css.map
diff --git a/scss/grid/_base.scss b/scss/grid/_base.scss
@@ -28,7 +28,7 @@
 @include mixins.respond(md-up) {
     .grid {
         &.grid-reverse {
-            @for $i from 1 through grid.$md-max-spans {
+            @for $i from 1 through grid.$lg-max-spans {
                 & > *:nth-child(#{$i}) {
                     order: ((grid.$md-max-spans + 1) - $i);
                 }

diff --git a/scss/grid/_lg.scss b/scss/grid/_lg.scss
@@ -49,5 +49,9 @@
         &.lg-sidebar-left {
             grid-template-columns: 1fr 3fr;
         }
+
+        .span {
+            max-width: grid.$grid-width;
+        }
     }
 }
diff --git a/scss/grid/_md.scss b/scss/grid/_md.scss
@@ -48,5 +48,9 @@
         &.md-sidebar-left {
             grid-template-columns: 1fr 3fr;
         }
+
+        .span {
+            max-width: grid.$md-grid-width;
+        }
     }
 }
diff --git a/scss/grid/_sm.scss b/scss/grid/_sm.scss
@@ -32,5 +32,9 @@
                 grid-template-columns: repeat(#{$i}, 1fr);
             }
         }
+
+        .span {
+            max-width: grid.$sm-grid-width;
+        }
     }
 }
diff --git a/scss/grid/_xl.scss b/scss/grid/_xl.scss
@@ -26,5 +26,9 @@
         &.grid-wide {
             width: grid.$xl-grid-wide-width;
         }
+
+        .span {
+            max-width: grid.$xl-grid-width;
+        }
     }
 }