Merge pull request #14365 from dearmochi/medical-tgui-fixes

Fix Medical Records virus modal overflow and Body Scanner Eject inconsistency

tgui/packages/tgui/interfaces/BodyScanner.js

@@ -113,16 +113,16 @@ const BodyScannerMainOccupant = (props, context) => {
       title="Occupant"
       buttons={(
         <Fragment>
-          <Button
-            icon="user-slash"
-            onClick={() => act('ejectify')}>
-            Eject
-          </Button>
           <Button
             icon="print"
             onClick={() => act('print_p')}>
             Print Report
           </Button>
+          <Button
+            icon="user-slash"
+            onClick={() => act('ejectify')}>
+            Eject
+          </Button>
         </Fragment>
       )}>
       <LabeledList>

tgui/packages/tgui/interfaces/common/ComplexModal.js

@@ -187,7 +187,8 @@ export const ComplexModal = (props, context) => {
       maxWidth={props.maxWidth || (window.innerWidth / 2 + "px")}
       maxHeight={props.maxHeight || (window.innerHeight / 2 + "px")}
       onEnter={modalOnEnter}
-      mx="auto">
+      mx="auto"
+      overflowY="auto">
       <Box display="inline">
         {text}
       </Box>

tgui/packages/tgui/styles/components/Modal.scss

@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use '../base.scss';
 
 $color-background: base.$color-bg !default;
@@ -6,4 +7,26 @@ $color-background: base.$color-bg !default;
   background-color: $color-background;
   max-width: calc(100% - 1rem);
   padding: 1rem;
+
+  scrollbar-base-color: color.scale(
+    base.$color-bg,
+    $lightness: -25%);
+  scrollbar-face-color: color.scale(
+    base.$color-bg,
+    $lightness: 10%);
+  scrollbar-3dlight-color: color.scale(
+    base.$color-bg,
+    $lightness: 0%);
+  scrollbar-highlight-color: color.scale(
+    base.$color-bg,
+    $lightness: 0%);
+  scrollbar-track-color: color.scale(
+    base.$color-bg,
+    $lightness: -25%);
+  scrollbar-arrow-color: color.scale(
+    base.$color-bg,
+    $lightness: 50%);
+  scrollbar-shadow-color: color.scale(
+    base.$color-bg,
+    $lightness: 10%);
 }