From 07d450ec1472d67e6837bbd17049f44362ec7895 Mon Sep 17 00:00:00 2001 From: otu Date: Tue, 24 Aug 2021 20:13:35 +0300 Subject: [PATCH 1/3] Modified document body to adjust left margin according to toggling on/off of side bar in docs. --- src/librustdoc/html/static/js/source-script.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/librustdoc/html/static/js/source-script.js b/src/librustdoc/html/static/js/source-script.js index 4d9a59f836b9e..3fa89c595f23f 100644 --- a/src/librustdoc/html/static/js/source-script.js +++ b/src/librustdoc/html/static/js/source-script.js @@ -82,11 +82,13 @@ function toggleSidebar() { if (child.innerText === ">") { sidebar.style.left = ""; this.style.left = ""; + document.body.style.left = '300px'; child.innerText = "<"; updateLocalStorage("rustdoc-source-sidebar-show", "true"); } else { sidebar.style.left = "-300px"; this.style.left = "0"; + document.body.style.left = ''; child.innerText = ">"; updateLocalStorage("rustdoc-source-sidebar-show", "false"); } @@ -104,9 +106,11 @@ function createSidebarToggle() { inner2.style.paddingTop = "3px"; if (getCurrentValue("rustdoc-source-sidebar-show") === "true") { inner2.innerText = "<"; + document.body.style.left ='300px'; } else { inner2.innerText = ">"; sidebarToggle.style.left = "0"; + document.body.style.left =''; } inner1.appendChild(inner2); From 99627681592e1c2c984fecc94b821d53a03fdfef Mon Sep 17 00:00:00 2001 From: otu Date: Wed, 25 Aug 2021 00:35:51 +0300 Subject: [PATCH 2/3] Added transition to side bar toggle --- src/librustdoc/html/static/js/source-script.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/librustdoc/html/static/js/source-script.js b/src/librustdoc/html/static/js/source-script.js index 3fa89c595f23f..a3e687d81137d 100644 --- a/src/librustdoc/html/static/js/source-script.js +++ b/src/librustdoc/html/static/js/source-script.js @@ -78,18 +78,23 @@ function createDirEntry(elem, parent, fullPath, currentFile, hasFoundFile) { function toggleSidebar() { var sidebar = document.getElementById("source-sidebar"); + var logo = document.getElementsByClassName("sidebar")[0]; + document.body.style.transition = "left 0.5s ease 0s"; + logo.style.transition = "left 0.5s ease 0s"; var child = this.children[0].children[0]; if (child.innerText === ">") { - sidebar.style.left = ""; + sidebar.style.left = "0px"; this.style.left = ""; - document.body.style.left = '300px'; child.innerText = "<"; + logo.style.left = "300px"; + document.body.style.left = "300px"; updateLocalStorage("rustdoc-source-sidebar-show", "true"); } else { sidebar.style.left = "-300px"; this.style.left = "0"; - document.body.style.left = ''; child.innerText = ">"; + logo.style.left = "0px"; + document.body.style.left = "0px"; updateLocalStorage("rustdoc-source-sidebar-show", "false"); } } From 95007aa9f22010c0b20b5a9337b45fcc65460def Mon Sep 17 00:00:00 2001 From: otu Date: Wed, 25 Aug 2021 20:20:23 +0300 Subject: [PATCH 3/3] fixed bug with search --- src/librustdoc/html/static/js/main.js | 10 ++++++++++ src/librustdoc/html/static/js/source-script.js | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js index 1eebd39256459..48711260b54ec 100644 --- a/src/librustdoc/html/static/js/main.js +++ b/src/librustdoc/html/static/js/main.js @@ -190,6 +190,11 @@ function hideThemeButtonState() { if (search === null || typeof search === 'undefined') { search = searchState.outputElement(); } + if (getCurrentValue("rustdoc-source-sidebar-show") === "true"){ + var logo = document.getElementsByClassName("sidebar")[0]; + document.body.style.left = "0px"; + logo.style.left = "0px"; + } addClass(main, "hidden"); removeClass(search, "hidden"); searchState.mouseMovedAfterSearch = false; @@ -199,6 +204,11 @@ function hideThemeButtonState() { if (search === null || typeof search === 'undefined') { search = searchState.outputElement(); } + if (getCurrentValue("rustdoc-source-sidebar-show") === "true"){ + var logo = document.getElementsByClassName("sidebar")[0]; + document.body.style.left = "300px"; + logo.style.left = "300px"; + } addClass(search, "hidden"); removeClass(main, "hidden"); document.title = searchState.titleBeforeSearch; diff --git a/src/librustdoc/html/static/js/source-script.js b/src/librustdoc/html/static/js/source-script.js index a3e687d81137d..554dd719579f4 100644 --- a/src/librustdoc/html/static/js/source-script.js +++ b/src/librustdoc/html/static/js/source-script.js @@ -83,7 +83,7 @@ function toggleSidebar() { logo.style.transition = "left 0.5s ease 0s"; var child = this.children[0].children[0]; if (child.innerText === ">") { - sidebar.style.left = "0px"; + sidebar.style.left = ""; this.style.left = ""; child.innerText = "<"; logo.style.left = "300px"; @@ -104,6 +104,7 @@ function createSidebarToggle() { sidebarToggle.id = "sidebar-toggle"; sidebarToggle.onclick = toggleSidebar; + var logo = document.getElementsByClassName("sidebar")[0]; var inner1 = document.createElement("div"); inner1.style.position = "relative"; @@ -111,11 +112,13 @@ function createSidebarToggle() { inner2.style.paddingTop = "3px"; if (getCurrentValue("rustdoc-source-sidebar-show") === "true") { inner2.innerText = "<"; + logo.style.left = "300px"; document.body.style.left ='300px'; } else { inner2.innerText = ">"; sidebarToggle.style.left = "0"; - document.body.style.left =''; + logo.style.left = "0px"; + document.body.style.left ="0px"; } inner1.appendChild(inner2);