Fix merge conflicts

3 files changed, 62 insertions, 62 deletions

diff --git a/demo/src/sass/layout/core.scss b/demo/src/sass/layout/core.scss
index b9b2d4d5..3687b7d2 100644
--- a/demo/src/sass/layout/core.scss
+++ b/demo/src/sass/layout/core.scss
@@ -4,60 +4,60 @@
 
 html,
 body {
-    display: flex;
-    width: 100%;
+  display: flex;
+  width: 100%;
 }
 
 html {
-    background: $page-background;
-    background-attachment: fixed;
-    height: 100%;
+  background: $page-background;
+  background-attachment: fixed;
+  height: 100%;
 }
 
 body {
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-    min-height: 100%;
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  min-height: 100%;
 }
 
 .grid {
-    flex: 1;
-    overflow: auto;
+  flex: 1;
+  overflow: auto;
 }
 
 main {
-    margin: auto;
-    padding-bottom: 1px; // Collapsing margins
-    text-align: center;
+  margin: auto;
+  padding-bottom: 1px; // Collapsing margins
+  text-align: center;
 }
 
 aside {
-    align-items: center;
-    background: #fff;
-    display: flex;
-    flex-shrink: 0;
-    justify-content: center;
-    padding: $spacing-base;
-    position: relative;
-    text-align: center;
-    text-shadow: none;
-    width: 100%;
-
-    .icon {
-        fill: $color-twitter;
-        margin-right: ($spacing-base / 2);
-    }
-
-    p {
-        margin: 0;
-    }
-
-    a {
-        color: $color-twitter;
-
-        &.tab-focus {
-            @include tab-focus($color-twitter);
-        }
+  align-items: center;
+  background: #fff;
+  display: flex;
+  flex-shrink: 0;
+  justify-content: center;
+  padding: $spacing-base;
+  position: relative;
+  text-align: center;
+  text-shadow: none;
+  width: 100%;
+
+  .icon {
+    fill: $color-twitter;
+    margin-right: ($spacing-base / 2);
+  }
+
+  p {
+    margin: 0;
+  }
+
+  a {
+    color: $color-twitter;
+
+    &.tab-focus {
+      @include tab-focus($color-twitter);
     }
+  }
 }
diff --git a/demo/src/sass/layout/error.scss b/demo/src/sass/layout/error.scss
index 385ecbf3..7c625610 100644
--- a/demo/src/sass/layout/error.scss
+++ b/demo/src/sass/layout/error.scss
@@ -5,26 +5,26 @@
 // Error page
 html.error,
 .error body {
-    height: 100%;
+  height: 100%;
 }
 
 html.error {
-    background: $page-background;
-    background-attachment: fixed;
+  background: $page-background;
+  background-attachment: fixed;
 }
 
 .error body {
-    align-items: center;
-    display: flex;
-    width: 100%;
+  align-items: center;
+  display: flex;
+  width: 100%;
 }
 
 .error main {
-    padding: $spacing-base;
-    text-align: center;
-    width: 100%;
+  padding: $spacing-base;
+  text-align: center;
+  width: 100%;
 
-    p {
-        @include font-size($font-size-large);
-    }
+  p {
+    @include font-size($font-size-large);
+  }
 }
diff --git a/demo/src/sass/layout/grid.scss b/demo/src/sass/layout/grid.scss
index 40dd829e..fd3f8fdc 100644
--- a/demo/src/sass/layout/grid.scss
+++ b/demo/src/sass/layout/grid.scss
@@ -3,17 +3,17 @@
 // ==========================================================================
 
 .grid {
-    margin: 0 auto;
-    padding: $spacing-base;
+  margin: 0 auto;
+  padding: $spacing-base;
 
-    @media only screen and (min-width: $screen-md) {
-        align-items: center;
-        display: flex;
-        max-width: $container-max-width;
-        width: 100%;
+  @media only screen and (min-width: $screen-md) {
+    align-items: center;
+    display: flex;
+    max-width: $container-max-width;
+    width: 100%;
 
-        > * {
-            flex: 1;
-        }
+    > * {
+      flex: 1;
     }
+  }
 }