summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2023-01-04 11:28:57 +0100
committerOskar Nyberg <oskar@mullvad.net>2023-01-04 11:28:57 +0100
commitf8e4749d4cd7a152dba307baa9cecbadc8c3a106 (patch)
treeb62443409eb5f6f17211ec152938477aaca7ff87
parent819bf6fc14bc05726fb8b86e129d51525a3e3b92 (diff)
parent696c2c01cc78a4fc66e613f1c12138765e045625 (diff)
downloadmullvadvpn-f8e4749d4cd7a152dba307baa9cecbadc8c3a106.tar.xz
mullvadvpn-f8e4749d4cd7a152dba307baa9cecbadc8c3a106.zip
Merge branch 'quick-ui-fixes'
-rw-r--r--gui/src/renderer/components/Modal.tsx2
-rw-r--r--gui/src/renderer/components/SettingsHeader.tsx4
-rw-r--r--gui/src/renderer/components/TooManyDevices.tsx2
3 files changed, 5 insertions, 3 deletions
diff --git a/gui/src/renderer/components/Modal.tsx b/gui/src/renderer/components/Modal.tsx
index 8e0d099b5b..d9be9e767d 100644
--- a/gui/src/renderer/components/Modal.tsx
+++ b/gui/src/renderer/components/Modal.tsx
@@ -108,7 +108,7 @@ const ModalAlertContainer = styled.div({
flexDirection: 'column',
flex: 1,
justifyContent: 'center',
- padding: '26px 14px 14px',
+ padding: '14px',
});
const StyledModalAlert = styled.div({}, (props: { visible: boolean; closing: boolean }) => {
diff --git a/gui/src/renderer/components/SettingsHeader.tsx b/gui/src/renderer/components/SettingsHeader.tsx
index 94f36cb8b2..a929d8ba83 100644
--- a/gui/src/renderer/components/SettingsHeader.tsx
+++ b/gui/src/renderer/components/SettingsHeader.tsx
@@ -18,7 +18,9 @@ export const ContentWrapper = styled.div({
},
});
-export const HeaderTitle = styled.span(hugeText);
+export const HeaderTitle = styled.span(hugeText, {
+ wordWrap: 'break-word',
+});
export const HeaderSubTitle = styled.span(tinyText, {
color: colors.white60,
});
diff --git a/gui/src/renderer/components/TooManyDevices.tsx b/gui/src/renderer/components/TooManyDevices.tsx
index 23ff399edb..954992acf3 100644
--- a/gui/src/renderer/components/TooManyDevices.tsx
+++ b/gui/src/renderer/components/TooManyDevices.tsx
@@ -54,7 +54,7 @@ const StyledTitle = styled.span(bigText, {
const StyledLabel = styled.span({
fontFamily: 'Open Sans',
- fontSize: '13px',
+ fontSize: '12px',
fontWeight: 600,
lineHeight: '20px',
color: colors.white,