From 1eea15d3e8dcab8b5914567eddf8646a2ec01bc1 Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Fri, 26 Jun 2020 16:48:30 +0200
Subject: [PATCH] NG_UI : SSDM-7583 : ObjectType form - make font size of a
field metadata, description and error consistent with the font size of a
field label
---
.../src/js/components/common/form/FormFieldContainer.jsx | 6 +++++-
.../src/js/components/common/theme/ThemeProvider.jsx | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/openbis_ng_ui/src/js/components/common/form/FormFieldContainer.jsx b/openbis_ng_ui/src/js/components/common/form/FormFieldContainer.jsx
index 90242fc88c0..df0fc2ce142 100644
--- a/openbis_ng_ui/src/js/components/common/form/FormFieldContainer.jsx
+++ b/openbis_ng_ui/src/js/components/common/form/FormFieldContainer.jsx
@@ -9,6 +9,7 @@ const styles = theme => ({
overflow: 'hidden'
},
metadataDefault: {
+ fontSize: theme.typography.label.fontSize,
flex: '0 0 auto',
margin: 0,
marginBottom: theme.spacing(1) / 2,
@@ -17,8 +18,11 @@ const styles = theme => ({
controlDefault: {
flex: '0 0'
},
- descriptionDefault: {},
+ descriptionDefault: {
+ fontSize: theme.typography.label.fontSize
+ },
errorDefault: {
+ fontSize: theme.typography.label.fontSize,
color: theme.palette.error.main
}
})
diff --git a/openbis_ng_ui/src/js/components/common/theme/ThemeProvider.jsx b/openbis_ng_ui/src/js/components/common/theme/ThemeProvider.jsx
index cdd4015b050..6840a0d27bb 100644
--- a/openbis_ng_ui/src/js/components/common/theme/ThemeProvider.jsx
+++ b/openbis_ng_ui/src/js/components/common/theme/ThemeProvider.jsx
@@ -7,7 +7,7 @@ const theme = createMuiTheme({
typography: {
useNextVariants: true,
label: {
- fontSize: '0.7em',
+ fontSize: '0.7rem',
color: '#0000008a'
}
},
--
GitLab