8000 Merge branch 'development' into feature/shortcuts · arduino/lab-micropython-editor@1560f07 · GitHub
[go: up one dir, main page]
Skip to content
/ lab-micropython-editor Public

Commit 1560f07

Browse files
ubidefeoubidefeo
committed
Merge branch 'development' into feature/shortcuts
2 parents afadd3f + 9baed62 commit 1560f07

File tree

10 files changed

+140
-14
lines changed

10 files changed

+140
-14
lines changed

‎package-lock.json

Lines changed: 3 additions & 3 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
@@ -40,7 +40,7 @@
4040
"license": "MIT",
4141
"dependencies": {
4242
"about-window": "^1.15.2",
43-
"micropython.js": "github:arduino/micropython.js#v1.5.0"
43+
"micropython.js": "github:arduino/micropython.js#v1.5.1"
4444
},
4545
"engines": {
4646
"node": "18"

‎ui/arduino/media/board.svg

Lines changed: 68 additions & 0 deletions
Loading

‎ui/arduino/media/computer.svg

Lines changed: 25 additions & 2 deletions
Loading

‎ui/arduino/media/editor.svg

Lines changed: 24 additions & 0 deletions
Loading

‎ui/arduino/media/files.svg

Lines changed: 2 additions & 3 deletions
Loading

‎ui/arduino/media/folder.svg

Lines changed: 14 additions & 2 deletions
Loading

‎ui/arduino/views/components/tabs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function Tabs(state, emit) {
44
${state.openFiles.map((file) => {
55
return Tab({
66
text: file.fileName,
7-
icon: file.source === 'board'? 'connect.svg': 'computer.svg',
7+
icon: file.source === 'board'? 'board.svg': 'computer.svg',
88
active: file.id === state.editingFile,
99
renaming: file.id === state.renamingTab,
1010
hasChanges: file.hasChanges,

‎ui/arduino/views/components/toolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function Toolbar(state, emit) {
5353
<div class="separator"></div>
5454
5555
${Button({
56-
icon: 'console.svg',
56+
icon: 'editor.svg',
5757
tooltip: 'Editor and REPL',
5858
active: state.view === 'editor',
5959
onClick: () => emit('change-view', 'editor')

‎ui/arduino/views/file-manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function FileManagerView(state, emit) {
1212
<div id="file-manager">
1313
<div id="board-files">
1414
<div class="device-header">
15-
<img class="icon" src="media/${state.isConnected?'connect':'disconnect'}.svg" />
15+
<img class="icon" src="media/${state.isConnected?'board':'disconnect'}.svg" />
1616
<div onclick=${() => emit('open-connection-dialog')} class="text">
1717
<span>${boardFullPath}</span>
1818
</div>

0 commit comments

Comments
 (0)
0