diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-03-03 13:38:30 +0000 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-03-03 13:38:30 +0000 |
| commit | 7fb8ac0a0ef993d6057701dd281e8da2f94a700b (patch) | |
| tree | 0ac358b4830b7cca8ba7900ce16854d1511fe7e3 | |
| parent | 57aad97bc31129b78619ea16cf51828df8a058e3 (diff) | |
| download | mullvadvpn-7fb8ac0a0ef993d6057701dd281e8da2f94a700b.tar.xz mullvadvpn-7fb8ac0a0ef993d6057701dd281e8da2f94a700b.zip | |
- Bump heading font size to 38px
- Display Fastest/Nearest when connecting (instead of country)
| -rw-r--r-- | app/components/Connect.css | 2 | ||||
| -rw-r--r-- | app/components/Connect.js | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/app/components/Connect.css b/app/components/Connect.css index f1ded5d5d7..c74c0da03d 100644 --- a/app/components/Connect.css +++ b/app/components/Connect.css @@ -111,7 +111,7 @@ .connect__status-location { font-family: DINPro; - font-size: 34px; + font-size: 38px; font-weight: 900; line-height: 1.16em; letter-spacing: -0.9px; diff --git a/app/components/Connect.js b/app/components/Connect.js index 0f88643a0f..3b7dc70adf 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -107,17 +107,30 @@ export default class Connect extends Component { <div className="connect__status-location"> <If condition={ preferredServer === 'fastest' }> <Then> - <img className="connect__status-location-icon" src="./assets/images/icon-fastest.svg" /> + <span> + <img className="connect__status-location-icon" src="./assets/images/icon-fastest.svg" /> + { 'Fastest' } + </span> </Then> </If> <If condition={ preferredServer === 'nearest' }> <Then> - <img className="connect__status-location-icon" src="./assets/images/icon-nearest.svg" /> + <span> + <img className="connect__status-location-icon" src="./assets/images/icon-nearest.svg" /> + { 'Nearest' } + </span> </Then> </If> - { displayLocation.country }<br/><br/> + { /* silly but react-if does not have ElseIf */ } + <If condition={ preferredServer !== 'fastest' && preferredServer !== 'nearest' }> + <Then> + <span>{ displayLocation.country }</span> + </Then> + </If> + <br/><br/> + </div> </Then> <Else> |