From: Janicki Artur <artur.janicki@contractors.roche.com>
Date: Wed, 11 Jul 2018 13:15:49 +0000 (+0200)
Subject: Merge branch 'master' into 13764-icons-colors-unification-refactoring
X-Git-Tag: 1.2.0~43^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/e6039bec0497aa7e1391958e5c4f84bbaeef653e?hp=-c

Merge branch 'master' into 13764-icons-colors-unification-refactoring

refs #13764

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
---

e6039bec0497aa7e1391958e5c4f84bbaeef653e
diff --combined src/components/attribute/attribute.tsx
index 319b241d,c0874f7d..4fb1d110
--- a/src/components/attribute/attribute.tsx
+++ b/src/components/attribute/attribute.tsx
@@@ -5,7 -5,7 +5,7 @@@
  import * as React from 'react';
  import Typography from '@material-ui/core/Typography';
  import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
- import { ArvadosTheme } from 'src/common/custom-theme';
+ import { ArvadosTheme } from '../../common/custom-theme';
  
  interface AttributeDataProps {
      label: string;
@@@ -57,10 -57,8 +57,10 @@@ const styles: StyleRulesCallback<CssRul
          textTransform: 'capitalize'
      },
      link: {
 +        width: '60%',
          color: theme.palette.primary.main,
 -        textDecoration: 'none'
 +        textDecoration: 'none',
 +        overflowWrap: 'break-word'
      }
  });