GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix editor buttons overlapping field content

Browse source 
https://anki.tenderapp.com/discussions/ankidesktop/31235-editor-second-row-for-buttons-feature-request
This commit is contained in:
Damien Elmes 2018-12-03 09:54:51 +10:00
parent 429cb2ce7f
commit 2c30ad9593
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aqt/editor.py
View file

@ -35,7 +35,7 @@ _html = """
html { background: %s; } html { background: %s; }
#topbuts { background: %s; } #topbuts { background: %s; }
</style> </style>
<div id="topbuts">%s</div> <div id="topbutsOuter"><div id="topbuts" class="clearfix">%s</div></div>
<div id="fields"></div> <div id="fields"></div>
<div id="dupes" style="display:none;"><a href="#" onclick="pycmd('dupes');return false;">%s</a></div> <div id="dupes" style="display:none;"><a href="#" onclick="pycmd('dupes');return false;">%s</a></div>
""" """

10
web/editor.css
View file

@ -6,13 +6,10 @@
overflow-wrap: break-word; overflow-wrap: break-word;
} }
/* prevent floated images from being displayed outside field */ .clearfix:after {
.field:after {
content: ""; content: "";
display: block; display: table;
height: 0;
clear: both; clear: both;
visibility: hidden;
} }
.fname { .fname {
@ -28,7 +25,7 @@ body {
margin: 5px; margin: 5px;
} }
#topbuts { #topbutsOuter {
position: fixed; position: fixed;
height: 24px; height: 24px;
top: 0; top: 0;
@ -40,6 +37,7 @@ body {
.topbut { .topbut {
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-top: 4px;
} }
.rainbow { .rainbow {

14
web/editor.js
View file

@ -297,7 +297,7 @@ function setFields(fields) {
} }
txt += "<tr><td class=fname>{0}</td></tr><tr><td width=100%>".format(n); txt += "<tr><td class=fname>{0}</td></tr><tr><td width=100%>".format(n);
txt += "<div id=f{0} onkeydown='onKey();' oninput='onInput()' onmouseup='onKey();'".format(i); txt += "<div id=f{0} onkeydown='onKey();' oninput='onInput()' onmouseup='onKey();'".format(i);
txt += " onfocus='onFocus(this);' onblur='onBlur();' class=field "; txt += " onfocus='onFocus(this);' onblur='onBlur();' class='field clearfix' ";
txt += "ondragover='onDragOver(this);' onpaste='onPaste(this);' "; txt += "ondragover='onDragOver(this);' onpaste='onPaste(this);' ";
txt += "oncopy='onCutOrCopy(this);' oncut='onCutOrCopy(this);' "; txt += "oncopy='onCutOrCopy(this);' oncut='onCutOrCopy(this);' ";
txt += "contentEditable=true class=field>{0}</div>".format(f); txt += "contentEditable=true class=field>{0}</div>".format(f);
@ -448,6 +448,12 @@ var filterNode = function (node, extendedMode) {
} }
}; };
var adjustFieldsTopMargin = function() {
var topHeight = $("#topbuts").height();
var margin = topHeight + 8;
document.getElementById("fields").style.marginTop = margin + "px";
};
var mouseDown = 0; var mouseDown = 0;
$(function () { $(function () {
@ -477,4 +483,10 @@ $(function () {
$("button.linkb").on("mousedown", function (e) { $("button.linkb").on("mousedown", function (e) {
e.preventDefault(); e.preventDefault();
}); });
window.onresize = function() {
adjustFieldsTopMargin();
};
adjustFieldsTopMargin();
}); });