[ARVADOS-WORKBENCH2] updated: 1.1.4-644-g31df208

Git user git at public.curoverse.com
Mon Aug 20 05:52:29 EDT 2018


Summary of changes:
 src/common/custom-theme.ts                         |  6 +++++
 .../list-item-text-icon/list-item-text-icon.tsx    |  2 +-
 src/views/collection-panel/collection-panel.tsx    | 31 +++++++++++++---------
 3 files changed, 26 insertions(+), 13 deletions(-)

       via  31df208339af5e30665455e193cdbde90dabaf1d (commit)
      from  01e4b29eb65a760650476a8f5f059413130921f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 31df208339af5e30665455e193cdbde90dabaf1d
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date:   Mon Aug 20 11:52:19 2018 +0200

    Font size form unification and change collection panel
    
    Feature #14039
    
    Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index 098e009..2b0c589 100644
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -99,6 +99,9 @@ const themeOptions: ArvadosThemeOptions = {
             }
         },
         MuiInput: {
+            root: {
+                fontSize: '0.875rem'
+            },
             underline: {
                 '&:after': {
                     borderBottomColor: purple800
@@ -109,6 +112,9 @@ const themeOptions: ArvadosThemeOptions = {
             }
         },
         MuiFormLabel: {
+            root: {
+                fontSize: '0.875rem'
+            },
             focused: {
                 "&$focused:not($error)": {
                     color: purple800
diff --git a/src/components/list-item-text-icon/list-item-text-icon.tsx b/src/components/list-item-text-icon/list-item-text-icon.tsx
index b34c6ab..e7f63ea 100644
--- a/src/components/list-item-text-icon/list-item-text-icon.tsx
+++ b/src/components/list-item-text-icon/list-item-text-icon.tsx
@@ -17,7 +17,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         alignItems: 'center'
     },
     listItemText: {
-        fontWeight: 700
+        fontWeight: 400
     },
     active: {
         color: theme.palette.primary.main,
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index 374cb95..f476c93 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -20,7 +20,7 @@ import { TagResource } from '~/models/tag';
 import { CollectionTagForm } from './collection-tag-form';
 import { deleteCollectionTag } from '~/store/collection-panel/collection-panel-action';
 
-type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'value';
+type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'label' | 'value';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     card: {
@@ -40,8 +40,12 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         color: theme.palette.grey["500"],
         cursor: 'pointer'
     },
+    label: {
+        fontSize: '0.875rem'
+    },
     value: {
-        textTransform: 'none'
+        textTransform: 'none',
+        fontSize: '0.875rem'
     }
 });
 
@@ -84,16 +88,19 @@ export const CollectionPanel = withStyles(styles)(
                             <CardContent>
                                 <Grid container direction="column">
                                     <Grid item xs={6}>
-                                    <DetailsAttribute classValue={classes.value}
-                                            label='Collection UUID'
-                                            value={item && item.uuid}>
-                                        <CopyToClipboard text={item && item.uuid}>
-                                            <CopyIcon className={classes.copyIcon} />
-                                        </CopyToClipboard>
-                                    </DetailsAttribute>
-                                    <DetailsAttribute label='Number of files' value='14' />
-                                    <DetailsAttribute label='Content size' value='54 MB' />
-                                    <DetailsAttribute classValue={classes.value} label='Owner' value={item && item.ownerUuid} />
+                                        <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+                                                label='Collection UUID'
+                                                value={item && item.uuid}>
+                                            <CopyToClipboard text={item && item.uuid}>
+                                                <CopyIcon className={classes.copyIcon} />
+                                            </CopyToClipboard>
+                                        </DetailsAttribute>
+                                        <DetailsAttribute classLabel={classes.label} classValue={classes.value} 
+                                            label='Number of files' value='14' />
+                                        <DetailsAttribute classLabel={classes.label} classValue={classes.value} 
+                                            label='Content size' value='54 MB' />
+                                        <DetailsAttribute classLabel={classes.label} classValue={classes.value} 
+                                            label='Owner' value={item && item.ownerUuid} />
                                     </Grid>
                                 </Grid>
                             </CardContent>

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list