Merge branch 'feat/vadc_sprint21' into fix/vadc-1422

uc-cdis · Oct 30, 2024 · 1ce9903 · 1ce9903
2 parents cd87c5e + 6112f50
commit 1ce9903
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 57 deletions.
diff --git a/src/Analysis/Analysis.jsx b/src/Analysis/Analysis.jsx
@@ -7,6 +7,7 @@ import AppCard from './AppCard';
 import TeamProjectHeader from './SharedUtils/TeamProject/TeamProjectHeader/TeamProjectHeader';
 import CheckForTeamProjectApplication from './SharedUtils/TeamProject/Utils/CheckForTeamProjectApplication';
 import './Analysis.less';
+import './SharedUtils/AccessibilityUtils/AccessibilityCSS/Accessibility.css';
 
 class Analysis extends React.Component {
   openApp = (app) => {

diff --git a/src/Analysis/GWASApp/Components/JobInputModal/JobInputModal.jsx b/src/Analysis/GWASApp/Components/JobInputModal/JobInputModal.jsx
@@ -40,6 +40,7 @@ const JobInputModal = ({
 
   return (
     <Modal
+      className='gwas-modal'
       okText='Submit'
       cancelText='Back'
       open={open}

diff --git a/src/Analysis/GWASApp/GWASContainer.jsx b/src/Analysis/GWASApp/GWASContainer.jsx
@@ -14,7 +14,6 @@ import DismissibleMessagesList from './Components/DismissibleMessagesList/Dismis
 import MakeFullscreenButton from './Components/MakeFullscreenButton/MakeFullscreenButton';
 import InitializeCurrentState from './Utils/StateManagement/InitializeCurrentState';
 import './GWASApp.css';
-import '../SharedUtils/AccessibilityUtils/Accessibility.css';
 import WorkflowLimitsDashboard from '../SharedUtils/WorkflowLimitsDashboard/WorkflowLimitsDashboard';
 
 const GWASContainer = () => {

diff --git a/src/Analysis/SharedUtils/AccessibilityUtils/Accessibility.css b/src/Analysis/SharedUtils/AccessibilityUtils/Accessibility.css
diff --git a/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/Accessibility.css b/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/Accessibility.css
@@ -0,0 +1,27 @@
+/* App-specific styles */
+
+@import "AccessibilityTeams.css";
+@import "AccessibilityGWAS.css";
+
+/* Global styles */
+
+:root {
+  --focus-outline-color: #007bff; /* Bright Blue */
+}
+
+.screen-reader-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
+}
+
+.ant-modal-content button:focus {
+  outline: 1px dashed var(--focus-outline-color);
+  outline-offset: 1px;
+}
diff --git a/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/AccessibilityGWAS.css b/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/AccessibilityGWAS.css
@@ -0,0 +1,34 @@
+/* GWAS App */
+
+.GWASUI-navBtn:not([disabled]) {
+  background: #194C90;
+  border-color: #194C90;
+}
+
+.GWASUI-navBtn:not([disabled]):hover,
+.GWASUI-navBtn:not([disabled]):focus {
+  background: #2466AC;
+  border-color: #2466AC;
+}
+
+.gwas-modal .ant-btn-primary:not([disabled]) {
+  background: #194C90;
+  border-color: #194C90;
+}
+
+.gwas-modal .ant-btn-primary:not([disabled]):hover,
+.gwas-modal .ant-btn-primary:not([disabled]):focus {
+  background: #2466AC;
+  border-color: #2466AC;
+}
+
+.gwas-modal .ant-btn-default {
+  color: #194C90;
+  border-color: #194C90;
+}
+
+.gwas-modal .ant-btn-default:hover,
+.gwas-modal .ant-btn-default:focus {
+  color: #2466AC;
+  border-color: #2466AC;
+}
diff --git a/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/AccessibilityTeams.css b/src/Analysis/SharedUtils/AccessibilityUtils/AccessibilityCSS/AccessibilityTeams.css
@@ -0,0 +1,12 @@
+/* VADC Apps - Team Selection */
+
+.team-project-modal .ant-btn-primary:not([disabled]) {
+  background: #194C90;
+  border-color: #194C90;
+}
+
+.team-project-modal .ant-btn-primary:not([disabled]):hover,
+.team-project-modal .ant-btn-primary:not([disabled]):focus {
+  background: #2466AC;
+  border-color: #2466AC;
+}
diff --git a/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamProjectModal.jsx b/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamProjectModal.jsx
@@ -5,7 +5,6 @@ import { Button, Modal, Spin } from 'antd';
 import LoadingErrorMessage from '../../LoadingErrorMessage/LoadingErrorMessage';
 import TeamsDropdown from './TeamsDropdown/TeamsDropdown';
 import './TeamProjectModal.css';
-import '../../AccessibilityUtils/Accessibility.css';
 
 const TeamProjectModal = ({
   isModalOpen,

diff --git a/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamsDropdown/TeamsDropdown.css b/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamsDropdown/TeamsDropdown.css
@@ -11,7 +11,3 @@
 .team-project-modal .teams-dropdown select:hover {
   border-color: #40a9ff;
 }
-
-.team-project-modal .teams-dropdown select.no-selection {
-  color: #bfbfbf;
-}
diff --git a/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamsDropdown/TeamsDropdown.jsx b/src/Analysis/SharedUtils/TeamProject/TeamProjectModal/TeamsDropdown/TeamsDropdown.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import './TeamsDropdown.css';
-import '../../../AccessibilityUtils/Accessibility.css';
 
 const TeamsDropdown = ({
   teams,
@@ -29,7 +28,6 @@ const TeamsDropdown = ({
         aria-labelledby='team-select-label'
         value={selectedValue}
         onChange={handleChange}
-        className={selectedTeamProject === null ? 'no-selection' : ''}
       >
         {selectedTeamProject === null && (
           <option value='placeholder' disabled>