Skip to content

Commit 16860d7

Browse files
committed
Merge branch 'develop' into login-signup-issue
2 parents fd06f5f + 4b3e005 commit 16860d7

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

client/styles/components/_nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
padding-right: #{20 / $base-font-size}rem;
114114

115115
& .nav__dropdown {
116-
width: #{122 / $base-font-size}rem;
116+
width: #{125 / $base-font-size}rem;
117117
}
118118
}
119119

package-lock.json

Lines changed: 1 addition & 1 deletion
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": "1.0.4",
3+
"version": "1.0.5",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

translations/locales/en-US/translations.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
"Password": "Password",
8787
"ConfirmPassword": "Confirm Password",
8888
"OpenedNewSketch": "Opened new sketch.",
89-
"Hello": "Hello",
89+
"Hello": "Hello",
9090
"MyAccount": "My Account",
9191
"My":"My",
92-
"Sketches": "My sketches",
93-
"Collections": "My collections",
92+
"MySketches": "My Sketches",
93+
"MyCollections": "My Collections",
9494
"Asset": "Asset",
95-
"MyAssets": "My assets",
95+
"MyAssets": "My Assets",
9696
"TitleAbout": "p5.js Web Editor | About",
9797
"CodeEditing": "Code Editing",
9898
"Error": "Error",
@@ -109,7 +109,8 @@
109109
"FindPreviousTextMatch": "Find Previous Text Match",
110110
"Code editing keyboard shortcuts follow": "Code editing keyboard shortcuts follow",
111111
"Sublime Text shortcuts": "Sublime Text shortcuts",
112-
"WarningUnsavedChanges": "Are you sure you want to leave this page? You have unsaved changes."
112+
"WarningUnsavedChanges": "Are you sure you want to leave this page? You have unsaved changes.",
113+
"LogOut": "Log Out"
113114

114115
}
115116

0 commit comments

Comments
 (0)