Skip to content

Commit f8af6ef

Browse files
authored
Merge branch 'develop' into updating-ptbr-translations
2 parents 32453f3 + 34123d5 commit f8af6ef

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

client/modules/IDE/components/Header/Toolbar.jsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ const Toolbar = (props) => {
113113

114114
<div className="toolbar__project-name-container">
115115
<ProjectName />
116+
{/* Still show owner if not you */}
117+
{project?.owner && !userIsOwner && (
118+
<p className="toolbar__project-owner">
119+
{t('Toolbar.By')}{' '}
120+
<Link to={`/${project.owner.username}/sketches`}>
121+
{project.owner.username}
122+
</Link>
123+
</p>
124+
)}
116125
</div>
117126

118127
<div style={{ flex: 1 }} />
@@ -127,16 +136,6 @@ const Toolbar = (props) => {
127136
</div>
128137
)}
129138

130-
{/* Still show owner if not you */}
131-
{project?.owner && !userIsOwner && (
132-
<p className="toolbar__project-owner">
133-
{t('Toolbar.By')}{' '}
134-
<Link to={`/${project.owner.username}/sketches`}>
135-
{project.owner.username}
136-
</Link>
137-
</p>
138-
)}
139-
140139
<VersionIndicator />
141140

142141
<button

client/styles/components/_toolbar.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
padding-left: #{math.div(10, $base-font-size)}rem;
132132
display: flex;
133133
align-items: center;
134-
gap: #{math.div(16, $base-font-size)}rem;
135134

136135
> section {
137136
display: flex;

common/p5Versions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const currentP5Version = '1.11.8'; // Don't update to 2.x until 2026
1+
export const currentP5Version = '1.11.10'; // Don't update to 2.x until 2026
22

33
// Generated from https://www.npmjs.com/package/p5?activeTab=versions
44
// Run this in the console:
@@ -10,6 +10,7 @@ export const p5Versions = [
1010
'2.0.2',
1111
'2.0.1',
1212
'2.0.0',
13+
'1.11.10',
1314
'1.11.9',
1415
'1.11.8',
1516
'1.11.7',

p5.js-web-editor

Lines changed: 0 additions & 1 deletion
This file was deleted.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.17.2",
3+
"version": "2.18.0",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

0 commit comments

Comments
 (0)