summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-08-19 12:17:26 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-08-19 12:17:26 +0200
commit31eb2a41a9fec39f121ec891aee96200fd7990d7 (patch)
tree8cc516260cf3b63c3aeb24ee22b9e58f6ac7baec
parent9c7f21dc4c2cd7e57bebec950975766534f19153 (diff)
parentef02b3b396b9dfd55d3c7028f37f0216537e70bf (diff)
downloadmullvadvpn-31eb2a41a9fec39f121ec891aee96200fd7990d7.tar.xz
mullvadvpn-31eb2a41a9fec39f121ec891aee96200fd7990d7.zip
Merge branch 'change-font-weight-to-normal-in-lists' into master
-rw-r--r--gui/src/renderer/components/CityRow.tsx3
-rw-r--r--gui/src/renderer/components/CountryRow.tsx3
-rw-r--r--gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx2
-rw-r--r--gui/src/renderer/components/RelayRow.tsx3
-rw-r--r--gui/src/renderer/components/Selector.tsx8
5 files changed, 18 insertions, 1 deletions
diff --git a/gui/src/renderer/components/CityRow.tsx b/gui/src/renderer/components/CityRow.tsx
index c8ad23f071..2c14a731c0 100644
--- a/gui/src/renderer/components/CityRow.tsx
+++ b/gui/src/renderer/components/CityRow.tsx
@@ -35,6 +35,9 @@ const StyledChevronButton = styled(ChevronButton)({
});
const Label = styled(Cell.Label)({
+ fontFamily: 'Open Sans',
+ fontWeight: 'normal',
+ fontSize: '16px',
'[disabled] &': {
color: colors.white20,
},
diff --git a/gui/src/renderer/components/CountryRow.tsx b/gui/src/renderer/components/CountryRow.tsx
index 198a195309..ed6844fc6e 100644
--- a/gui/src/renderer/components/CountryRow.tsx
+++ b/gui/src/renderer/components/CountryRow.tsx
@@ -42,6 +42,9 @@ const StyledChevronButton = styled(ChevronButton)({
});
const Label = styled(Cell.Label)({
+ fontFamily: 'Open Sans',
+ fontWeight: 'normal',
+ fontSize: '16px',
'[disabled] &': {
color: colors.white20,
},
diff --git a/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx b/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
index b018221932..f66c83a38d 100644
--- a/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/LinuxSplitTunnelingSettings.tsx
@@ -64,7 +64,9 @@ const StyledIcon = styled(Cell.UntintedIcon)(disabledApplication, {
});
const StyledCellLabel = styled(Cell.Label)(disabledApplication, {
+ fontFamily: 'Open Sans',
fontWeight: 'normal',
+ fontSize: '16px',
});
const StyledIconPlaceholder = styled.div({
diff --git a/gui/src/renderer/components/RelayRow.tsx b/gui/src/renderer/components/RelayRow.tsx
index 8069679cbc..850290e4f6 100644
--- a/gui/src/renderer/components/RelayRow.tsx
+++ b/gui/src/renderer/components/RelayRow.tsx
@@ -21,6 +21,9 @@ const Button = styled(Cell.CellButton)((props: { selected: boolean }) => ({
}));
const Label = styled(Cell.Label)({
+ fontFamily: 'Open Sans',
+ fontWeight: 'normal',
+ fontSize: '16px',
'[disabled] &': {
color: colors.white20,
},
diff --git a/gui/src/renderer/components/Selector.tsx b/gui/src/renderer/components/Selector.tsx
index 2ba66ece29..155509e7fa 100644
--- a/gui/src/renderer/components/Selector.tsx
+++ b/gui/src/renderer/components/Selector.tsx
@@ -58,6 +58,12 @@ const StyledCellIcon = styled(Cell.Icon)((props: { visible: boolean }) => ({
marginRight: '8px',
}));
+const StyledLabel = styled(Cell.Label)({
+ fontFamily: 'Open Sans',
+ fontWeight: 'normal',
+ fontSize: '16px',
+});
+
interface ISelectorCellProps<T> {
value: T;
selected: boolean;
@@ -80,7 +86,7 @@ export class SelectorCell<T> extends React.Component<ISelectorCellProps<T>> {
height={24}
tintColor={colors.white}
/>
- <Cell.Label>{this.props.children}</Cell.Label>
+ <StyledLabel>{this.props.children}</StyledLabel>
</Cell.CellButton>
);
}