Merge branch 'master' into max-galindo

Author: rjzupkoii

_sass/_sidebar.scss

@@ -10,17 +10,12 @@
   -webkit-transform: translate3d(0, 0 , 0);
           transform: translate3d(0, 0 , 0);
 
-  
-  
-
   @include clearfix();
   margin-bottom: 1em;
 
-  
-
-  @media screen and (min-width: 925px) {
+  @media screen and (min-width: $sidebar-min-width) {
     height: 100vh;
-    overflow-y: auto; // Scroll sidebar content
+    overflow-y: auto;               // Add scrollbar if the sidebar is too long
     position: fixed;
     padding-top: $masthead-height;
   }
@@ -37,6 +32,7 @@
   }
 
   @include breakpoint($x-large) {
+    max-width: $sidebar-link-max-width;
     padding-right: 0;
   }
 

_sass/_variables.scss

@@ -45,6 +45,12 @@ $type-size-8                : 0.625em;  // ~10px
 /* masthead properties */
 $masthead-height            : 50px;
 
+/* Sidebar properties */
+$sidebar-min-width          : 1024px;
+$sidebar-link-max-width     : 250px;
+
+
+
 /*
    Colors
    ========================================================================== */