From 1558cc98cd6ce9be9d302c43ad91391e2ecf31db Mon Sep 17 00:00:00 2001
From: Wildkins <john.wildkins@gmail.com>
Date: Sun, 6 Dec 2020 18:17:13 -0500
Subject: [PATCH] Fix scrollbars not appearing on some UIs, debug icon
 appearing for non-devs, close handling (#10735)

* Fix scrollbars not appearing on some UIs, port VueUI close handling fix

* actually fix closing
---
 code/modules/client/client procs.dm | 10 ++++++++--
 code/modules/vueui/ui.dm            |  7 ++-----
 vueui/src/assets/global.scss        |  7 +++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index f25c0be5d30..bfaf8cff39c 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -29,6 +29,14 @@
 			..()
 		return
 
+	if(href_list["vueuiclose"])
+		var/datum/vueui/ui = locate(href_list["src"])
+		if(istype(ui))
+			ui.close()
+		else // UI is an orphan, close it directly.
+			src << browse(null, "window=vueui[href_list["src"]]")
+		return
+
 	// asset_cache
 	if(href_list["asset_cache_confirm_arrival"])
 		//to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.")
@@ -749,5 +757,3 @@
 				M.set_dir(get_dir(M, over_object))
 				gun.Fire(get_turf(over_object), mob, params, (get_dist(over_object, mob) <= 1), FALSE)
 	CHECK_TICK
-
-
diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm
index e5e561f011a..6f54f7f1be0 100644
--- a/code/modules/vueui/ui.dm
+++ b/code/modules/vueui/ui.dm
@@ -251,9 +251,6 @@ main ui datum.
   */
 /datum/vueui/Topic(href, href_list)
 	. = update_status(FALSE)
-	if(href_list["vueuiclose"])
-		close()
-		return
 	if(status < STATUS_INTERACTIVE || user != usr)
 		return
 	if(href_list["vueuiforceresource"])
@@ -388,10 +385,10 @@ main ui datum.
   * @return themes class - text
   */
 /datum/vueui/proc/get_theme_class()
-	return SStheming.get_html_theme_class(user)
+	return "vueui " + SStheming.get_html_theme_class(user)
 
 /datum/vueui/modularcomputer
 	header = "modular-computer"
 
 /datum/vueui/modularcomputer/get_theme_class()
-	return "theme-nano dark-theme"
+	return "vueui theme-nano dark-theme"
diff --git a/vueui/src/assets/global.scss b/vueui/src/assets/global.scss
index f7bea3a0d30..46c683abbb4 100644
--- a/vueui/src/assets/global.scss
+++ b/vueui/src/assets/global.scss
@@ -17,11 +17,14 @@ body {
     margin: 0px;
     padding: 8px;
     font-family: Arial, Helvetica, sans-serif;
-    overflow-y: hidden;
     overflow-x: auto;
     min-width: 240px;
 }
 
+body.vueui {
+    overflow-y: hidden;
+}
+
 #content {
     height: calc(100vh - 36px);
     &.mcomputer {
@@ -160,7 +163,7 @@ a, .button, button, input[type=submit], input[type=button], input[type=reset], i
 }
 
 .hidden {
-    display: none;
+    display: none !important;
 }
 
 .notice {