summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-07-15 11:57:38 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-07-15 11:57:38 +0200
commitbd4f591f5fc56f383c8dbd437c748e36559cbed8 (patch)
treed3bea20295c4de0cd596548d440ecf302f86a85d
parenta4f671abfa8fc7c9bb3042e10af2396c536adb9f (diff)
parent233c4547e8eafa9f8437e2553a98058ca884a475 (diff)
downloadmullvadvpn-bd4f591f5fc56f383c8dbd437c748e36559cbed8.tar.xz
mullvadvpn-bd4f591f5fc56f383c8dbd437c748e36559cbed8.zip
Merge branch 'fix-location-list-entry-nearest-icon'
-rw-r--r--gui/src/renderer/components/LocationList.tsx15
1 files changed, 12 insertions, 3 deletions
diff --git a/gui/src/renderer/components/LocationList.tsx b/gui/src/renderer/components/LocationList.tsx
index 06c2221314..b3396fb578 100644
--- a/gui/src/renderer/components/LocationList.tsx
+++ b/gui/src/renderer/components/LocationList.tsx
@@ -1,4 +1,5 @@
import * as React from 'react';
+import styled from 'styled-components';
import { Component, View } from 'reactxp';
import { colors } from '../../config.json';
import {
@@ -210,6 +211,14 @@ export function SpecialLocations<T>(props: ISpecialLocationsProps<T>) {
);
}
+const StyledSpecialLocationCellButton = styled(Cell.CellButton)({
+ paddingLeft: '18px',
+});
+
+const StyledSpecialLocationIcon = styled(Cell.Icon)({
+ marginRight: '8px',
+});
+
interface ISpecialLocationProps<T> {
icon: SpecialLocationIcon;
value: T;
@@ -220,15 +229,15 @@ interface ISpecialLocationProps<T> {
export class SpecialLocation<T> extends Component<ISpecialLocationProps<T>> {
public render() {
return (
- <Cell.CellButton selected={this.props.isSelected} onClick={this.onSelect}>
- <Cell.Icon
+ <StyledSpecialLocationCellButton selected={this.props.isSelected} onClick={this.onSelect}>
+ <StyledSpecialLocationIcon
source={this.props.isSelected ? 'icon-tick' : this.props.icon}
tintColor={colors.white}
height={24}
width={24}
/>
<Cell.Label>{this.props.children}</Cell.Label>
- </Cell.CellButton>
+ </StyledSpecialLocationCellButton>
);
}