Skip to content

Commit 37c4dcb

Browse files
committed
Fixed glitch on new file/folder creation in FM.
Signed-off-by: ubi de feo <[email protected]>
1 parent 2387313 commit 37c4dcb

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

index.js

-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ let splashTimestamp = null
1212
function createWindow () {
1313
// Create the browser window.
1414
win = new BrowserWindow({
15-
<<<<<<< HEAD
16-
width: 760,
17-
=======
1815
width: 820,
19-
>>>>>>> design/window-css-adjustments
2016
height: 700,
2117
webPreferences: {
2218
nodeIntegration: false,

ui/arduino/views/components/file-list.js

-10
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ function generateFileList(source) {
2525
<div class="text">
2626
<input type="text" onkeydown=${onKeyEvent} onblur=${(e) => emit('finish-creating-file', e.target.value)}/>
2727
</div>
28-
<div class="popup-menu">
29-
<div class="popup-menu-item">rename</div>
30-
<div class="popup-menu-item">delete</div>
31-
<div class="popup-menu-item">upload</div>
32-
</div>
3328
</div>
3429
`
3530
/* template for new folder item, with focussed input
@@ -40,11 +35,6 @@ function generateFileList(source) {
4035
<div class="text">
4136
<input type="text" onkeydown=${onKeyEvent} onblur=${(e) => emit('finish-creating-folder', e.target.value)}/>
4237
</div>
43-
<div class="popup-menu">
44-
<div class="popup-menu-item">rename</div>
45-
<div class="popup-menu-item">delete</div>
46-
<div class="popup-menu-item">upload</div>
47-
</div>
4838
</div>
4939
`
5040

0 commit comments

Comments
 (0)