merge conflict
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Sep 2018 09:45:58 +0000 (11:45 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 3 Sep 2018 09:45:58 +0000 (11:45 +0200)
Feature #13859

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

1  2 
src/views/process-panel/process-information-card.tsx

index db0ee605fd7a412c1b967fddfe527270d027ed4f,f3a804d70f45f7a27f4560d11d60ae0eea1cd11e..f2379ed8dd697af03cd227f84d55c1a80e28e3f4
@@@ -94,8 -94,8 +94,8 @@@ export const ProcessInformationCard = w
                      </div>
                  }
                  title={
-                     <Tooltip title={process.containerRequest.name}>
-                         <Typography noWrap variant="title" color='inherit'>
 -                    <Tooltip title={process.containerRequest.name} placement="bottom-start">
++                    <Tooltip title={process.containerRequest.name} placement="bottom-start" color='inherit'>
+                         <Typography noWrap variant="title">
                             {process.containerRequest.name}
                          </Typography>
                      </Tooltip>