From 8ab89b5ed7ad295d2d53b0400743eab0fc3ac261 Mon Sep 17 00:00:00 2001
From: RJ Spiker <spiker.rj@gmail.com>
Date: Mon, 4 Nov 2019 13:11:13 -0700
Subject: [PATCH] feedback updates and some style cleanup

---
 website/source/assets/stylesheets/_docs.scss   |  1 -
 website/source/assets/stylesheets/_home.scss   | 11 +++++------
 website/source/assets/stylesheets/_inner.scss  | 18 +++---------------
 .../source/assets/stylesheets/_typography.scss | 14 ++------------
 website/source/layouts/community.erb           |  2 +-
 website/source/layouts/downloads.erb           |  2 +-
 website/source/layouts/inner.erb               |  2 +-
 7 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss
index ba96ea4f7..87fedc002 100644
--- a/website/source/assets/stylesheets/_docs.scss
+++ b/website/source/assets/stylesheets/_docs.scss
@@ -9,7 +9,6 @@
     li {
       a {
         color: $sidebar-link-color;
-        font-size: $sidebar-font-size;
         padding: 10px 0 10px 15px;
 
         &:before {
diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss
index 4811846a6..6ac08f2d8 100644
--- a/website/source/assets/stylesheets/_home.scss
+++ b/website/source/assets/stylesheets/_home.scss
@@ -22,7 +22,9 @@
         a {
           color: $home-header-link-color;
 
-          &:hover, &:focus, &:active {
+          &:hover,
+          &:focus,
+          &:active {
             background-color: transparent;
             color: $home-header-link-color-hover;
 
@@ -142,14 +144,11 @@
   }
 
   .terminal {
+    @extend .g-type-code;
     border: 1px solid $white;
     background-color: $black;
     box-sizing: border-box;
     color: $white;
-    font-family: $font-monospace;
-    font-size: 0.844rem;
-    font-weight: $font-weight-reg;
-    line-height: 1.926em;
     margin: 20px auto;
     padding: 10px 20px 20px 20px;
 
@@ -167,7 +166,7 @@
 
     span.circle {
       &:before {
-        content: '\25CF';
+        content: "\25CF";
         color: $white;
         margin: 0 0 0 -4px;
         padding: 0;
diff --git a/website/source/assets/stylesheets/_inner.scss b/website/source/assets/stylesheets/_inner.scss
index 5471c4d6c..5dd65b237 100644
--- a/website/source/assets/stylesheets/_inner.scss
+++ b/website/source/assets/stylesheets/_inner.scss
@@ -23,8 +23,7 @@
   p,
   li,
   .alert {
-    font-size: 1.063rem;
-    line-height: 1.647em;
+    @extend .g-type-long-body;
     margin: 0 0 $font-size-default;
   }
 
@@ -32,13 +31,6 @@
     margin-bottom: 0;
   }
 
-  pre,
-  code,
-  pre code,
-  tt {
-    line-height: 1.926em;
-  }
-
   pre {
     padding: 20px;
     margin: 0 0 $font-size-default;
@@ -92,14 +84,10 @@
   h3 > code,
   h4 > code,
   h5 > code,
-  h6 > code,
-  li code,
-  table code,
-  p code,
-  tt,
-  .alert code {
+  h6 > code {
     background-color: transparent;
     color: inherit;
+    font-size: 90%;
     padding: 0;
   }
 
diff --git a/website/source/assets/stylesheets/_typography.scss b/website/source/assets/stylesheets/_typography.scss
index 2c7be908b..cd8ef8752 100644
--- a/website/source/assets/stylesheets/_typography.scss
+++ b/website/source/assets/stylesheets/_typography.scss
@@ -11,21 +11,11 @@ h6 {
   -webkit-font-smoothing: antialiased;
 }
 
-p,
-li,
-.alert {
-  font-family: $font-body;
-  font-weight: $font-weight-reg;
-  letter-spacing: 0.01em;
-}
-
 pre,
 code,
 pre code,
 tt {
-  font-family: $font-monospace;
-  font-weight: $font-weight-reg;
-  font-size: 0.844rem;
+  @extend .g-type-code;
 }
 
 /* Display 1 */
@@ -289,5 +279,5 @@ tt {
   font-family: $font-monospace;
   font-weight: $font-weight-reg;
   font-size: 0.844rem;
-  line-height: 1.926em;
+  line-height: 1.63em;
 }
diff --git a/website/source/layouts/community.erb b/website/source/layouts/community.erb
index a5ab417c3..7287f1cbe 100644
--- a/website/source/layouts/community.erb
+++ b/website/source/layouts/community.erb
@@ -1,6 +1,6 @@
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
-    <div class="docs-sidebar hidden-print affix-top" role="complementary">
+    <div class="docs-sidebar g-type-body-small hidden-print affix-top" role="complementary">
       <ul class="nav docs-sidenav">
         <li<%= sidebar_current("community-index") %>>
           <a href="/community.html">Community</a>
diff --git a/website/source/layouts/downloads.erb b/website/source/layouts/downloads.erb
index e6a328f41..db573851d 100644
--- a/website/source/layouts/downloads.erb
+++ b/website/source/layouts/downloads.erb
@@ -1,6 +1,6 @@
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
-    <div class="docs-sidebar hidden-print affix-top" role="complementary">
+    <div class="docs-sidebar g-type-body-small hidden-print affix-top" role="complementary">
       <ul class="nav docs-sidenav">
         <li<%= sidebar_current("downloads-packer") %>>
           <a href="/downloads.html">Download Packer</a>
diff --git a/website/source/layouts/inner.erb b/website/source/layouts/inner.erb
index b1406f15f..0967a1273 100644
--- a/website/source/layouts/inner.erb
+++ b/website/source/layouts/inner.erb
@@ -1,7 +1,7 @@
 <% wrap_layout :layout do %>
 <div class="container">
   <div class="row">
-    <div id="docs-sidebar" class="col-sm-3 col-md-3 col-xs-12 hidden-print" role="complementary">
+    <div id="docs-sidebar" class="col-sm-3 col-md-3 col-xs-12 hidden-print g-type-body-small" role="complementary">
       <%= yield_content :sidebar %>
     </div>