Commit 35ccfcb2 authored by Prakhar Agarwal's avatar Prakhar Agarwal 🎯
Browse files

Merge branch 'emscripten' into show_side_help

parents ba24a0a8 7450a8f6
......@@ -261,6 +261,9 @@ li .hr{
text-decoration: none;
}
#console-header {
height: 50px;
}
.patch{
flex-basis: 100%;
background-color: #f6f6f6;
......
......@@ -91,24 +91,24 @@
<!-- Console window -->
<div class="card d-flex justify-content-between" id="console-window">
<div class="card-header d-flex justify-content-between">
<h5 class="h-100 w-25" id= "console-heading" onclick="rotate(this)">
<a data-toggle="collapse" data-parent="#windows" href="#console_bottom" class="d-flex align-items-center text-dark">Console
<i class="ml-2 fa fa-angle-double-down text-primary rotate-transition"S id="open-icon"></i>
<div class="card-header d-flex justify-content-between align-items-center" id="console-header">
<h5 class="d-flex align-items-center" id= "console-heading" onclick="rotate(this)">
<a data-toggle="collapse" data-parent="#windows" href="#console_bottom" class="text-dark d-flex align-items-center">Console
<i class="ml-2 fa fa-angle-double-down text-primary rotate-transition" id="open-icon"></i>
</a>
</h5>
<div class="console-find-webapp" id="console_find" style="display: none;">
<div class="d-flex justify-content-end">
<div class="d-flex justify-content-end align-items-center">
<label><input type="text" id="console_find_text" name="console_find_text" defaultValue="Search in Console" style="width: 15em;" placeholder="Search in Console" /> </label>
<label class="highlight-find align-self-center" style = "color: #6c757d">
<label class="highlight-find d-flex align-items-center" style = "color: #6c757d">
Highlight All
<input type="checkbox" id="console_find_highlight" name="console_find_highlight" onchange="console_find_highlight_all(this);" />
<input class="m-1" type="checkbox" id="console_find_highlight" name="console_find_highlight" onchange="console_find_highlight_all(this);" />
</label>
</div>
</div>
<i class='fa fa-trash ml-3 text-primary' style='cursor:pointer' id='clear' data-toggle="tooltip" title="Clear Console"></i>
<i class='fa fa-trash ml-3 text-primary' style='cursor:pointer' id='clear' data-toggle="tooltip" title="Clear Console"></i>
</div>
<div class="collapse show" id="console_bottom">
......@@ -505,11 +505,13 @@
//Rotate Icon
function rotate(elmnt) {
var cons_head = elmnt.id === "console-heading";
if (cons_head) {
document.getElementById("open-icon").classList.toggle("rotate");
} else {
elmnt.classList.toggle("rotate");
switch (elmnt.id) {
case "console-heading":
document.getElementById("open-icon").classList.toggle("rotate");
break;
case "sidebar-col-icon":
elmnt.classList.toggle("rotate");
break;
}
}
......
......@@ -13,6 +13,12 @@ function load_menu_actions(){
// File sub-entries
minit("file-message",{onclick: function(){pdbundle.pdgui.menu_send()}});
minit("file-open",{onclick: function(){
// show sidebar
$("#sidebar").collapse("show");
$("#sidebar-col-icon").removeClass("rotate");
}});
// Edit entries
minit("edit-copy", {
onclick: function() {
......
......@@ -2119,7 +2119,7 @@ function update_file_ls(){
// Add open button
a.onclick = function(){open_patch(file)};
li.append(a);
li.classList.add("d-inline-block");
li.classList.add("d-block");
li.classList.add("text-truncate");
li.style.maxWidth = "150px";
file_ls.append(li);
......@@ -5728,6 +5728,9 @@ function open_prefs() {
} else {
dialog_raise("prefs");
}
// show sidebar
$("#sidebar").collapse("show");
$("#sidebar-col-icon").removeClass("rotate");
}
exports.open_prefs = open_prefs;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment