[trafficcontrol] 04/39: Fixed favicon and logo not linked

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 4dc9664bfc61a99e7106a890b475dde872bebb6f
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Tue Sep 18 08:33:25 2018 -0600

    Fixed favicon and logo not linked
---
 docs/source/_static/theme_overrides.css |  4 ----
 docs/source/conf.py                     | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css
index 2d48fce..bcdc720 100644
--- a/docs/source/_static/theme_overrides.css
+++ b/docs/source/_static/theme_overrides.css
@@ -54,10 +54,6 @@
   background: #404040;
 }
 
-.wy-side-nav-search img {
-	width: 33% !important;
-}
-
 .section {
   margin-top: 20px;
 }
diff --git a/docs/source/conf.py b/docs/source/conf.py
index d49c6a3..fe3d6ba 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -115,6 +115,12 @@ html_static_path = ['_static']
 #
 # html_sidebars = {}
 
+# Sets the favicon for the HTML pages
+html_favicon="favicon.ico"
+
+# Sets the sidebar logo for HTML pages
+html_logo="../../misc/logos/Traffic-Control-Logo-FINAL-White-Text.png"
+
 
 # -- Options for HTMLHelp output ---------------------------------------------
 
@@ -171,3 +177,7 @@ texinfo_documents = [
 	 author, 'trafficcontrol', 'Traffic Control is an Open Source implementation of a Content Delivery Network.',
 	 'Miscellaneous'),
 ]
+
+# Hopefully this will cause tab expansion to use 4 spaces rather than the
+# (GNU-supported) default of 8.
+tab_width=4