projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[arvados-workbench2.git]
/
src
/
components
/
details-attribute
/
details-attribute.tsx
diff --git
a/src/components/details-attribute/details-attribute.tsx
b/src/components/details-attribute/details-attribute.tsx
index 3888b04b67d596ea84f3e11cbfeba30999adbc03..78b4341d173046972385cad95e584cb735138085 100644
(file)
--- a/
src/components/details-attribute/details-attribute.tsx
+++ b/
src/components/details-attribute/details-attribute.tsx
@@
-8,7
+8,7
@@
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/st
import { ArvadosTheme } from '~/common/custom-theme';
import * as classnames from "classnames";
import { ArvadosTheme } from '~/common/custom-theme';
import * as classnames from "classnames";
-type CssRules = 'attribute' | 'label' | 'value' | 'link';
+type CssRules = 'attribute' | 'label' | 'value' | 'l
owercaseValue' | 'l
ink';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
attribute: {
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
attribute: {
@@
-17,28
+17,35
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
marginBottom: theme.spacing.unit
},
label: {
marginBottom: theme.spacing.unit
},
label: {
+ boxSizing: 'border-box',
color: theme.palette.grey["500"],
width: '40%'
},
value: {
color: theme.palette.grey["500"],
width: '40%'
},
value: {
+ boxSizing: 'border-box',
width: '60%',
display: 'flex',
alignItems: 'flex-start',
textTransform: 'capitalize'
},
width: '60%',
display: 'flex',
alignItems: 'flex-start',
textTransform: 'capitalize'
},
+ lowercaseValue: {
+ textTransform: 'lowercase'
+ },
link: {
width: '60%',
color: theme.palette.primary.main,
textDecoration: 'none',
link: {
width: '60%',
color: theme.palette.primary.main,
textDecoration: 'none',
- overflowWrap: 'break-word'
+ overflowWrap: 'break-word',
+ cursor: 'pointer'
}
});
interface DetailsAttributeDataProps {
label: string;
classLabel?: string;
}
});
interface DetailsAttributeDataProps {
label: string;
classLabel?: string;
- value?:
string | number
;
+ value?:
React.ReactNode
;
classValue?: string;
classValue?: string;
+ lowercaseValue?: boolean;
link?: string;
children?: React.ReactNode;
}
link?: string;
children?: React.ReactNode;
}
@@
-46,12
+53,12
@@
interface DetailsAttributeDataProps {
type DetailsAttributeProps = DetailsAttributeDataProps & WithStyles<CssRules>;
export const DetailsAttribute = withStyles(styles)(
type DetailsAttributeProps = DetailsAttributeDataProps & WithStyles<CssRules>;
export const DetailsAttribute = withStyles(styles)(
- ({ label, link, value, children, classes, classLabel, classValue }: DetailsAttributeProps) =>
+ ({ label, link, value, children, classes, classLabel, classValue
, lowercaseValue
}: DetailsAttributeProps) =>
<Typography component="div" className={classes.attribute}>
<Typography component="span" className={classnames([classes.label, classLabel])}>{label}</Typography>
{ link
? <a href={link} className={classes.link} target='_blank'>{value}</a>
<Typography component="div" className={classes.attribute}>
<Typography component="span" className={classnames([classes.label, classLabel])}>{label}</Typography>
{ link
? <a href={link} className={classes.link} target='_blank'>{value}</a>
- : <Typography component="span" className={classnames([classes.value, classValue])}>
+ : <Typography component="span" className={classnames([classes.value, classValue
, { [classes.lowercaseValue]: lowercaseValue }
])}>
{value}
{children}
</Typography> }
{value}
{children}
</Typography> }