diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-01-03 15:18:24 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-01-03 15:18:24 +0100 |
| commit | 08639b4cdb2a55c11d603e25ea87335876fa9951 (patch) | |
| tree | 9e235db7aa7e603f3dda3513ce1f650717de83f1 | |
| parent | 5e72bac67addd36682443568de651fc05cd6e207 (diff) | |
| parent | d5ba22a35b6b81a1e295cff7ecadbd40a8f0c872 (diff) | |
| download | mullvadvpn-08639b4cdb2a55c11d603e25ea87335876fa9951.tar.xz mullvadvpn-08639b4cdb2a55c11d603e25ea87335876fa9951.zip | |
Merge branch 'change-custom-dns-icon'
| -rw-r--r-- | gui/assets/images/icon-check.svg | 3 | ||||
| -rw-r--r-- | gui/src/renderer/components/cell/Input.tsx | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gui/assets/images/icon-check.svg b/gui/assets/images/icon-check.svg new file mode 100644 index 0000000000..2289a19807 --- /dev/null +++ b/gui/assets/images/icon-check.svg @@ -0,0 +1,3 @@ +<svg data-name="Icons/Check" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"> + <path d="M12 24A12 12 0 0 1 3.515 3.515a12 12 0 1 1 16.97 16.97A11.922 11.922 0 0 1 12 24zM5.345 10.9a1.108 1.108 0 0 0-.785.322 1.095 1.095 0 0 0 0 1.556L9 17.177a1.115 1.115 0 0 0 1.569 0l8.874-8.8a1.095 1.095 0 0 0 0-1.556 1.116 1.116 0 0 0-1.569 0l-8.092 8.024-3.653-3.623a1.106 1.106 0 0 0-.784-.322z" style="fill:#294d73"/> +</svg> diff --git a/gui/src/renderer/components/cell/Input.tsx b/gui/src/renderer/components/cell/Input.tsx index c57d552866..fbc6849de3 100644 --- a/gui/src/renderer/components/cell/Input.tsx +++ b/gui/src/renderer/components/cell/Input.tsx @@ -205,7 +205,6 @@ const StyledInputWrapper = styled.div({}, (props: { marginLeft: number }) => ({ flex: 1, width: '171px', marginLeft: props.marginLeft + 'px', - marginRight: '25px', lineHeight: '24px', minHeight: '24px', fontFamily: 'Open Sans', @@ -229,7 +228,7 @@ const StyledTextArea = styled.textarea({}, (props: { invalid?: boolean }) => ({ fontWeight: 'normal', fontSize: '16px', resize: 'none', - padding: '14px 0', + padding: '14px 25px 14px 0', color: props.invalid ? colors.red : 'auto', })); @@ -238,6 +237,7 @@ const StyledInputFiller = styled.div({ overflowWrap: 'break-word', minHeight: '24px', color: 'transparent', + marginRight: '25px', }); interface IRowInputProps { @@ -328,10 +328,10 @@ export function RowInput(props: IRowInputProps) { </StyledInputWrapper> <StyledSubmitButton onClick={submit}> <ImageView - source="icon-tick" + source="icon-check" height={22} - tintColor={colors.green} - tintHoverColor={colors.green90} + tintColor={value === '' ? colors.blue60 : colors.blue} + tintHoverColor={value === '' ? colors.blue60 : colors.blue80} /> </StyledSubmitButton> </StyledCellInputRowContainer> |
