Merge branch 'master' into light-mode-theme

styles/_external-links.scss

@@ -45,6 +45,15 @@
   }
 }
 
+.q-wrapper .external-link {
+  &::after {
+    background-position: left 0 bottom 7px;
+  }
+  &:hover::after {
+    background-position: left 4px bottom 11px;
+  }
+}
+
 .li-links {
   position: relative;
   border-bottom: 2px solid $gray-600;

styles/_pages.scss

@@ -307,13 +307,126 @@
 
 
 // FAQ Page
-#faq-background {
+#faq-background {//old
   position: absolute;
   left: 0;
   right: 0;
   width: 100%;
 }
 
+.page-faq {
+  background-image: url(../img/backgrounds/faq-bg.svg);
+  background-repeat: no-repeat;
+  background-position-x: left -20vw;
+  background-position-y: top;
+  @include media-breakpoint-up(md) {
+    background-position-x: left;
+    background-size: contain;
+
+    .dactyl-tree-nav {
+      background: linear-gradient(90deg, $body-bg 0%, $body-bg 75%, transparent 100%);
+      padding-left: 1rem;
+      margin-left: -1rem;
+    }
+  }
+
+  .content {
+    @include media-breakpoint-up(lg) {
+      max-width: 704px;
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+
+  .content h6:first-of-type {
+    color: $green-500;
+    margin-bottom: 1rem;
+    margin-top: 2.5rem;
+    font-size: 1.25rem;
+    line-height: 26px;
+    text-align: center;
+
+    .hover_anchor {
+      display: none;
+    }
+
+    @include media-breakpoint-up(lg) {
+      margin-top: 6.5rem;
+    }
+  }
+  .content h1:first-of-type {
+    font-size: 2.625rem;
+    line-height: 1.2;
+    margin-top: 0;
+    margin-bottom: 5rem;
+    text-align: center;
+
+    .hover_anchor {
+      display: none;
+    }
+
+    @include media-breakpoint-up(lg) {
+      font-size: 3.875rem;
+      margin-bottom: 13rem;
+    }
+  }
+
+  h2 {
+    // These divide up sections of questions.
+    margin-top: 13rem;
+    font-size: 2rem;
+    line-height: 2.375rem;
+    text-align: center;
+    font-weight: 700;
+  }
+
+  .q-wrapper {
+    background: $gray-800;
+    border-radius: $border-radius-sm;
+    padding: 2rem;
+    padding-right: 3rem; // don't overlap chevron
+    margin-bottom: 1.5rem;
+    width: 100%;
+
+    > a {
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+        color: $white;
+      }
+    }
+
+    p a {
+      text-decoration: none;
+      font-weight: 600;
+      color: $link-hover-color;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+
+    h4 {
+      position: relative;
+      font-size: 1.25rem;
+      line-height: 1.625rem;
+      margin-top: 0;
+
+      @include media-breakpoint-down(md) {
+        font-size: 1rem;
+        line-height: 1.5rem;
+      }
+    }
+
+    .chevron {
+      position: absolute;
+      top: 80px; // Compensate for anchor-fix ::before size
+      right: -1rem;
+    }
+  }
+}
+
 .page-docs-index {
   &::before {
     background-image: url(../img/backgrounds/bg-docs.png);

styles/_top-nav.scss

@@ -121,8 +121,7 @@
     }
 
     .col-for-popular-pages,
-    .col-for-人気ページ,
-    .col-for-questions {
+    .col-for-人気ページ {
       background-color: $gray-800;
     }
 
@@ -235,7 +234,7 @@
           grid-column: 2;
         }
         .col-for-about {
-          grid-row: 1;
+          grid-row: 1 / 3;
           grid-column: 3;
         }
 
@@ -255,16 +254,10 @@
         .col-for-popular-pages,
         .col-for-人気ページ {
           grid-column: 3;
-          grid-row: 1 / 3;
+          grid-row: 1 / 4;
           margin: -40px -40px -40px 0;
           padding: 40px;
         }
-        .col-for-questions {
-          grid-column: 3;
-          grid-row: 3;
-          margin:  0 -40px -40px 0px;
-          padding: 0  40px  40px  40px;
-        }
       }
 
       &.smaller-dropdown {
@@ -421,7 +414,8 @@
             margin: -1px;
             padding-top: 33px;
           }
-          .col-for-questions {
+          .col-for-questions,
+          .col-for-質問 {
             grid-column: 1 / 3;
             grid-row: 5;
             margin: -1px;