Skip to content

Commit 3eb83b0

Browse files
amitch6097amitch6097
authored andcommitted
Merge branch 'master' into Issue#1246
2 parents 2bd0848 + ec7c2d1 commit 3eb83b0

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

client/modules/IDE/components/PreviewFrame.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,10 @@ class PreviewFrame extends React.Component {
334334
}
335335

336336
renderSketch() {
337-
this.props.clearConsole();
338337
const doc = this.iframeElement;
339338
const localFiles = this.injectLocalFiles();
340339
if (this.props.isPlaying) {
340+
this.props.clearConsole();
341341
srcDoc.set(doc, localFiles);
342342
if (this.props.endSketchRefresh) {
343343
this.props.endSketchRefresh();

client/modules/IDE/components/Toolbar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Toolbar extends React.Component {
116116
}
117117
}}
118118
>
119-
{this.props.project.name} 
119+
<span>{this.props.project.name}</span>
120120
{
121121
this.canEditProjectName() &&
122122
<InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" />

client/modules/IDE/pages/IDEView.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ class IDEView extends React.Component {
191191
<Toolbar />
192192
{this.props.ide.preferencesIsVisible &&
193193
<Overlay
194+
title="Settings"
194195
ariaLabel="settings"
195196
closeOverlay={this.props.closePreferences}
196197
>
@@ -389,6 +390,7 @@ class IDEView extends React.Component {
389390
}
390391
{ this.props.location.pathname === '/about' &&
391392
<Overlay
393+
title="About"
392394
previousPath={this.props.ide.previousPath}
393395
ariaLabel="about"
394396
>
@@ -397,6 +399,7 @@ class IDEView extends React.Component {
397399
}
398400
{ this.props.location.pathname === '/feedback' &&
399401
<Overlay
402+
title="Submit Feedback"
400403
previousPath={this.props.ide.previousPath}
401404
ariaLabel="submit-feedback"
402405
>
@@ -405,6 +408,7 @@ class IDEView extends React.Component {
405408
}
406409
{ this.props.ide.shareModalVisible &&
407410
<Overlay
411+
title="Share"
408412
ariaLabel="share"
409413
closeOverlay={this.props.closeShareModal}
410414
>
@@ -417,6 +421,7 @@ class IDEView extends React.Component {
417421
}
418422
{ this.props.ide.keyboardShortcutVisible &&
419423
<Overlay
424+
title="Keyboard Shortcuts"
420425
ariaLabel="keyboard shortcuts"
421426
closeOverlay={this.props.closeKeyboardShortcutModal}
422427
>
@@ -425,6 +430,7 @@ class IDEView extends React.Component {
425430
}
426431
{ this.props.ide.errorType &&
427432
<Overlay
433+
title="Error"
428434
ariaLabel="error"
429435
closeOverlay={this.props.hideErrorModal}
430436
>

client/styles/components/_toolbar.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
}
7575
margin-left: #{10 / $base-font-size}rem;
7676
padding-left: #{10 / $base-font-size}rem;
77-
height: 70%;
7877
display: flex;
7978
align-items: center;
8079
}
@@ -90,7 +89,8 @@
9089
}
9190
}
9291
cursor: pointer;
93-
line-height: #{18 / $base-font-size}rem;
92+
display: flex;
93+
align-items: center;
9494

9595
.toolbar__project-name-container--editing & {
9696
display: none;
@@ -151,7 +151,6 @@
151151
display: inline-block;
152152
vertical-align: top;
153153
height: #{18 / $base-font-size}rem;
154-
margin-left: #{-4 / $base-font-size}rem;
155154
& svg {
156155
width: #{18 / $base-font-size}rem;
157156
height: #{18 / $base-font-size}rem;

developer_docs/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
This folder contains documents intended for developers of the p5.js Web Editor.
22

33
## List of Documents
4-
* [Installation](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/installation.md) - A guide for setting up your development environment
5-
* [Development](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/development.md) - A guide for adding code to the web editor
6-
* [Preparing a pull-request](https://github.com/processing/p5.js/blob/master/developer_docs/preparing_a_pull_request.md) - Instructions for how to make a pull-request
7-
* [Accessibility Guidelines](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/accessibility.md) - Guidelines for writing code to create an accessible application
8-
* [Deployment](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/deployment.md) - A guide to production deployment, and all platforms that are being used.
4+
* [Installation](installation.md) - A guide for setting up your development environment
5+
* [Development](development.md) - A guide for adding code to the web editor
6+
* [Preparing a pull-request](preparing_a_pull_request.md) - Instructions for how to make a pull-request
7+
* [Accessibility Guidelines](accessibility.md) - Guidelines for writing code to create an accessible application
8+
* [Deployment](deployment.md) - A guide to production deployment, and all platforms that are being used.
99

1010
## Documents to Create
1111
* Design Principles - reference [p5.js design principles](https://github.com/processing/p5.js/edit/master/developer_docs/design_principles.md)
1212
* Issue Labels - reference [p5.js issue labels](https://github.com/processing/p5.js/blob/master/developer_docs/issue_labels.md)
13-
* File Structure - An explanation of the file structure of this application.
13+
* File Structure - An explanation of the file structure of this application.

0 commit comments

Comments
 (0)