From 0caeec0451258215a5c1875dc8ddc3fc1af0d182 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 26 Jul 2022 21:36:58 +1000
Subject: [PATCH] More banner fixes (#332)

* More banner fixes

- Restore original banner (search box etc)
- Make version banner dismissable
- Better CSS styling

* Disable debug
---
 _includes/overrides/home.html                               | 2 +-
 _includes/overrides/main.html                               | 6 ++++++
 _includes/overrides/partials/header.html                    | 3 ---
 .../overrides/{banner.html => partials/version_banner.html} | 5 +++--
 docs/stylesheets/extra.css                                  | 6 ++++++
 mkdocs.yml                                                  | 2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 _includes/overrides/main.html
 delete mode 100644 _includes/overrides/partials/header.html
 rename _includes/overrides/{banner.html => partials/version_banner.html} (71%)

diff --git a/_includes/overrides/home.html b/_includes/overrides/home.html
index 2ea2565..fad0ce0 100644
--- a/_includes/overrides/home.html
+++ b/_includes/overrides/home.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "main.html" %}
 
 {% block tabs %}
 {{ super() }}
diff --git a/_includes/overrides/main.html b/_includes/overrides/main.html
new file mode 100644
index 0000000..9b3bb92
--- /dev/null
+++ b/_includes/overrides/main.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block header %}
+{% include "partials/version_banner.html" %}
+{% include "partials/header.html" %}
+{% endblock %}
diff --git a/_includes/overrides/partials/header.html b/_includes/overrides/partials/header.html
deleted file mode 100644
index d594137..0000000
--- a/_includes/overrides/partials/header.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% include "banner.html" %}
-
-{{ super }}
\ No newline at end of file
diff --git a/_includes/overrides/banner.html b/_includes/overrides/partials/version_banner.html
similarity index 71%
rename from _includes/overrides/banner.html
rename to _includes/overrides/partials/version_banner.html
index a475b24..6a9e978 100644
--- a/_includes/overrides/banner.html
+++ b/_includes/overrides/partials/version_banner.html
@@ -1,5 +1,5 @@
 {% if config.version_banner %}
-<div class='md-banner md-banner--warning'>
+<div class='alert alert-warning alert-dismissable alert-version' role='alert'>
     <div class='md-grid md-typeset'>
         <small>
         {% if config.readthedocs.version == 'latest' %}
@@ -9,6 +9,7 @@
         {% endif %}
         For <em>stable</em> release documentation, use the version selector located in the bottom right corner of this page.
         </small>
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     </div>
 </div>
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css
index 7455659..39c7ebe 100644
--- a/docs/stylesheets/extra.css
+++ b/docs/stylesheets/extra.css
@@ -128,4 +128,10 @@ div:nth-of-type(1) p {
 	background-color: #337ab7;
 	border-color: #2e6da4;
 	color: #fff;
+}
+
+.alert-version {
+	padding: 5px;
+	margin: 5px;
+	margin-bottom: 0px;
 }
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 4f7661c..8da99f0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,12 +34,12 @@ theme:
     - toc.autohide
 edit_uri: "" # Disable "Edit" button
 extra_css:
-  - stylesheets/extra.css
   - stylesheets/brands.css
   - stylesheets/regular.css
   - stylesheets/solid.css
   - stylesheets/bootstrap.css
   - stylesheets/splide.min.css
+  - stylesheets/extra.css
 extra_javascript:
   - javascripts/extra.js
   - javascripts/fontawesome.js