diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-03-18 14:25:28 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-03-18 14:25:28 +0100 |
| commit | bc929c4d078526f0782f2fdf3b653afae0d56f45 (patch) | |
| tree | a51d77981e7aa373707840b4264b0afaf10d9e86 | |
| parent | 619a68e8fc2c7caff00ffbeea0d3cce98ba362f9 (diff) | |
| parent | 257801ea0654d801a2bfcf27ac290bbfc909bbbc (diff) | |
| download | mullvadvpn-bc929c4d078526f0782f2fdf3b653afae0d56f45.tar.xz mullvadvpn-bc929c4d078526f0782f2fdf3b653afae0d56f45.zip | |
Merge branch 'ui-localization-adjustments'
| -rw-r--r-- | gui/assets/css/global.css | 15 | ||||
| -rw-r--r-- | gui/src/renderer/components/Settings.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/SettingsHeader.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/SettingsStyles.tsx | 3 | ||||
| -rw-r--r-- | gui/src/renderer/index.html | 2 |
5 files changed, 8 insertions, 18 deletions
diff --git a/gui/assets/css/global.css b/gui/assets/css/global.css index 114f58140d..213e965086 100644 --- a/gui/assets/css/global.css +++ b/gui/assets/css/global.css @@ -25,21 +25,8 @@ body { display: flex; } -#app { +.app-container { height: 100%; width: 100%; display: flex; } - -/* - Temporary fix for placeholder colors until the following PR lands in master: - https://github.com/Microsoft/reactxp/pull/868 - */ - -* [data-test-id='AccountInput']::placeholder { - color: rgba(41, 77, 115, 0.4); -} - -* [data-test-id='CellInputField']::placeholder { - color: rgba(255, 255, 255, 0.6); -} diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx index 146cfa05b7..6706a62b99 100644 --- a/gui/src/renderer/components/Settings.tsx +++ b/gui/src/renderer/components/Settings.tsx @@ -163,7 +163,7 @@ export default class Settings extends Component<IProps> { <Cell.CellButton disabled={this.props.isOffline} onPress={this.openDownloadLink}> {icon} <Cell.Label>{pgettext('settings-view', 'App version')}</Cell.Label> - <Cell.SubText>{this.props.appVersion}</Cell.SubText> + <Cell.SubText style={styles.settings__appversion}>{this.props.appVersion}</Cell.SubText> <Cell.Icon height={16} width={16} source="icon-extLink" /> </Cell.CellButton> {footer} diff --git a/gui/src/renderer/components/SettingsHeader.tsx b/gui/src/renderer/components/SettingsHeader.tsx index e099d29a2d..25b4990349 100644 --- a/gui/src/renderer/components/SettingsHeader.tsx +++ b/gui/src/renderer/components/SettingsHeader.tsx @@ -15,11 +15,11 @@ const styles = { fontFamily: 'DINPro', fontSize: 32, fontWeight: '900', - lineHeight: 40, + lineHeight: 32, color: 'rgb(255, 255, 255)', }), subtitle: Styles.createTextStyle({ - marginTop: 4, + marginTop: 8, fontFamily: 'Open Sans', fontSize: 13, fontWeight: '600', diff --git a/gui/src/renderer/components/SettingsStyles.tsx b/gui/src/renderer/components/SettingsStyles.tsx index d9b2692bcb..5c9a66fd97 100644 --- a/gui/src/renderer/components/SettingsStyles.tsx +++ b/gui/src/renderer/components/SettingsStyles.tsx @@ -50,4 +50,7 @@ export default { letterSpacing: -0.2, color: colors.white60, }), + settings__appversion: Styles.createTextStyle({ + flex: 0, + }), }; diff --git a/gui/src/renderer/index.html b/gui/src/renderer/index.html index c88955b3a2..7b6dfe58ea 100644 --- a/gui/src/renderer/index.html +++ b/gui/src/renderer/index.html @@ -5,7 +5,7 @@ <link rel="stylesheet" href="../../assets/css/style.css" /> </head> <body> - <div id="app" class="app-container"></div> + <div class="app-container"></div> <script>var exports = {};</script> <script src="./index.js"></script> <script> |