diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-04-23 14:56:07 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-04-23 14:56:07 -0300 |
| commit | 8f6f61ebd6a013f657a2523dbe4b4cfa1a1cb462 (patch) | |
| tree | 5f33b5ecb77a505541a955cbdd290770d78d6cec | |
| parent | 838595e32933e5797a5f0ac9c03147b4904b2027 (diff) | |
| parent | 8e6205887e55fa302e549228015af786c5decbc7 (diff) | |
| download | mullvadvpn-8f6f61ebd6a013f657a2523dbe4b4cfa1a1cb462.tar.xz mullvadvpn-8f6f61ebd6a013f657a2523dbe4b4cfa1a1cb462.zip | |
Merge branch 'no-x-icon-on-out-of-time-screen'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/components/Connect.js | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a6df7b45d..429c270199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ Line wrap the file at 100 chars. Th - Fix OpenVPN plugin search directory to be the installation directory. - Reduce RPC timeout to Mullvad API server. - Fix OpenVPN warning about usage of AES-256-CBC cipher. +- Fix "Out of time" screen status icon position. ## [2018.1] - 2018-03-01 diff --git a/app/components/Connect.js b/app/components/Connect.js index 56defe49b7..79d14df743 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -80,10 +80,10 @@ export default class Connect extends Component<ConnectProps, ConnectState> { renderError(error: BackendError) { return ( <View style={styles.connect}> + <View style={styles.status_icon}> + <Img source="icon-fail" height={60} width={60} alt="" /> + </View> <View style={styles.status}> - <View style={styles.status_icon}> - <Img source="icon-fail" height={60} width={60} alt="" /> - </View> <View style={styles.error_title}> { error.title } </View> @@ -344,4 +344,4 @@ function shallowCompare(lhs: Object, rhs: Object) { keys.length === Object.keys(rhs).length && keys.every(key => lhs[key] === rhs[key]) ); -}
\ No newline at end of file +} |