summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-11-23 15:46:28 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-11-23 15:46:28 +0100
commitc2576a177898ae0afb2898e6fab82a40995368b8 (patch)
tree4639c1f37a13576cd9649e8cc1042b7549cb9a69 /gui/src/renderer/components
parentdf352ae3da74e2b7dbf53e39c430cd77e3e34195 (diff)
parent0c3eed7c9a988b908267f6f78ffbf5cc3ab9c395 (diff)
downloadmullvadvpn-c2576a177898ae0afb2898e6fab82a40995368b8.tar.xz
mullvadvpn-c2576a177898ae0afb2898e6fab82a40995368b8.zip
Merge branch 'fix-location-line-height'
Diffstat (limited to 'gui/src/renderer/components')
-rw-r--r--gui/src/renderer/components/TunnelControl.tsx1
-rw-r--r--gui/src/renderer/components/common-styles.ts2
2 files changed, 2 insertions, 1 deletions
diff --git a/gui/src/renderer/components/TunnelControl.tsx b/gui/src/renderer/components/TunnelControl.tsx
index d0f36f8ec7..c0fa5f8452 100644
--- a/gui/src/renderer/components/TunnelControl.tsx
+++ b/gui/src/renderer/components/TunnelControl.tsx
@@ -66,6 +66,7 @@ const Location = styled.div({
const StyledMarquee = styled(Marquee)({
...bigText,
+ lineHeight: '36px',
overflow: 'hidden',
});
diff --git a/gui/src/renderer/components/common-styles.ts b/gui/src/renderer/components/common-styles.ts
index d6d5707ed4..76f6a0529e 100644
--- a/gui/src/renderer/components/common-styles.ts
+++ b/gui/src/renderer/components/common-styles.ts
@@ -34,6 +34,6 @@ export const buttonText = {
export const bigText = {
...sourceSansPro,
fontSize: '32px',
- lineHeight: '35px',
+ lineHeight: '34px',
color: colors.white,
};