Merge branch 'develop' into login-signup-issue

This commit is contained in:
Cassie Tarakajian 2020-07-14 15:11:18 -04:00
commit 16860d76dd
4 changed files with 9 additions and 8 deletions

View file

@ -113,7 +113,7 @@
padding-right: #{20 / $base-font-size}rem;
& .nav__dropdown {
width: #{122 / $base-font-size}rem;
width: #{125 / $base-font-size}rem;
}
}

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "p5.js-web-editor",
"version": "1.0.4",
"version": "1.0.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,6 +1,6 @@
{
"name": "p5.js-web-editor",
"version": "1.0.4",
"version": "1.0.5",
"description": "The web editor for p5.js.",
"scripts": {
"clean": "rimraf dist",

View file

@ -86,13 +86,13 @@
"Password": "Password",
"ConfirmPassword": "Confirm Password",
"OpenedNewSketch": "Opened new sketch.",
"Hello": "Hello",
"Hello": "Hello",
"MyAccount": "My Account",
"My":"My",
"Sketches": "My sketches",
"Collections": "My collections",
"MySketches": "My Sketches",
"MyCollections": "My Collections",
"Asset": "Asset",
"MyAssets": "My assets",
"MyAssets": "My Assets",
"TitleAbout": "p5.js Web Editor | About",
"CodeEditing": "Code Editing",
"Error": "Error",
@ -109,7 +109,8 @@
"FindPreviousTextMatch": "Find Previous Text Match",
"Code editing keyboard shortcuts follow": "Code editing keyboard shortcuts follow",
"Sublime Text shortcuts": "Sublime Text shortcuts",
"WarningUnsavedChanges": "Are you sure you want to leave this page? You have unsaved changes."
"WarningUnsavedChanges": "Are you sure you want to leave this page? You have unsaved changes.",
"LogOut": "Log Out"
}