From 95eed69bccf5f0c71129bad274729f81a8e689ed Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 16 Mar 2015 18:16:21 -0400
Subject: [PATCH] Fixes #1931, adds in page overflowX, nested grid rule, fixes
 several additional grid issues with align

---
 src/definitions/collections/grid.less | 208 +++++++++++++-------------
 src/definitions/globals/site.less     |   1 +
 2 files changed, 104 insertions(+), 105 deletions(-)

diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index bdd5e0a3b..7a1f520c0 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -127,7 +127,12 @@
     Loose Coupling
 --------------------*/
 
-/* Collapse Margin */
+/* Top level grid doesn't use negative margin */
+body > .ui.grid {
+  margin: 0em;
+}
+
+/* Collapse Margin on Consecutive Grid */
 .ui.grid > .ui.grid:first-child {
   margin-top: 0em;
 }
@@ -135,12 +140,21 @@
   margin-bottom: 0em;
 }
 
-/* Place Divider */
+/* Segment inside Aligned Grid */
+.ui.grid .aligned.row > .column,
+.ui.aligned.grid .column > .segment:not(.compact) {
+  width: 100%;
+}
+
+/* Align Dividers with Gutter */
 .ui.grid .row + .ui.divider {
   margin: (@rowSpacing / 2) (@gutterWidth / 2);
 }
+.ui.grid .column + .ui.vertical.divider {
+  height: ~"calc(50% - "(@rowSpacing/2)~")";
+}
 
-/* Remove border on last horizontal segment */
+/* Remove Border on Last Horizontal Segment */
 .ui.grid > .row > .column:last-child > .horizontal.segment,
 .ui.grid > .column:last-child > .horizontal.segment {
   box-shadow: none;
@@ -1166,100 +1180,49 @@
   box-shadow: none;
 }
 
-/*----------------------
-  Horizontally Centered
------------------------*/
-
-/* Left Aligned */
-.ui[class*="left aligned"].grid,
-.ui[class*="left aligned"].grid > .row > .column,
-.ui[class*="left aligned"].grid > .column,
-.ui.grid [class*="left aligned"].column,
-.ui.grid > [class*="left aligned"].row > .column {
-  text-align: left;
-  align-items: flex-start !important;
-}
-.ui.grid [class*="left aligned"].column{
-  text-align: left !important;
-}
-
-/* Center Aligned */
-.ui[class*="center aligned"].grid,
-.ui[class*="center aligned"].grid > .row > .column,
-.ui[class*="center aligned"].grid > .column,
-.ui.grid > [class*="center aligned"].row > .column {
-  text-align: center;
-  align-items: center !important;
-}
-.ui.grid [class*="center aligned"].column{
-  text-align: center !important;
-}
-
-/* Right Aligned */
-.ui[class*="right aligned"].grid,
-.ui[class*="right aligned"].grid > .row > .column,
-.ui[class*="right aligned"].grid > .column,
-.ui.grid > [class*="right aligned"].row > .column {
-  text-align: right;
-  align-items: flex-end !important;
-}
-.ui.grid [class*="right aligned"].column{
-  text-align: right !important;
-}
-
-/* Justified */
-.ui.justified.grid,
-.ui.justified.grid > .row > .column,
-.ui.justified.grid > .column,
-.ui.grid .justified.column,
-.ui.grid > .justified.row > .column {
-  text-align: justify;
-  hyphens: auto;
-}
-.ui.grid .justified.column {
-  text-align: justify !important;
-  hyphens: auto !important;
-}
-
 /*----------------------
    Vertically Aligned
 -----------------------*/
 
 /* Top Aligned */
-.ui[class*="top aligned"].grid > .row > .column,
+.ui[class*="top aligned"].grid .column,
 .ui.grid > [class*="top aligned"].row > .column,
 .ui.grid > [class*="top aligned"].column:not(.row),
 .ui.grid > .row > [class*="top aligned"].column {
-  vertical-align: top;
   display: inline-flex !important;
   flex-direction: column;
+  vertical-align: top;
+  align-items: flex-start;
   justify-content: flex-start !important;
 }
 
 /* Middle Aligned */
-.ui[class*="middle aligned"].grid > .row > .column,
+.ui[class*="middle aligned"].grid .column,
 .ui.grid > [class*="middle aligned"].row > .column,
 .ui.grid > [class*="middle aligned"].column:not(.row),
 .ui.grid > .row > [class*="middle aligned"].column {
   vertical-align: middle;
-  display: inline-flex !important;
   flex-direction: column;
+  align-items: flex-start;
+  display: inline-flex !important;
   justify-content: center !important;
 }
 
 /* Bottom Aligned */
-.ui[class*="bottom aligned"].grid > .row > .column,
+.ui[class*="bottom aligned"].grid .column,
 .ui.grid > [class*="bottom aligned"].row > .column,
 .ui.grid > [class*="bottom aligned"].column:not(.row),
 .ui.grid > .row > [class*="bottom aligned"].column {
-  vertical-align: bottom;
   display: inline-flex !important;
   flex-direction: column;
+  align-items: flex-start;
+  vertical-align: bottom;
   justify-content: flex-end !important;
 }
 
 /* Stretched */
 .ui.stretched.grid > .row > .column,
+.ui.stretched.grid > .column,
 .ui.grid > .stretched.row > .column,
 .ui.grid > .stretched.column:not(.row),
 .ui.grid > .row > .stretched.column {
@@ -1274,6 +1237,51 @@
   flex-grow: 1;
 }
 
+/*----------------------
+  Horizontally Centered
+-----------------------*/
+
+/* Left Aligned */
+.ui[class*="left aligned"].grid .column,
+.ui.grid > [class*="left aligned"].row > .column,
+.ui.grid > [class*="left aligned"].column:not(.row),
+.ui.grid > .row > [class*="left aligned"].column {
+  text-align: left;
+  align-items: flex-start !important;
+}
+
+/* Center Aligned */
+.ui[class*="center aligned"].grid .column,
+.ui.grid > [class*="center aligned"].row > .column,
+.ui.grid > [class*="center aligned"].column:not(.row),
+.ui.grid > .row > [class*="center aligned"].column {
+  text-align: center;
+  align-items: center !important;
+}
+
+/* Right Aligned */
+.ui[class*="right aligned"].grid .column,
+.ui.grid > [class*="right aligned"].row > .column,
+.ui.grid > [class*="right aligned"].column:not(.row),
+.ui.grid > .row > [class*="right aligned"].column {
+  text-align: right;
+  align-items: flex-end !important;
+}
+
+/* Justified */
+.ui.justified.grid,
+.ui.justified.grid > .row > .column,
+.ui.justified.grid > .column,
+.ui.grid .justified.column,
+.ui.grid > .justified.row > .column {
+  text-align: justify;
+  hyphens: auto;
+}
+.ui.grid .justified.column {
+  text-align: justify !important;
+  hyphens: auto !important;
+}
+
 /*----------------------
          Colored
 -----------------------*/
@@ -1408,89 +1416,79 @@
 }
 
 /*----------------------
-      Equal Width
+      Equal Height
 -----------------------*/
 
-.ui[class*="equal width"].grid {
+.ui[class*="equal height"].grid {
   display: table;
   table-layout: fixed;
 }
-.ui[class*="equal width"].grid > .row,
-.ui.grid > [class*="equal width"].row  {
+.ui[class*="equal height"].grid > .row,
+.ui.grid > [class*="equal height"].row  {
   display: table;
   table-layout: fixed;
   width: 100% !important;
 }
-.ui[class*="equal width"].grid > .column:not(.row),
-.ui[class*="equal width"].grid > .row > .column,
-.ui.grid > [class*="equal width"].row > .column {
+.ui[class*="equal height"].grid > .column:not(.row),
+.ui[class*="equal height"].grid > .row > .column,
+.ui.grid > [class*="equal height"].row > .column {
   display: table-cell;
 }
 
 /* Flexbox (Experimental / Overrides Where Supported) */
-.ui[class*="equal width"].grid,
-.ui[class*="equal width"].grid > .row,
-.ui.grid > [class*="equal width"].row  {
+.ui[class*="equal height"].grid,
+.ui[class*="equal height"].grid > .row,
+.ui.grid > [class*="equal height"].row {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
 }
-.ui[class*="equal width"].grid > .column:not(.row),
-.ui[class*="equal width"].grid > .row > .column,
-.ui.grid > [class*="equal width"].row > .column {
+.ui[class*="equal height"].grid > .column:not(.row),
+.ui[class*="equal height"].grid > .row > .column,
+.ui.grid > [class*="equal height"].row > .column {
   display: inline-block;
-  flex-grow: 1;
-}
-
-.ui[class*="equal width"].grid > .wide.column,
-.ui[class*="equal width"].grid > .row > .wide.column,
-.ui.grid > [class*="equal width"].row > .wide.column {
   flex-grow: 0;
 }
 
-
 /*----------------------
-  Equal Height Columns
+      Equal Width
 -----------------------*/
 
-.ui[class*="equal height"].grid {
+.ui[class*="equal width"].grid {
   display: table;
   table-layout: fixed;
 }
-.ui[class*="equal height"].grid > .row,
-.ui.grid > [class*="equal height"].row  {
+.ui[class*="equal width"].grid > .row,
+.ui.grid > [class*="equal width"].row  {
   display: table;
   table-layout: fixed;
   width: 100% !important;
 }
-.ui[class*="equal height"].grid > .column:not(.row),
-.ui[class*="equal height"].grid > .row > .column,
-.ui.grid > [class*="equal height"].row > .column {
+.ui[class*="equal width"].grid > .column:not(.row),
+.ui[class*="equal width"].grid > .row > .column,
+.ui.grid > [class*="equal width"].row > .column {
   display: table-cell;
 }
 
 /* Flexbox (Experimental / Overrides Where Supported) */
-.ui[class*="equal height"].grid,
-.ui[class*="equal height"].grid > .row,
-.ui.grid > [class*="equal height"].row {
+.ui[class*="equal width"].grid,
+.ui[class*="equal width"].grid > .row,
+.ui.grid > [class*="equal width"].row  {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
 }
-.ui[class*="equal height"].grid > .column:not(.row),
-.ui[class*="equal height"].grid > .row > .column,
-.ui.grid > [class*="equal height"].row > .column {
+.ui[class*="equal width"].grid > .column:not(.row),
+.ui[class*="equal width"].grid > .row > .column,
+.ui.grid > [class*="equal width"].row > .column {
   display: inline-block;
-  flex-grow: 0;
+  flex-grow: 1;
 }
 
-/* Middle Aligned */
-.ui[class*="equal height"][class*="middle aligned"].grid,
-.ui[class*="equal height"][class*="middle aligned"].grid > .row > .column,
-.ui[class*="equal height"][class*="middle aligned"].grid > .column,
-.ui.grid > [class*="equal height"][class*="middle aligned"].row > .column {
-  display: inline-flex;
-  align-items: center !important;
+.ui[class*="equal width"].grid > .wide.column,
+.ui[class*="equal width"].grid > .row > .wide.column,
+.ui.grid > [class*="equal width"].row > .wide.column {
+  flex-grow: 0;
 }
 
 
diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less
index 1dcf7d0b7..5ef009003 100755
--- a/src/definitions/globals/site.less
+++ b/src/definitions/globals/site.less
@@ -37,6 +37,7 @@ html {
 body {
   margin: 0px;
   padding: 0px;
+  overflow-x: @pageOverflowX;
   min-width: @pageMinWidth;
   background: @pageBackground;
   font-family: @pageFont;