sidebar.scss: move sidebar styling out of layout.scss

Make sidebar.scss the single-source-of-truth and put all the styling
related to the sidebar in sidebar.scss.

Author: To1ne

assets/sass/layout.scss

@@ -26,37 +26,6 @@ body {
   overflow: visible;
 }
 
-aside {
-  width: 218px;
-  margin-bottom: 35px;
-  position: sticky;
-  top: 0;
-  max-height: 100vh;
-  overflow-y: auto;
-  /* align with the top of the content */
-  padding-top: 46px;
-}
-
-#toc {
-  border: 1px solid var(--main-border);
-  padding: .5em;
-  margin-top: 1rem;
-  border-top: 1px solid var(--main-border);
-  background: var(--sidebar-toc-bg-color);
-  margin-right: 0.5rem;
-}
-
-#toc ul {
-  list-style-type: square;
-}
-
-#toc li {
-  /* use margin instead of line height for spacing because sometimes the
-     headings wrap onto multiple lines */
-  line-height: 1.2em;
-  margin: 6px 0;
-}
-
 #content {
   width: 702px;
 }
@@ -157,47 +126,6 @@ header {
   }
 }
 
-// Navigation
-aside nav ul {
-  margin-bottom: 1.4em;
-  margin-left: 0;
-  font-size: 16px;
-  font-weight: bold;
-  list-style: none;
-
-  li {
-    margin-bottom: 0.5em;
-
-    a {
-      color: var(--nav-link-color);
-
-      &.active, &:hover {
-        color: var(--orange);
-      }
-    }
-
-    ul {
-      display: none;
-      margin-top: 0.3em;
-      margin-left: 20px;
-      font-size: 13px;
-      font-weight: normal;
-
-      li {
-        margin-bottom: 0;
-
-        a.active {
-          font-weight: bold;
-        }
-      }
-
-      &.expanded {
-        display: block;
-      }
-    }
-  }
-}
-
 .bottom-nav {
   @extend .callout;
   @include clearfix;

assets/sass/sidebar.scss

@@ -9,6 +9,37 @@ hr.sidebar {
   @include background-image-2x($baseurl + "images/sidebar-divider", 218px, 12px);
 }
 
+aside {
+  width: 218px;
+  margin-bottom: 35px;
+  position: sticky;
+  top: 0;
+  max-height: 100vh;
+  overflow-y: auto;
+  /* align with the top of the content */
+  padding-top: 46px;
+}
+
+#toc {
+  border: 1px solid var(--main-border);
+  padding: .5em;
+  margin-top: 1rem;
+  border-top: 1px solid var(--main-border);
+  background: var(--sidebar-toc-bg-color);
+  margin-right: 0.5rem;
+}
+
+#toc ul {
+  list-style-type: square;
+}
+
+#toc li {
+  /* use margin instead of line height for spacing because sometimes the
+     headings wrap onto multiple lines */
+  line-height: 1.2em;
+  margin: 6px 0;
+}
+
 aside.sidebar {
   font-size: 13px !important;
   line-height: $base-line-height * 0.75;
@@ -29,6 +60,48 @@ aside.sidebar {
     }
   }
 }
+
+// Navigation
+aside nav ul {
+  margin-bottom: 1.4em;
+  margin-left: 0;
+  font-size: 16px;
+  font-weight: bold;
+  list-style: none;
+
+  li {
+    margin-bottom: 0.5em;
+
+    a {
+      color: var(--nav-link-color);
+
+      &.active, &:hover {
+        color: var(--orange);
+      }
+    }
+
+    ul {
+      display: none;
+      margin-top: 0.3em;
+      margin-left: 20px;
+      font-size: 13px;
+      font-weight: normal;
+
+      li {
+        margin-bottom: 0;
+
+        a.active {
+          font-weight: bold;
+        }
+      }
+
+      &.expanded {
+        display: block;
+      }
+    }
+  }
+}
+
 // Floating sidebar button for tablet and smaller screens
 aside.sidebar.active {
     @include responsive-sidebar-ui;