Merge branch 'main' into bugs/WP-774

TACC · Jan 10, 2025 · 284ef65 · 284ef65
2 parents 13ea1dd + 8582dfa
commit 284ef65
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/.../components/DataFiles/DataFilesModals/DataFilesModalTables/DataFilesModalListingTable.jsx b/.../components/DataFiles/DataFilesModals/DataFilesModalTables/DataFilesModalListingTable.jsx
@@ -120,7 +120,7 @@ const DataFilesModalButtonCell = ({
       <span>
         <Button
           type="primary"
-          className="float-right data-files-btn"
+          className="float-right"
           disabled={disabled}
           onClick={onClick}
         >

diff --git a/client/src/components/DataFiles/DataFilesProjectMembers/_cells/ProjectRoleSelector.jsx b/client/src/components/DataFiles/DataFilesProjectMembers/_cells/ProjectRoleSelector.jsx
@@ -75,7 +75,6 @@ const ProjectRoleSelector = ({ projectId, username }) => {
       {data.role !== selectedRole && !isFetching && (
         <Button
           type="primary"
-          className="data-files-btn"
           onClick={() =>
             setProjectRole({ oldRole: data.role, newRole: selectedRole })
           }

diff --git a/client/src/components/DataFiles/DataFilesSidebar/DataFilesSidebar.jsx b/client/src/components/DataFiles/DataFilesSidebar/DataFilesSidebar.jsx
@@ -69,11 +69,7 @@ const DataFilesAddButton = ({ readOnly }) => {
   return (
     <>
       <Dropdown isOpen={dropdownOpen} toggle={toggleDropdown}>
-        <DropdownToggle
-          color="primary"
-          id="data-files-add"
-          className="data-files-btn"
-        >
+        <DropdownToggle color="primary" id="data-files-add">
           + Add
         </DropdownToggle>
         <DropdownMenu>

diff --git a/client/src/components/DataFiles/DataFilesSidebar/DataFilesSidebar.scss b/client/src/components/DataFiles/DataFilesSidebar/DataFilesSidebar.scss
@@ -1,15 +1,5 @@
 @import '../../../styles/components/dropdown-menu.css';
 
-.data-files-btn {
-  background-color: var(--global-color-accent--normal);
-  border-color: var(--global-color-accent--normal);
-  border-radius: 0;
-}
-
-.data-files-btn-cancel {
-  border-radius: 0;
-}
-
 #data-files-add {
   width: 100%;
 }