Make theme respect html_logo and html_favicon options if they are set in conf.py

Change logo to display as image to better support non 40x40 files

Author: ascholerChemeketa

runestone/common/css/runestone-custom-sphinx-bootstrap.css

@@ -273,12 +273,13 @@ div.section {
 .brand-logo {
     float: left;
     display: block;
-    background-size: 40px 40px !important;
-    width: 40px;
-    height: 40px;
     margin-top: 4px;
 }
 
+.brand-logo img {
+    height: 40px;
+}
+
 .social-menu {
     width: 220px;
     padding: 10px 10px 15px 20px;

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -39,10 +39,11 @@
       </button>
 
       <div>
+        {% set logo = '_static/' + (logo if logo else 'img/logo_small.png') %}
         {% if minimal_outside_links != 'True' %}
-          <a class="brand-logo" style='background: transparent url("{{pathto('_static/img/logo_small.png', 1)}}") no-repeat 0px 0px;' href="/{{appname}}/default/user/login">&nbsp; </a>
+          <a class="brand-logo" href="/{{appname}}/default/user/login" aria-label="Login"><img src="{{pathto(logo, 1)}}" alt=""></a>
         {% else %}
-          <a class="brand-logo" style='background: transparent url("{{pathto('_static/img/logo_small.png', 1)}}") no-repeat 0px 0px;'>&nbsp;<span aria-label="logo" class="visuallyhidden">Runestone Logo</span> </a>
+          <div class="brand-logo"><img src="{{pathto(logo, 1)}}" alt=""></div>
         {% endif %}
         <a class="navbar-brand" href="{{ pathto(master_doc) }}" aria-label="index-page">
           {% if dynamic_pages == 'True' %}
@@ -220,7 +221,10 @@
 {% endmacro %}
 
 {%- block extrahead %}
+
+{% if not favicon %}
 <link rel="shortcut icon" href="/{{appname}}/static/favicon.ico" type="image/ico" />
+{% endif %}
 
 <script>
   eBookConfig = {};