Merge branch 'main' into dependabot/pip/server/django-4.2.18

TACC · Jan 22, 2025 · d9a355a · d9a355a
2 parents 132c1ce + c8e4f93
commit d9a355a
Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -98,7 +98,7 @@
     "stylelint-config-standard": "^25.0.0",
     "timekeeper": "^2.3.1",
     "typescript": "5.5",
-    "vite": "^5.4.8",
+    "vite": "^5.4.14",
     "vitest": "^2.1.1",
     "weak-key": "^1.0.1"
   }

diff --git a/...nents/Allocations/AllocationsModals/AllocationsTeamViewModal/AllocationsTeamViewModal.jsx b/...nents/Allocations/AllocationsModals/AllocationsTeamViewModal/AllocationsTeamViewModal.jsx
@@ -94,14 +94,23 @@ const AllocationsTeamViewModal = ({ isOpen, toggle }) => {
 
   return (
     <Modal isOpen={isOpen} toggle={toggle} size="lg" onClosed={resetCard}>
-      <ModalHeader className="has-MuiTabs" toggle={toggle} charCode="&#xe912;">
+      <ModalHeader
+        className="pe-3 has-MuiTabs"
+        toggle={toggle}
+        charCode="&#xe912;"
+      >
         <Tabs
           style={{ marginBottom: '-8px' }}
           value={selectedTab}
           onChange={handleTabChange}
         >
           <Tab style={{ width: '160px', color: '#222222' }} label="View Team" />
-          {isManager && <Tab label="Manage Team" />}
+          {isManager && (
+            <Tab
+              style={{ width: '160px', color: '#222222' }}
+              label="Manage Team"
+            />
+          )}
         </Tabs>
       </ModalHeader>
       <ModalBody className={selectedTab === 0 ? 'd-flex p-0' : 'pb-0'}>

diff --git a/client/src/components/_common/TextCopyField/TextCopyField.jsx b/client/src/components/_common/TextCopyField/TextCopyField.jsx
@@ -53,7 +53,7 @@ const TextCopyField = ({ value, placeholder, displayField }) => {
             data-testid="textarea"
             readOnly
           />
-          <div className={styles['button-container']}>
+          <div className="input-group-text ms-auto p-0 my-2 bg-transparent border-0">
             <CopyToClipboard text={value}>
               <Button {...clipboardProps}>Copy</Button>
             </CopyToClipboard>