Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/icdc 3769 #1205

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Bugfix/icdc 3769 #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d528bc
Merge pull request #1204 from CBIIT/development
rana22 Nov 18, 2024
9f9ad5c
restore tab & button styles for dashboard
rana22 Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions src/components/Tabs/DefaultTabTheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
const customTheme = {
MuiTabs: {
root: {
width: "100%",
borderBottom: "1px solid #6B6B6B",
width: '100%',
borderBottom: '1px solid #6B6B6B',
},
},
MuiTab: {
root: {
marginTop: "15px",
color: "#696969 !important",
height: "45px",
overflow: "hidden",
background: "#EAEAEA",
fontWeight: "500",
lineHeight: "1.75",
letterSpacing: "0.25px",
marginRight: "10px",
fontSize: "17px",
width: "250px",
textTransform: "none",
fontFamily: "Lato",
borderTop: "7px solid #c6c9cd",
"&.Mui-selected": {
"&.cases": {
color: "#AD4E00 !important",
borderTop: "7px solid #FF9742",
marginTop: '15px',
color: '#696969 !important',
height: '45px',
overflow: 'hidden',
background: '#EAEAEA',
fontWeight: '500',
lineHeight: '1.75',
letterSpacing: '0.25px',
marginRight: '10px',
fontSize: '17px',
width: '250px',
textTransform: 'none',
fontFamily: 'Lato',
borderTop: '7px solid #c6c9cd',
'&$selected': {
'&.cases': {
color: '#AD4E00 !important',
borderTop: '7px solid #FF9742',
},
"&.samples": {
color: "#3A6D8D !important",
borderTop: "7px solid #9DC1D9",
'&.samples': {
color: '#3A6D8D !important',
borderTop: '7px solid #9DC1D9',
},
"&.case_files": {
color: "#667A87 !important",
borderTop: "7px solid #667A87",
'&.case_files': {
color: '#667A87 !important',
borderTop: '7px solid #667A87',
},
"&.study_files": {
color: "#0A6F94 !important",
borderTop: "7px solid #39C0F0",
'&.study_files': {
color: '#0A6F94 !important',
borderTop: '7px solid #39C0F0',
},
},
"& span.cases_count": {
marginLeft: "5px",
fontSize: "17px",
'& span.cases_count': {
marginLeft: '5px',
fontSize: '17px',
},
"& span.samples_count": {
marginLeft: "5px",
fontSize: "17px",
'& span.samples_count': {
marginLeft: '5px',
fontSize: '17px',
},
"& span.case_files_count": {
marginLeft: "5px",
fontSize: "17px",
'& span.case_files_count': {
marginLeft: '5px',
fontSize: '17px',
},
"& span.study_files_count": {
marginLeft: "5px",
fontSize: "17px",
'& span.study_files_count': {
marginLeft: '5px',
fontSize: '17px',
},
},
},
Expand Down
42 changes: 22 additions & 20 deletions src/pages/dashboard/components/DashboardThemeProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
import React from "react";
import {
createTheme,
ThemeProvider
} from '@mui/material/styles';
import React from 'react';
import { createTheme, ThemeProvider } from '@mui/material/styles';

const DashboardThemeProvider = ({children}) => {
const DashboardThemeProvider = ({ children }) => {
const theme = {
components: {
MuiButton: {
styleOverrides: {
root: {
"&#jbrowse_multi_view_button": {
padding: "0px",
color: "#ffffff",
height: "43px",
marginLeft: "22px",
textTransform: "inherit",
'&#jbrowse_multi_view_button': {
padding: '0px',
color: '#ffffff',
height: '43px',
marginLeft: '22px',
textTransform: 'inherit',
opacity: 1,
"& img": {
width: "2.25em",
'& img': {
width: '2.25em',
},
},
},
},
},
MuiIconButton: {
styleOverrides: {
root: {
'&#jbrowse_help_icon_btn': {
marginTop: '7px',
},
},
},
},
},
};

return (
<ThemeProvider theme={createTheme(theme)}>
{children}
</ThemeProvider>
);
}
return <ThemeProvider theme={createTheme(theme)}>{children}</ThemeProvider>;
};

export default DashboardThemeProvider;