Skip to content

Commit 96b6747

Browse files
committed
Resolve discussions
1 parent 5d1c78c commit 96b6747

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

packages/app/src/app/pages/common/Modals/PreferencesModal/Appearance/EditorTheme/elements.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ export const BigTitle = styled.h2`
1212
export const PreferenceText = styled(PreferenceTextBase)`
1313
font-family: 'Source Code Pro';
1414
font-size: 0.8rem;
15+
width: 100%;
1516
`;

packages/app/src/app/pages/common/Modals/PreferencesModal/Appearance/EditorTheme/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import React, { FunctionComponent } from 'react';
33

44
import { useOvermind } from 'app/overmind';
55

6-
import { PaddedPreference, SubDescription, Rule } from '../../elements';
7-
6+
import { PaddedPreference, Rule, SubDescription } from '../../elements';
87
import { BigTitle, PreferenceText } from './elements';
98

109
export const EditorTheme: FunctionComponent = () => {

packages/app/src/app/pages/common/Modals/PreferencesModal/Appearance/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import React, { FunctionComponent } from 'react';
33
import { useOvermind } from 'app/overmind';
44

55
import {
6-
Title,
7-
SubContainer,
8-
PreferenceContainer,
96
PaddedPreference,
10-
SubDescription,
7+
PreferenceContainer,
118
Rule,
9+
SubContainer,
10+
SubDescription,
11+
Title,
1212
} from '../elements';
1313
import VSCodePlaceholder from '../VSCodePlaceholder';
1414

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import styled from 'styled-components';
2+
3+
import InputBase, { TextArea as TextAreaBase } from '../../Input';
4+
5+
export const Input = styled(InputBase)`
6+
width: 9rem;
7+
`;
8+
9+
export const TextArea = styled(TextAreaBase)`
10+
width: 9rem;
11+
`;

packages/common/src/components/Preference/PreferenceText.tsx renamed to packages/common/src/components/Preference/PreferenceText/index.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
FunctionComponent,
66
} from 'react';
77

8-
import Input, { TextArea } from '../Input';
8+
import { Input, TextArea } from './elements';
99

1010
type Props = {
1111
block?: boolean;
@@ -15,7 +15,6 @@ type Props = {
1515
setValue: (value: string) => void;
1616
value: string;
1717
} & Pick<ComponentProps<typeof Input>, 'style'>;
18-
1918
export const PreferenceText: FunctionComponent<Props> = ({
2019
isTextArea,
2120
placeholder,
@@ -28,10 +27,9 @@ export const PreferenceText: FunctionComponent<Props> = ({
2827
};
2928

3029
return createElement(isTextArea ? TextArea : Input, {
31-
style: { width: '9rem' },
32-
value,
33-
placeholder,
3430
onChange: handleChange,
31+
placeholder,
32+
value,
3533
...props,
3634
});
3735
};

0 commit comments

Comments
 (0)