diff --git a/app/components/chart/basics.js b/app/components/chart/basics.js
index 89b9b6e300..81685b483c 100644
--- a/app/components/chart/basics.js
+++ b/app/components/chart/basics.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
import bows from 'bows';
import sundial from 'sundial';
import { withTranslation, Trans } from 'react-i18next';
-import { Flex } from 'theme-ui';
+import { Box, Flex } from 'theme-ui';
// tideline dependencies & plugins
import tidelineBlip from 'tideline/plugins/blip';
@@ -82,73 +82,75 @@ class Basics extends Component {
return (
- {this.isMissingSMBG() ? this.renderMissingSMBGHeader() : this.renderHeader()}
-
-
-
+
+ {this.isMissingSMBG() ? this.renderMissingSMBGHeader() : this.renderHeader()}
+
+
+
{renderedContent}
-
-
-
-
-
-
+
+
+
+
);
};
diff --git a/app/components/chart/daily.js b/app/components/chart/daily.js
index d4a1218057..c364de451a 100644
--- a/app/components/chart/daily.js
+++ b/app/components/chart/daily.js
@@ -23,7 +23,7 @@ import ReactDOM from 'react-dom';
import sundial from 'sundial';
import WindowSizeListener from 'react-window-size-listener';
import { withTranslation } from 'react-i18next';
-import { Flex } from 'theme-ui';
+import { Box, Flex } from 'theme-ui';
import Stats from './stats';
import BgSourceToggle from './bgSourceToggle';
@@ -288,41 +288,46 @@ class Daily extends Component {
return (
-
-
-
-
-
- {dataQueryComplete && this.renderChart()}
-
-
-
+
+
+
+
+
+
+ {dataQueryComplete && this.renderChart()}
+
+
{this.props.t('Refresh')}
-
-
-
-
-
- {this.state.hoveredBolus &&
}
- {this.state.hoveredSMBG &&
}
- {this.state.hoveredCBG &&
}
- {this.state.hoveredCarb &&
}
- {this.state.hoveredPumpSettingsOverride &&
}
-
+
+
+ {this.state.hoveredBolus &&
}
+ {this.state.hoveredSMBG &&
}
+ {this.state.hoveredCBG &&
}
+ {this.state.hoveredCarb &&
}
+ {this.state.hoveredPumpSettingsOverride &&
}
+
+
);
};
diff --git a/app/components/chart/header.js b/app/components/chart/header.js
index f9d5673c85..f35a43ec71 100644
--- a/app/components/chart/header.js
+++ b/app/components/chart/header.js
@@ -8,6 +8,7 @@ import PrintRoundedIcon from '@material-ui/icons/PrintRounded';
import colorPalette from '../../themes/colorPalette';
import Icon from '../elements/Icon';
+import { Box } from 'theme-ui';
const Header = withTranslation()(class Header extends Component {
static propTypes = {
@@ -121,7 +122,7 @@ const Header = withTranslation()(class Header extends Component {
});
return (
-
- The Device Settings view shows your basal rates, carb ratios, sensitivity factors and more, but it looks like you haven't uploaded pump data yet.
- To see your Device Settings,
+
+ This section shows basal rates, carb ratios, sensitivity factors, and more. To see Therapy Settings, upload your pump.
-
- If you just uploaded, try refreshing.
-
+ onClick={handleClickUpload}
+ >upload data from a pump. If you just uploaded try refreshing.
+
);
};
- return (
-