Skip to content

Commit

Permalink
Remove Symlink option for non-Windows (gorilla-devs#1097)
Browse files Browse the repository at this point in the history
* Memory Slider style fix

* Don't make the Symlink option accessible to non-Windows
Doesn't work on MacOS / Linux
Is not needed anyways there

* Fix Changelog same key error
  • Loading branch information
Eskaan authored Oct 7, 2021
1 parent 7cf4f3a commit 7d8289b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
15 changes: 9 additions & 6 deletions src/common/modals/ChangeLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,10 @@ const ChangeLogs = () => {
</SectionTitle>
<div>
<ul>
{data.new.map(item => (
{data.new.map((item, index) => (
<UpdateRow
key={item.header}
/* eslint-disable-next-line react/no-array-index-key */
key={index}
header={item.header}
content={item.content}
/>
Expand Down Expand Up @@ -281,9 +282,10 @@ const ChangeLogs = () => {
</SectionTitle>
<div>
<ul>
{data.improvements.map(item => (
{data.improvements.map((item, index) => (
<UpdateRow
key={item.header}
/* eslint-disable-next-line react/no-array-index-key */
key={index}
header={item.header}
content={item.content}
/>
Expand Down Expand Up @@ -315,9 +317,10 @@ const ChangeLogs = () => {
</SectionTitle>
<div>
<ul ref={intersectionObserverRef}>
{data.bugfixes.map(item => (
{data.bugfixes.map((item, index) => (
<UpdateRow
key={item.header}
/* eslint-disable-next-line react/no-array-index-key */
key={index}
header={item.header}
content={item.content}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/common/modals/InstanceManager/Overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const JavaManagerRow = styled.div`
`;

const JavaMemorySlider = styled(Slider)`
margin: 30px 0 55px 0;
margin: 30px 10px 55px 0 !important;
`;

const JavaResetButton = styled(Button)`
Expand Down
15 changes: 7 additions & 8 deletions src/common/modals/Settings/components/Java.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export default function MyAccountPreferences() {
</Paragraph>
<Slider
css={`
margin: 20px 20px 20px 0;
margin: 20px 20px 20px 0 !important;
`}
onAfterChange={e => {
dispatch(updateJavaMemory(e));
Expand Down Expand Up @@ -464,14 +464,13 @@ export default function MyAccountPreferences() {
<Select
value={mcStartupMethod}
onChange={v => dispatch(updateMcStartupMethod(v))}
disabled={process.platform !== 'win32'}
>
{Object.entries(MC_STARTUP_METHODS).map(([k, v]) => {
return (
<Select.Option key={k} value={k}>
{v}
</Select.Option>
);
})}
{Object.entries(MC_STARTUP_METHODS).map(([k, v]) => (
<Select.Option key={k} value={k}>
{v}
</Select.Option>
))}
</Select>
</McStartupMethodRow>
</McStartupMethod>
Expand Down

0 comments on commit 7d8289b

Please sign in to comment.