Skip to content

Commit 14c2bd5

Browse files
committed
clean up input and button sizes
1 parent de6fafa commit 14c2bd5

File tree

2 files changed

+6
-27
lines changed

2 files changed

+6
-27
lines changed

public/javascripts/occ_editor.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -237,20 +237,6 @@
237237
return "Please confirm that you would like to leave the editor.";
238238
});
239239

240-
$(document).on('click', '#editor, #editor-bar, #navigator', function() {
241-
occEditor.focus_terminal(false);
242-
//if (terminal_win) {
243-
//terminal_win.blur();
244-
//}
245-
});
246-
247-
editor.on('focus', function() {
248-
occEditor.focus_terminal(false);
249-
//if (terminal_win) {
250-
// terminal_win.blur();
251-
//}
252-
});
253-
254240
editor_startup("Initializing Editor Events");
255241
editor.on('change', function() {
256242
var $file_element = $('.filesystem li.file-open');
@@ -583,12 +569,8 @@
583569
occEditor.focus_terminal = function(should_focus) {
584570
if (should_focus) {
585571
$('.bar').css('background-color', '#2c58bd');
586-
//$('#editor-output-wrapper').css({ 'opacity' : 1 });
587-
//$('#editor, #editor-bar').css({ 'opacity' : 0.95 });
588572
} else {
589573
$('.bar').css('background-color', '#323233');
590-
//$('#editor-output-wrapper').css({ 'opacity' : 0.95 });
591-
//$('#editor, #editor-bar').css({ 'opacity' : 1 });
592574
}
593575
};
594576

@@ -808,8 +790,7 @@
808790

809791
occEditor.send_terminal_command = function(command) {
810792
if (is_terminal_open) {
811-
window.term.writeln(command);
812-
editor.focus();
793+
term.send(JSON.stringify({type: "input", data: command}));
813794
}
814795
};
815796

@@ -835,7 +816,7 @@
835816

836817
function run_command(command) {
837818
console.log("sending command: " + command);
838-
term.send(JSON.stringify({type: "input", data: command}));
819+
occEditor.send_terminal_command(command);
839820
}
840821

841822
// Clean terminal

public/stylesheets/app.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ a.navigator-settings i.settings-enabled {
334334
color: #E4E5E7 !important;
335335
background-color: #087BD1;
336336
font-size: 11px;
337-
margin: 2px 2px 0 0;
337+
margin: 6px 6px 0 0;
338338
padding: 3px 7px 3px 7px;
339339
-webkit-border-radius: 3px;
340340
-moz-border-radius: 3px;
@@ -346,6 +346,9 @@ a.navigator-settings i.settings-enabled {
346346
}
347347

348348
.create-input-wrapper input[type='text'], .rename-input-wrapper input[type='text'] {
349+
width: 185px;
350+
margin: 5px;
351+
height: 30px;
349352
background-color: #FFFFFF;
350353
border: none;
351354
-webkit-box-shadow: none;
@@ -357,11 +360,6 @@ a.navigator-settings i.settings-enabled {
357360
transition: none;
358361
}
359362

360-
.create-input-wrapper input[type='text'] {
361-
width: 185px;
362-
margin: 5px;
363-
}
364-
365363
.rename-input-wrapper {
366364
width: 100%;
367365
padding: -2px 0 0 0;

0 commit comments

Comments
 (0)