summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components/Layout.tsx
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-07-01 10:58:12 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-07-01 10:58:12 +0200
commit695a307f5717ea3df9ecf9b4e71422cc52090137 (patch)
treec25ee3d857381697b5ad169a1897d9b007447a92 /gui/src/renderer/components/Layout.tsx
parentf074c054d23a8539135adcbc8f5e237c25c6cad3 (diff)
parentf6219ce2bd4774dbfc21a96a3afef1c2fad1e1d9 (diff)
downloadmullvadvpn-695a307f5717ea3df9ecf9b4e71422cc52090137.tar.xz
mullvadvpn-695a307f5717ea3df9ecf9b4e71422cc52090137.zip
Merge branch 'convert-header-bar-from-reactxp'
Diffstat (limited to 'gui/src/renderer/components/Layout.tsx')
-rw-r--r--gui/src/renderer/components/Layout.tsx17
1 files changed, 3 insertions, 14 deletions
diff --git a/gui/src/renderer/components/Layout.tsx b/gui/src/renderer/components/Layout.tsx
index 825cbf9190..8caf983b40 100644
--- a/gui/src/renderer/components/Layout.tsx
+++ b/gui/src/renderer/components/Layout.tsx
@@ -1,21 +1,10 @@
-import * as React from 'react';
-import { Component, View } from 'reactxp';
import styled from 'styled-components';
import { colors } from '../../config.json';
import HeaderBar from './HeaderBar';
-import styles from './LayoutStyles';
-export class Header extends Component<HeaderBar['props']> {
- public static defaultProps = HeaderBar.defaultProps;
-
- public render() {
- return (
- <View style={[styles.header, this.props.style]}>
- <HeaderBar barStyle={this.props.barStyle}>{this.props.children}</HeaderBar>
- </View>
- );
- }
-}
+export const Header = styled(HeaderBar)({
+ flex: 0,
+});
export const Container = styled.div({
display: 'flex',