john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update models more

Browse Source
This commit is contained in:
John Lyon-Smith
2018-03-22 10:18:34 -07:00
parent e15c38c0bc
commit 82fbd88dab
16 changed files with 7856 additions and 3925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/src/App.js
View File

@@ -80,7 +80,9 @@ export class App extends Component {
<Router basename='/'>
<Column minHeight='100vh'>
<Column.Item height={sizeInfo.headerHeight - sizeInfo.headerBorderWidth}>
<Box background={colorInfo.headerButtonBackground} borderBottom={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}>
<Box background={colorInfo.headerButtonBackground}
borderBottom={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}
style={{ boxSizing: 'content' }}>
<Row minWidth='100vw'>
<Row.Item>{headerButtonsLeft}</Row.Item>
<Row.Item grow />

4
website/src/ui/HeaderButton.js
View File

@@ -26,12 +26,12 @@ class HeaderButton extends Component {
}
render() {
const size = sizeInfo.headerHeight - 2 * sizeInfo.headerBorderWidth
const size = sizeInfo.headerHeight - 2 * sizeInfo.headerBorderWidth // Times two to account for zooming
const { onClick, icon, image } = this.props
let content = null
if (image) {
content = (<Image source={image} width={size} height={size} margin={sizeInfo.headerButtonMargin} />)
content = (<Image source={image} width={size} height='100%' margin={sizeInfo.headerButtonMargin} />)
} else if (icon) {
content = (<Icon name={icon} size={size} margin={sizeInfo.headerButtonMargin} />)
}