From 95884684edc58938dab498a1e45f677545964f4c Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Tue, 24 Sep 2019 08:33:16 +0200
Subject: [PATCH] Fix info header margins
---
src/client/components/App.js | 3 +--
src/client/components/main_layout/InfoHeader.js | 11 +++++++++--
src/client/containers/SemanticPortal.js | 10 +++++-----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/client/components/App.js b/src/client/components/App.js
index 26cc7ffa..390bacef 100644
--- a/src/client/components/App.js
+++ b/src/client/components/App.js
@@ -19,8 +19,7 @@ const theme = createMuiTheme({
marginTop: 8,
marginBottom: 8
}
-
- }
+ },
}
}
});
diff --git a/src/client/components/main_layout/InfoHeader.js b/src/client/components/main_layout/InfoHeader.js
index 0587acf0..dcc9336f 100644
--- a/src/client/components/main_layout/InfoHeader.js
+++ b/src/client/components/main_layout/InfoHeader.js
@@ -12,11 +12,17 @@ import Grid from '@material-ui/core/Grid';
const styles = theme => ({
root: {
position: 'absolute',
- marginTop: 64,
+ //marginTop: 64,
paddingTop: theme.spacing(1),
paddingLeft: theme.spacing(1.5),
paddingRight: theme.spacing(1.5),
backgroundColor: '#bdbdbd',
+ [theme.breakpoints.down('sm')]: {
+ marginTop: 56,
+ },
+ [theme.breakpoints.up('sm')]: {
+ marginTop: 64,
+ },
},
panel: {
width: '100%'
@@ -25,7 +31,8 @@ const styles = theme => ({
paddingLeft: theme.spacing(1),
},
summaryContent: {
- display: 'block'
+ display: 'block',
+ marginBottom: `${theme.spacing(1)}px !important`
},
label: {
marginTop: theme.spacing(1),
diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 9b577e31..a888291a 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -105,12 +105,12 @@ const styles = theme => ({
backgroundColor: '#bdbdbd',
padding: theme.spacing(1),
[theme.breakpoints.down('sm')]: {
- marginTop: 308, // 56 + 244 + 8
- height: 'calc(100% - 308px)',
+ marginTop: 296, // 56 + 232 + 8
+ height: 'calc(100% - 296px)',
},
[theme.breakpoints.up('sm')]: {
- marginTop: 316, // 64 + 244 + 8
- height: 'calc(100% - 316px)',
+ marginTop: 304, // 64 + 232 + 8
+ height: 'calc(100% - 304px)',
},
},
instancePageContainer: {
@@ -122,7 +122,7 @@ const styles = theme => ({
height: 'calc(100% - 177px)',
},
[theme.breakpoints.up('sm')]: {
- marginTop: 185, // 64 + 113 + 8
+ marginTop: 181,
height: 'calc(100% - 185px)',
},
},
--
GitLab