Merge pull request #1983 from HSLdevcom/develop

Update master

Author: Joe Niemi

src/components/overlays/ModalContainer.tsx

@@ -16,7 +16,9 @@ const ModalContainer = observer((props: IModalProps) => {
 
     return (
         <div className={s.modalContainer} onClick={onExteriorDivClick} data-cy='modalContainer'>
-            <div className={s.wrapper}>{props.children}</div>
+            <div className={s.wrapper}>
+                <div className={s.modalInnerWrapper}>{props.children}</div>
+            </div>
         </div>
     );
 });

src/components/overlays/confirm.scss

@@ -3,13 +3,17 @@
 .confirmView {
     display: flex;
     flex-direction: column;
-    max-width: 600px;
+    position: relative;
+    height: 100%;
+    max-height: 100%;
+    width: 100%;
 
     .content {
         display: flex;
         justify-content: center;
         flex-direction: column;
         align-items: center;
+        height: 100%;
     }
 
     .padding {

src/components/overlays/modalContainer.scss

@@ -10,16 +10,26 @@
     z-index: 9999;
     width: 100%;
     height: 100%;
+    max-height: 100%;
     background-color: rgba(0, 0, 0, 0.4);
 
     .wrapper {
-        position: fixed;
         position: fixed;
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
         background-color: $backgroundlightGrey;
         box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 3px 14px rgba(0, 0, 0, 0.4);
         border-radius: 7px;
+        max-width: 50%;
+        max-height: 90%;
+        overflow-y: auto;
+
+        .modalInnerWrapper {
+            display: flex;
+            position: relative;
+            height: 100%;
+            max-height: 100%;
+        }
     }
 }

src/components/overlays/savePrompt.scss

@@ -39,8 +39,6 @@ $savePromptContentPadding: 5px 15px 5px 15px;
     }
 
     .savePromptContent {
-        max-height: 450px;
-        overflow-y: auto;
         padding: $savePromptContentPadding;
         font-size: $smallFontSize;
 

src/components/shared/RouteActiveSchedules.tsx

@@ -128,6 +128,7 @@ class RouteActiveSchedules extends React.Component<IRouteActiveSchedulesProps> {
             return isCurrentDateWithinTimeSpan(schedule.startDate, schedule.endDate);
         });
         let currentSchedule: ISchedule | null = null;
+
         const futureSchedules: ISchedule[] = _.cloneDeep(activeSchedules);
         if (currentScheduleIndex >= 0) {
             currentSchedule = activeSchedules[currentScheduleIndex];

src/components/sidebar/routeListView/RoutePathConfirm.tsx

@@ -16,7 +16,7 @@ interface IRoutePathConfirmProps {
 const RoutePathConfirm = inject()(
     observer((props: IRoutePathConfirmProps) => {
         return (
-            <div>
+            <div className={s.routePathConfirm}>
                 <SavePrompt savePromptSections={props.savePromptSections} />
                 <div className={s.routeActiveSchedulesWrapper}>
                     <RouteActiveSchedules

src/components/sidebar/routeListView/routePathConfirm.scss

@@ -6,3 +6,7 @@
     padding: 10px;
     width: routeListViewStyle.$sidebarWidth;
 }
+
+.routePathConfirm {
+    height: 100%;
+}