Skip to content

Commit f93259e

Browse files
authored
Merge branch 'develop' into hindi-translation-fix
2 parents e34afbb + 411ff89 commit f93259e

33 files changed

+40
-1537
lines changed

.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ MAILGUN_KEY=<your-mailgun-api-key>
1919
ML5_LIBRARY_USERNAME=ml5
2020
ML5_LIBRARY_EMAIL=examples@ml5js.org
2121
ML5_LIBRARY_PASS=helloml5
22-
MOBILE_ENABLED=true
2322
MONGO_URL=mongodb://localhost:27017/p5js-web-editor
2423
PORT=8000
2524
PREVIEW_PORT=8002

client/components/mobile/IconButton.jsx renamed to client/common/IconButton.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import styled from 'styled-components';
4-
import Button from '../../common/Button';
5-
import { remSize } from '../../theme';
4+
import Button from './Button';
5+
import { remSize } from '../theme';
66

77
const ButtonWrapper = styled(Button)`
88
width: ${remSize(48)};

client/components/Dropdown.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import styled from 'styled-components';
44
import { remSize, prop } from '../theme';
5-
import IconButton from './mobile/IconButton';
5+
import IconButton from '../common/IconButton';
66

77
const DropdownWrapper = styled.ul`
88
background-color: ${prop('Modal.background')};

client/components/mobile/ActionStrip.jsx

Lines changed: 0 additions & 56 deletions
This file was deleted.

client/components/mobile/Explorer.jsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

client/components/mobile/FloatingNav.jsx

Lines changed: 0 additions & 44 deletions
This file was deleted.

client/components/mobile/Footer.jsx

Lines changed: 0 additions & 17 deletions
This file was deleted.

client/components/mobile/Header.jsx

Lines changed: 0 additions & 121 deletions
This file was deleted.

client/components/mobile/IDEWrapper.jsx

Lines changed: 0 additions & 12 deletions
This file was deleted.

client/components/mobile/MobileScreen.jsx

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)