Merge pull request #121 from mesosphere/develop

Promote to master

.gitignore

@@ -6,3 +6,4 @@
 /docs/dist
 /docs/_site
 npm-debug.log
+package-lock.json

docs/_assets/styles/layout/navigation.less

@@ -437,19 +437,19 @@
 
 // Margin Left
 
-@sidebar-menu-item-margin-left: -@pod-margin-left;
-@sidebar-menu-item-margin-left-screen-small: -@pod-margin-left-screen-small;
-@sidebar-menu-item-margin-left-screen-medium: -@pod-margin-left-screen-medium;
-@sidebar-menu-item-margin-left-screen-large: -@pod-margin-left-screen-large;
-@sidebar-menu-item-margin-left-screen-jumbo: -@pod-margin-left-screen-jumbo;
+@sidebar-menu-item-margin-left: -@pod-padding-left;
+@sidebar-menu-item-margin-left-screen-small: -@pod-padding-left-screen-small;
+@sidebar-menu-item-margin-left-screen-medium: -@pod-padding-left-screen-medium;
+@sidebar-menu-item-margin-left-screen-large: -@pod-padding-left-screen-large;
+@sidebar-menu-item-margin-left-screen-jumbo: -@pod-padding-left-screen-jumbo;
 
 // Margin Right
 
-@sidebar-menu-item-margin-right: -@pod-margin-right;
-@sidebar-menu-item-margin-right-screen-small: -@pod-margin-right-screen-small;
-@sidebar-menu-item-margin-right-screen-medium: -@pod-margin-right-screen-medium;
-@sidebar-menu-item-margin-right-screen-large: -@pod-margin-right-screen-large;
-@sidebar-menu-item-margin-right-screen-jumbo: -@pod-margin-right-screen-jumbo;
+@sidebar-menu-item-margin-right: -@pod-padding-right;
+@sidebar-menu-item-margin-right-screen-small: -@pod-padding-right-screen-small;
+@sidebar-menu-item-margin-right-screen-medium: -@pod-padding-right-screen-medium;
+@sidebar-menu-item-margin-right-screen-large: -@pod-padding-right-screen-large;
+@sidebar-menu-item-margin-right-screen-jumbo: -@pod-padding-right-screen-jumbo;
 
 // Padding Top
 

docs/_pages/layout/grid/index.md

@@ -8,7 +8,7 @@ page-header:
 toc: true
 ---
 
-<div class="panel pod pod-short-bottom pod-short-top flush-horizontal">
+<div class="panel flush-horizontal">
 
   <div class="panel-cell">
 
@@ -245,7 +245,7 @@ The column width and position can change based on both screen resolution and cla
 
 Offset columns, shifting them to the right, by using the `.column-offset-*` classes -- replacing the `*` with the number of columns to shift by. For example, `.column-offset-3` will move the column over by 3 columns. Use direction modifiers, in the format `.column-small-offset-*`, to offset at the designated screen size breakpoint.
 
-<div class="panel pod pod-short-bottom pod-short-top flush-horizontal" markdown="1">
+<div class="panel flush-horizontal" markdown="1">
 
   <div class="panel-cell">
 
@@ -349,7 +349,7 @@ Offset columns, shifting them to the right, by using the `.column-offset-*` clas
 
 The CNVS Grid System supports an infinite number of nested grids. This means, in a given `.column-*` you can add a child `.row`, effectively establishing a new grid. Be careful to always wrap your nested columns in a new `.row`.
 
-<div class="panel pod pod-short-bottom pod-short-top flush-horizontal"  markdown="1">
+<div class="panel flush-horizontal"  markdown="1">
 
   <div class="panel-cell">
 
@@ -448,7 +448,7 @@ Size modifiers are available if you wish to have a grid with narrower or wider g
 | `.row-wide`   | Increase the gutter width between columns.   |
 {: .table }
 
-<div class="panel pod pod-short-bottom pod-short-top flush-horizontal">
+<div class="panel flush-horizontal">
 
   <div class="panel-cell">