Merged in r2-2620-main-develop-10-23 (pull request #6556)

R2-2620: Merging main to develop 10.23.23
primeroIMS · Oct 23, 2023 · 3bd87e6 · 3bd87e6
2 parents 8f9cc40 + 6424469
commit 3bd87e6
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 164 deletions.
diff --git a/app/javascript/components/insights-sub-report/container.unit.test.js b/app/javascript/components/insights-sub-report/container.unit.test.js
diff --git a/app/javascript/components/nav/component.jsx b/app/javascript/components/nav/component.jsx
@@ -116,12 +116,16 @@ const Nav = () => {
           <Divider />
         </Hidden>
       </div>
-      <NetworkIndicator />
+      <div className={css.navNetworkIndicator}>
+        <NetworkIndicator />
+      </div>
       <List className={css.navList}>{permittedMenuEntries(APPLICATION_NAV(permissions, userId))}</List>
       <div className={css.navAgencies}>
         <AgencyLogo />
       </div>
-      <TranslationsToggle />
+      <div className={css.navTranslationsToggle}>
+        <TranslationsToggle />
+      </div>
     </>
   );
 

diff --git a/app/javascript/components/nav/styles.css b/app/javascript/components/nav/styles.css
@@ -158,10 +158,26 @@
 
 @media (min-width:960px) and (max-width:1279.95px) {
   .drawerPaper, .drawerPaper-demo {
-    width: 3.8em;
+    width: 4.1em;
     overflow-x: hidden;
   }
 
+  .drawerPaper::-webkit-scrollbar,
+  .drawerPaper-demo::-webkit-scrollbar {
+    width: 0.4em
+  }
+
+  .drawerPaper::-webkit-scrollbar-track,
+  .drawerPaper-demo::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.00);
+  }
+
+  .drawerPaper::-webkit-scrollbar-thumb,
+  .drawerPaper-demo::-webkit-scrollbar-thumb {
+    background-color: grey;
+    outline: 1px solid grey;
+  }
+
   .listIcon {
     min-width: 5.5em;
   }
@@ -170,3 +186,42 @@
     display: none;
   }
 }
+
+@media (max-width:1279.95px),
+  only screen and (pointer: coarse) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 7px 0 8px;
+      padding: 4px 8px 4px 6px;
+    }
+  }
+  .navTranslationsToggle {
+    & button {
+      padding-left: 8px;
+    }
+  }
+}
+
+@media only screen and (pointer: fine) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 3px 0 5px;
+      padding: 4px 8px 4px 5px;
+    }
+  }
+}
+
+@media (pointer: fine) and (max-width:1279.95px) {
+  .navNetworkIndicator {
+    & div {
+      margin: 0 10px 0 10px;
+      padding: 4px 8px 4px 6px;
+    }
+  }
+  .navTranslationsToggle {
+    & button {
+      padding-left: 8px;
+    }
+  }
+}
+
diff --git a/buildspec.yml b/buildspec.yml
@@ -14,6 +14,7 @@ env:
     SECRET_VARS_release_2_4: 'PrimeroCicdSecretrelease-2-4'
     SECRET_VARS_release_2_5: 'PrimeroCicdSecretrelease-2-5'
     SECRET_VARS_release_2_6: 'PrimeroCicdSecretrelease-2-6'
+    SECRET_VARS_release_2_7: 'PrimeroCicdSecretrelease-2-7'
 
 phases:
   pre_build: