Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
This commit is contained in:
commit
aa6617e8a9
@ -82,7 +82,7 @@
|
|||||||
frame.setAttribute('id', "frame-" + modal.getAttribute('id'));
|
frame.setAttribute('id', "frame-" + modal.getAttribute('id'));
|
||||||
modal.insertBefore(frame, null);
|
modal.insertBefore(frame, null);
|
||||||
|
|
||||||
frame.onload = function() {
|
var resizeFrame = function() {
|
||||||
frame.style.visibility = 'hidden';
|
frame.style.visibility = 'hidden';
|
||||||
frame.style.height = '0';
|
frame.style.height = '0';
|
||||||
|
|
||||||
@ -90,12 +90,18 @@
|
|||||||
var body = doc.body, html = doc.documentElement;
|
var body = doc.body, html = doc.documentElement;
|
||||||
var height = Math.max( body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight );
|
var height = Math.max( body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight );
|
||||||
|
|
||||||
frame.style.height = "calc(" + (height + "px") + " + 1em)";
|
frame.style.height = height.toPrecision() + "px";
|
||||||
frame.style.visibility = 'visible';
|
frame.style.visibility = 'visible';
|
||||||
|
frame.setAttribute("scrolling", "no");
|
||||||
|
|
||||||
doc.querySelectorAll("form").forEach(function(form) {
|
doc.querySelectorAll("form").forEach(function(form) {
|
||||||
form.setAttribute("target", "_top");
|
form.setAttribute("target", "_top");
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
frame.onload = function() {
|
||||||
|
frame.contentWindow.onresize = resizeFrame;
|
||||||
|
resizeFrame();
|
||||||
}
|
}
|
||||||
|
|
||||||
var url = "";
|
var url = "";
|
||||||
|
|||||||
@ -4,14 +4,14 @@ div.modal {
|
|||||||
top: 50%;
|
top: 50%;
|
||||||
transform: translate(-50%, -50%) scale(0.8, 0.8);
|
transform: translate(-50%, -50%) scale(0.8, 0.8);
|
||||||
display: block;
|
display: block;
|
||||||
background-color: rgba(255, 255, 255, 0.99);
|
background-color: rgba(255, 255, 255, 1);
|
||||||
min-width: 60vw;
|
min-width: 60vw;
|
||||||
min-height: 100px;
|
min-height: 100px;
|
||||||
max-height: calc(100vh - 30px);
|
max-height: calc(100vh - 30px);
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
color: var(--color-font);
|
color: var(--color-font);
|
||||||
padding: 20px;
|
/* padding: 20px; */
|
||||||
padding-right: 65px;
|
padding-right: 65px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
transition: all .15s ease;
|
transition: all .15s ease;
|
||||||
@ -29,8 +29,11 @@ div.modal {
|
|||||||
height: calc(60vh);
|
height: calc(60vh);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-style: none;
|
border-style: none;
|
||||||
scroll: auto;
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
|
[scrolling='no'] {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
.js-tooltip {
|
.js-tooltip {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
height: 1.5rem;
|
||||||
|
vertical-align: -0.375rem;
|
||||||
|
|
||||||
&:hover .tooltip__content {
|
&:hover .tooltip__content {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|||||||
@ -6,10 +6,11 @@ $case formLayout
|
|||||||
$# TODO: add class 'form-group--submit' if this is the submit-button view
|
$# TODO: add class 'form-group--submit' if this is the submit-button view
|
||||||
<div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
|
<div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
|
||||||
$if not (Blaze.null $ fvLabel view)
|
$if not (Blaze.null $ fvLabel view)
|
||||||
<label .form-group__label for=#{fvId view}>#{fvLabel view}
|
<label .form-group__label for=#{fvId view}>
|
||||||
|
#{fvLabel view}
|
||||||
|
$maybe tooltip <- fvTooltip view
|
||||||
|
<div .js-tooltip>
|
||||||
|
<div .tooltip__handle>
|
||||||
|
<div .tooltip__content>^{tooltip}
|
||||||
<div .form-group__input>
|
<div .form-group__input>
|
||||||
^{fvInput view}
|
^{fvInput view}
|
||||||
$maybe tooltip <- fvTooltip view
|
|
||||||
<div .js-tooltip>
|
|
||||||
<div .tooltip__handle>
|
|
||||||
<div .tooltip__content>^{tooltip}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user