From 61af61b5d8a8031b4a392ccc32aff2587fa85b4c Mon Sep 17 00:00:00 2001
From: Martin Taillefer <mtail@google.com>
Date: Tue, 9 May 2017 09:58:48 -0700
Subject: [PATCH] Fix a bunch of formatting on non-docs pages.

---
 _docs/reference/glossary.md   |  2 --
 _layouts/about.html           |  6 ++----
 _layouts/bugs.html            |  6 ++----
 _layouts/community.html       |  6 ++----
 _layouts/docs.html            |  3 ++-
 _layouts/faq.html             |  6 ++----
 _layouts/search-results.html  |  6 +++++-
 _layouts/troubleshooting.html |  6 ++----
 css/bugs.scss                 | 15 ---------------
 css/faq.scss                  |  4 ----
 css/troubleshooting.scss      | 11 +----------
 troubleshooting/index.md      |  2 ++
 12 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/_docs/reference/glossary.md b/_docs/reference/glossary.md
index 99fa55268d..5b2a0da13c 100644
--- a/_docs/reference/glossary.md
+++ b/_docs/reference/glossary.md
@@ -52,8 +52,6 @@ RDS Route Discovery Service -- See https://lyft.github.io/envoy/docs/configurati
 
 -->
 
-# Glossary
-
 - **Destination**.
 The remote upstream service to which the proxy/sidecar is
 talking to, on behalf of the source service. There can be one or more
diff --git a/_layouts/about.html b/_layouts/about.html
index a2bb834e92..9f5c255338 100644
--- a/_layouts/about.html
+++ b/_layouts/about.html
@@ -5,10 +5,8 @@ layout: default
 
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block ">
-      <div class="col-sm-7 {{page.type }}">
-        {{ content }}
-      </div>
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
     </div>
   </div>
 </div>
diff --git a/_layouts/bugs.html b/_layouts/bugs.html
index a2bb834e92..9f5c255338 100644
--- a/_layouts/bugs.html
+++ b/_layouts/bugs.html
@@ -5,10 +5,8 @@ layout: default
 
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block ">
-      <div class="col-sm-7 {{page.type }}">
-        {{ content }}
-      </div>
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
     </div>
   </div>
 </div>
diff --git a/_layouts/community.html b/_layouts/community.html
index a2bb834e92..9f5c255338 100644
--- a/_layouts/community.html
+++ b/_layouts/community.html
@@ -5,10 +5,8 @@ layout: default
 
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block ">
-      <div class="col-sm-7 {{page.type }}">
-        {{ content }}
-      </div>
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
     </div>
   </div>
 </div>
diff --git a/_layouts/docs.html b/_layouts/docs.html
index aa18205d28..4a945c2d24 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -2,9 +2,10 @@
 layout: default
 ---
 {% include home.html %}
+
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block ">
+    <div class="col-md-11 nofloat center-block">
       <div class="row">
           <div class="col-sm-3">
             {% include doc-side-nav.html %}
diff --git a/_layouts/faq.html b/_layouts/faq.html
index 557225079d..be75d7e522 100644
--- a/_layouts/faq.html
+++ b/_layouts/faq.html
@@ -3,10 +3,8 @@ layout: default
 ---
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block ">
-      <div class="col-sm-7 {{page.type }}">
-	    {{ content }}
-      </div>
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
     </div>
   </div>
 </div>
diff --git a/_layouts/search-results.html b/_layouts/search-results.html
index 4785f0e60f..4b6d7a0481 100644
--- a/_layouts/search-results.html
+++ b/_layouts/search-results.html
@@ -13,7 +13,11 @@ layout: default
 </style>
 
 <div class="container">
-  {{ content }}
+  <div class="row">
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
+    </div>
+  </div>
 </div>
 
 <script>
diff --git a/_layouts/troubleshooting.html b/_layouts/troubleshooting.html
index ea708148c6..9f5c255338 100644
--- a/_layouts/troubleshooting.html
+++ b/_layouts/troubleshooting.html
@@ -5,10 +5,8 @@ layout: default
 
 <div class="container">
   <div class="row">
-    <div class="col-md-11 nofloat center-block">
-      <div class="troubleshooting col-lg-9 col-md-10 col-sm-12">
-        {{ content }}
-      </div>
+    <div class="col-sm-12 col-md-10 col-lg-7 nofloat center-block {{page.type}}">
+      {{ content }}
     </div>
   </div>
 </div>
diff --git a/css/bugs.scss b/css/bugs.scss
index 633aeff2b1..982f5d51b7 100644
--- a/css/bugs.scss
+++ b/css/bugs.scss
@@ -3,19 +3,4 @@ sitemap_exclude: y
 ---
 @import "common";
 .bugs {
-    h1 {
-        color: $mainBrandColor;
-    }
-
-    p {
-        padding-left: 20px;
-    }
-
-    ul {
-        padding-left: 30px;
-    }
-
-    ul p {
-        padding-left: 0px;
-    }
 }
diff --git a/css/faq.scss b/css/faq.scss
index bb567965cb..3df5809818 100644
--- a/css/faq.scss
+++ b/css/faq.scss
@@ -3,10 +3,6 @@ sitemap_exclude: y
 ---
 @import "common";
 .faq {
-    h1 {
-        color: $mainBrandColor;
-    }
-
     h4 {
         font-size: 110%;
     }
diff --git a/css/troubleshooting.scss b/css/troubleshooting.scss
index 6b5dfe67f9..3dead2d9d7 100644
--- a/css/troubleshooting.scss
+++ b/css/troubleshooting.scss
@@ -2,14 +2,5 @@
 sitemap_exclude: y
 ---
 @import "common";
-.bugs {
-  margin: 0;
-
-  @media (max-width: $tablet) {
-    margin: 0;
-  }
-
-  .lead {
-    margin: 50px 0 40px 0;
-  }
+.troubleshooting {
 }
diff --git a/troubleshooting/index.md b/troubleshooting/index.md
index 875e4de148..105750e44d 100644
--- a/troubleshooting/index.md
+++ b/troubleshooting/index.md
@@ -6,5 +6,7 @@ type: markdown
 ---
 {% include home.html %}
 
+# Troubleshooting Guide
+
 Oh no! You have some problems? Let us help.