File tree 2 files changed +0
-14
lines changed
ui/arduino/views/components
2 files changed +0
-14
lines changed Original file line number Diff line number Diff line change @@ -12,11 +12,7 @@ let splashTimestamp = null
12
12
function createWindow ( ) {
13
13
// Create the browser window.
14
14
win = new BrowserWindow ( {
15
- < << < << < HEAD
16
- width : 760 ,
17
- = === = ==
18
15
width : 820 ,
19
- > >>> > >> design / window - css - adjustments
20
16
height : 700 ,
21
17
webPreferences : {
22
18
nodeIntegration : false ,
Original file line number Diff line number Diff line change @@ -25,11 +25,6 @@ function generateFileList(source) {
25
25
< div class ="text ">
26
26
< input type ="text " onkeydown =${ onKeyEvent } onblur =${ ( e ) => emit ( 'finish-creating-file' , e . target . value ) } />
27
27
</ 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 >
33
28
</ div >
34
29
`
35
30
/* template for new folder item, with focussed input
@@ -40,11 +35,6 @@ function generateFileList(source) {
40
35
< div class ="text ">
41
36
< input type ="text " onkeydown =${ onKeyEvent } onblur =${ ( e ) => emit ( 'finish-creating-folder' , e . target . value ) } />
42
37
</ 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 >
48
38
</ div >
49
39
`
50
40
You can’t perform that action at this time.
0 commit comments