projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 13853-collection-view-info-card
[arvados.git]
/
src
/
common
/
custom-theme.ts
diff --git
a/src/common/custom-theme.ts
b/src/common/custom-theme.ts
index 0850f8815a7c6bb712b4c8f935f3f0da7f38c9bf..e5d2e5e78ca80bed2cada42c923bd88d4461c96c 100644
(file)
--- a/
src/common/custom-theme.ts
+++ b/
src/common/custom-theme.ts
@@
-8,27
+8,49
@@
import purple from '@material-ui/core/colors/purple';
import blue from '@material-ui/core/colors/blue';
import grey from '@material-ui/core/colors/grey';
import green from '@material-ui/core/colors/green';
import blue from '@material-ui/core/colors/blue';
import grey from '@material-ui/core/colors/grey';
import green from '@material-ui/core/colors/green';
+import yellow from '@material-ui/core/colors/yellow';
+import red from '@material-ui/core/colors/red';
interface ArvadosThemeOptions extends ThemeOptions {
customs: any;
}
export interface ArvadosTheme extends Theme {
interface ArvadosThemeOptions extends ThemeOptions {
customs: any;
}
export interface ArvadosTheme extends Theme {
- customs: any;
+ customs: {
+ colors: Colors
+ };
+}
+
+interface Colors {
+ green700: string;
+ yellow700: string;
}
}
-const purple900 = purple["900"];
+const red900 = red["900"];
+const purple800 = purple["800"];
+const grey200 = grey["200"];
+const grey300 = grey["300"];
+const grey500 = grey["500"];
const grey600 = grey["600"];
const grey600 = grey["600"];
+const grey700 = grey["700"];
+const grey900 = grey["900"];
+
const themeOptions: ArvadosThemeOptions = {
customs: {
colors: {
const themeOptions: ArvadosThemeOptions = {
customs: {
colors: {
- green700: green["700"]
+ green700: green["700"],
+ yellow700: yellow["700"]
}
},
overrides: {
}
},
overrides: {
+ MuiTypography: {
+ body1: {
+ fontSize: '0.8125rem'
+ }
+ },
MuiAppBar: {
colorPrimary: {
MuiAppBar: {
colorPrimary: {
- backgroundColor: purple
9
00
+ backgroundColor: purple
8
00
}
},
MuiTabs: {
}
},
MuiTabs: {
@@
-36,13
+58,43
@@
const themeOptions: ArvadosThemeOptions = {
color: grey600
},
indicator: {
color: grey600
},
indicator: {
- backgroundColor: purple
9
00
+ backgroundColor: purple
8
00
}
},
MuiTab: {
selected: {
fontWeight: 700,
}
},
MuiTab: {
selected: {
fontWeight: 700,
- color: purple900
+ color: purple800
+ }
+ },
+ MuiList: {
+ root: {
+ color: grey900
+ }
+ },
+ MuiListItemText: {
+ root: {
+ padding: 0
+ }
+ },
+ MuiListItemIcon: {
+ root: {
+ fontSize: '1.25rem'
+ }
+ },
+ MuiCardHeader: {
+ avatar: {
+ display: 'flex',
+ alignItems: 'center'
+ },
+ title: {
+ color: grey700,
+ fontSize: '1.25rem'
+ }
+ },
+ MuiMenuItem: {
+ root: {
+ padding: '8px 16px'
}
}
},
}
}
},