Skip to content

Commit 1990c39

Browse files
committed
Merged monocle PR joseph/Monocle#106 into our own fork
Zero width in marginal pannels
1 parent b1317e6 commit 1990c39

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

html/monocle/scripts/monocore.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4591,8 +4591,12 @@ Monocle.Panels.Marginal = function (flipper, evtCallbacks) {
45914591
var sheaf = page.m.sheafDiv;
45924592
var bw = sheaf.offsetLeft;
45934593
var fw = page.offsetWidth - (sheaf.offsetLeft + sheaf.offsetWidth);
4594-
bw = Math.floor(((bw - 2) / page.offsetWidth) * 10000 / 100) + "%";
4595-
fw = Math.floor(((fw - 2) / page.offsetWidth) * 10000 / 100) + "%";
4594+
//bw = Math.floor(((bw - 2) / page.offsetWidth) * 10000 / 100) + "%";
4595+
//fw = Math.floor(((fw - 2) / page.offsetWidth) * 10000 / 100) + "%";
4596+
bw = Math.round(((bw - 2) / page.offsetWidth) * 10000 / 100 );
4597+
fw = Math.round(((fw - 2) / page.offsetWidth) * 10000 / 100 );
4598+
bw = Math.max(bw, 5) + "%";
4599+
fw = Math.max(fw, 5) + "%";
45964600
p.panels.forwards.properties.div.style.width = fw;
45974601
p.panels.backwards.properties.div.style.width = bw;
45984602
}

ui/Server.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ HttpServer {
4141
var locus = getBookSetting("locus")
4242
if (locus == undefined)
4343
locus = null
44-
console.log("locus: " + JSON.stringify(locus));
4544
response.write("SAVED_PLACE = " + JSON.stringify(locus) + ";\n")
4645

4746
response.end()

0 commit comments

Comments
 (0)