From 2d3f31df8bdcefdd17b5b6a77eac4c94c08aa38d Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Tue, 20 Feb 2018 19:29:13 +0100
Subject: [PATCH 1/3] Change local storage name for rustdoc because of
 conflicts with mdbook

---
 src/librustdoc/html/static/storage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index 0aa1065b3786a..d60e53ef72cca 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -30,7 +30,7 @@ function getCurrentValue(name) {
 
 function switchTheme(styleElem, mainStyleElem, newTheme) {
     styleElem.href = mainStyleElem.href.replace("rustdoc.css", newTheme + ".css");
-    updateLocalStorage('theme', newTheme);
+    updateLocalStorage('rustdoc-theme', newTheme);
 }
 
 switchTheme(currentTheme, mainTheme, getCurrentValue('theme') || 'main');

From 5b61b615f5701bea9482f27e1a9f5ae36df721a7 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Tue, 20 Feb 2018 20:11:58 +0100
Subject: [PATCH 2/3] Allow to not switch to a theme if it doesn't exist

---
 src/librustdoc/html/static/main.js    |  8 -------
 src/librustdoc/html/static/storage.js | 34 ++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index f688be89beebc..ba2e58eb47576 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -96,14 +96,6 @@
         }
     }
 
-    function onEach(arr, func) {
-        if (arr && arr.length > 0 && func) {
-            for (var i = 0; i < arr.length; i++) {
-                func(arr[i]);
-            }
-        }
-    }
-
     function isHidden(elem) {
         return (elem.offsetParent === null)
     }
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index d60e53ef72cca..f21dfc8af9298 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -13,6 +13,18 @@
 var currentTheme = document.getElementById("themeStyle");
 var mainTheme = document.getElementById("mainThemeStyle");
 
+var savedHref = [];
+
+function onEach(arr, func) {
+    if (arr && arr.length > 0 && func) {
+        for (var i = 0; i < arr.length; i++) {
+            if (func(arr[i]) === true) {
+                break;
+            }
+        }
+    }
+}
+
 function updateLocalStorage(name, value) {
     if (typeof(Storage) !== "undefined") {
         localStorage[name] = value;
@@ -29,8 +41,24 @@ function getCurrentValue(name) {
 }
 
 function switchTheme(styleElem, mainStyleElem, newTheme) {
-    styleElem.href = mainStyleElem.href.replace("rustdoc.css", newTheme + ".css");
-    updateLocalStorage('rustdoc-theme', newTheme);
+    var newHref = mainStyleElem.href.replace("rustdoc.css", newTheme + ".css");
+    var found = false;
+
+    if (savedHref.length === 0) {
+        onEach(document.getElementsByTagName("link"), function(el) {
+            savedHref.push(el.href);
+        });
+    }
+    onEach(savedHref, function(el) {
+        if (el === newHref) {
+            found = true;
+            return true;
+        }
+    });
+    if (found === true) {
+        styleElem.href = newHref;
+        updateLocalStorage('rustdoc-theme', newTheme);
+    }
 }
 
-switchTheme(currentTheme, mainTheme, getCurrentValue('theme') || 'main');
+switchTheme(currentTheme, mainTheme, getCurrentValue('rustdoc-theme') || 'main');

From 8d51c331c759210ba320c5662ab3ce3af5e0500b Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Tue, 20 Feb 2018 20:13:17 +0100
Subject: [PATCH 3/3] Remove theme button outline

---
 src/librustdoc/html/static/rustdoc.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index cd4f2cfa678e6..a6630902c9794 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -1189,6 +1189,10 @@ kbd {
 	top: 19px;
 }
 
+.theme-picker button {
+	outline: none;
+}
+
 #theme-picker {
 	padding: 4px;
 	width: 27px;