Merge branch 'master' into blendify/icons

type="text/javascript" is unnecessary and even discouraged by the
specification: “Authors should omit the type attribute instead of
redundantly setting it.”

https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type

It causes the validator to raise warnings, too.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

sphinx_rtd_theme/breadcrumbs.html

@@ -21,7 +21,7 @@
 <div role="navigation" aria-label="{{ _('Breadcrumbs') }}">
   <ul class="wy-breadcrumbs">
     {%- block breadcrumbs %}
-      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
+      <li><a href="{{ pathto(master_doc) }}" class="fa fa-home"></a> &raquo;</li>
         {%- for doc in parents %}
           <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
         {%- endfor %}

sphinx_rtd_theme/layout.html

@@ -57,12 +57,12 @@
   {%- if not embedded %}
   {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
     {%- if sphinx_version >= "1.8.0" -%}
-      <script type="text/javascript" id="documentation_options" data-url_root="{{ url_root }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
+      <script id="documentation_options" data-url_root="{{ url_root }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
       {%- for scriptfile in script_files %}
         {{ js_tag(scriptfile) }}
       {%- endfor %}
     {%- else %}
-      <script type="text/javascript">
+      <script>
           var DOCUMENTATION_OPTIONS = {
               URL_ROOT:'{{ url_root }}',
               VERSION:'{{ release|e }}',
@@ -74,10 +74,10 @@
           };
       </script>
       {%- for scriptfile in script_files %}
-        <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+        <script src="{{ pathto(scriptfile, 1) }}"></script>
       {%- endfor %}
     {%- endif %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
+    <script src="{{ pathto('_static/js/theme.js', 1) }}"></script>
 
     {#- OPENSEARCH #}
     {%- if use_opensearch %}
@@ -124,7 +124,7 @@
           {%- if logo and theme_logo_only %}
             <a href="{{ pathto(master_doc) }}">
           {%- else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
+            <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}
           {%- endif %}
 
           {%- if logo %}
@@ -209,7 +209,7 @@
   </div>
   {% include "versions.html" -%}
 
-  <script type="text/javascript">
+  <script>
       jQuery(function () {
           SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
       });

sphinx_rtd_theme/search.html

@@ -12,16 +12,16 @@
 {% set display_vcs_links = False %}
 {%- block scripts %}
     {{ super() }}
-    <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
-    <script type="text/javascript" src="{{ pathto('_static/language_data.js', 1) }}"></script>
+    <script src="{{ pathto('_static/searchtools.js', 1) }}"></script>
+    <script src="{{ pathto('_static/language_data.js', 1) }}"></script>
 {%- endblock %}
 {% block footer %}
-  <script type="text/javascript">
+  <script>
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
   </script>
   {# this is used when loading the search index using $.ajax fails,
      such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
+  <script id="searchindexloader"></script>
   {{ super() }}
 {% endblock %}
 {% block body %}

sphinx_rtd_theme/searchbox.html

@@ -1,22 +1,9 @@
-{#
-    basic/searchbox.html
-    ~~~~~~~~~~~~~~~~~~~~
-
-    Sphinx sidebar template: quick search box.
-
-    :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
-    :license: BSD, see https://github.com/sphinx-doc/sphinx/blob/master/LICENSE for details.
-
-    .. note::
-
-       This file is the same, except the "Go" button was removed and the label is an aria-label.
-#}
-{%- if pagename != "search" and builder != "singlehtml" %}
-<div id="searchbox" role="search">
-  <div class="searchformwrapper">
-    <form class="search" action="{{ pathto('search') }}" method="get">
-      <input aria-label="{{ _('Search docs') }}" type="text" name="q" id="main-search" placeholder="{{ _('Search docs') }}"/>
-    </form>
-  </div>
+{%- if 'singlehtml' not in builder %}
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
+    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
 </div>
 {%- endif %}

src/sass/_theme_badge.sass

@@ -25,8 +25,6 @@
       color: $section-background-color
     .fa-book
       float: left
-    .icon-book
-      float: left
     &.rst-out-of-date
       background-color: $red
       color: $white
@@ -66,9 +64,6 @@
     border: none
     max-width: $nav-desktop-width
     max-height: 90%
-    .icon-book
-      float: none
-      line-height: 30px
     .fa-book
       float: none
       line-height: 30px
@@ -76,8 +71,6 @@
       text-align: right
       .fa-book
         float: left
-      .icon-book
-        float: left
     > .rst-current-version
       width: auto
       height: 30px

src/sass/_theme_badge_fa.sass

@@ -40,29 +40,14 @@ ul.fas
 .fa-book:before
   content: "\f02d"
 
-.icon-book:before
-  content: "\f02d"
-
 .fa-caret-down:before
   content: "\f0d7"
 
-.icon-caret-down:before
-  content: "\f0d7"
-
 .fa-caret-up:before
   content: "\f0d8"
 
-.icon-caret-up:before
-  content: "\f0d8"
-
 .fa-caret-left:before
   content: "\f0d9"
 
-.icon-caret-left:before
-  content: "\f0d9"
-
 .fa-caret-right:before
   content: "\f0da"
-
-.icon-caret-right:before
-  content: "\f0da"

src/sass/_theme_font_awesome_compatibility.sass

@@ -1,24 +0,0 @@
-.icon
-  @extend .fa
-.icon-home
-  @extend .fa-home
-.icon-search
-  @extend .fa-search
-.icon-book
-  @extend .fa-book
-.icon-caret-down
-  @extend .fa-caret-down
-.icon-github
-  @extend .fa-github
-.icon-bitbucket
-  @extend .fa-bitbucket
-.icon-gitlab
-  @extend .fa-gitlab
-.icon-fire
-  @extend .fa-fire
-.icon-circle-arrow-right
-  @extend .fa-arrow-circle-right
-.icon-circle-arrow-left
-  @extend .fa-arrow-circle-left
-.icon-link
-  @extend .fa-link

src/sass/_theme_layout.sass

@@ -225,7 +225,7 @@ html
       border-radius: 0
       max-width: 100%  // shrink on mobile, if appropriate
       background: rgba(0, 0, 0, 0)  // make hover background of parent show up properly
-    &.icon
+    &.fa
       img.logo
         margin-top: 0.85em  // space it away from the title text
   > div.version

src/sass/theme.sass

@@ -46,5 +46,4 @@
 @import theme_badge
 @import theme_rst
 @import theme_mathjax
-@import theme_font_awesome_compatibility
 @import theme_font_local