Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

This commit is contained in:
SJost 2018-09-15 11:24:10 +02:00
commit 8c2c1cb18f
2 changed files with 15 additions and 23 deletions

View File

@ -3,7 +3,6 @@
window.utils = window.utils || {}; window.utils = window.utils || {};
// allows for multiple file uploads with separate inputs
window.utils.tooltip = function(tt) { window.utils.tooltip = function(tt) {
var handle = tt.querySelector('.tooltip__handle'); var handle = tt.querySelector('.tooltip__handle');
var content = tt.querySelector('.tooltip__content'); var content = tt.querySelector('.tooltip__content');
@ -55,13 +54,15 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
// initialize tooltips set via `data-tooltip` // JS-TOOLTIPS NOT USED CURRENTLY.
Array.from(document.querySelectorAll('[data-tooltip]')).forEach(function(el) {
window.utils.tooltipFromAttribute(el) // initialize tooltips set via `data-tooltip`
}); // Array.from(document.querySelectorAll('[data-tooltip]')).forEach(function(el) {
// window.utils.tooltipFromAttribute(el)
// });
// initialize tooltips // initialize tooltips
Array.from(document.querySelectorAll('.js-tooltip')).forEach(function(tt) { // Array.from(document.querySelectorAll('.js-tooltip')).forEach(function(tt) {
window.utils.tooltip(tt); // window.utils.tooltip(tt);
}); // });
}); });

View File

@ -2,8 +2,8 @@
position: relative; position: relative;
display: inline-block; display: inline-block;
.hidden { &:hover .tooltip__content {
display: none; display: inline-block;
} }
} }
@ -17,15 +17,16 @@
color: white; color: white;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
cursor: default;
margin: 0 10px; margin: 0 10px;
cursor: default;
} }
.tooltip__content { .tooltip__content {
position: absolute; position: absolute;
display: none;
top: -10px; top: -10px;
transform: translateY(-100%); transform: translateY(-100%);
left: 3px; right: 3px;
width: 275px; width: 275px;
z-index: 10; z-index: 10;
background-color: #fafafa; background-color: #fafafa;
@ -33,16 +34,6 @@
padding: 13px 17px; padding: 13px 17px;
box-shadow: 0 0 20px 4px rgba(0, 0, 0, 0.1); box-shadow: 0 0 20px 4px rgba(0, 0, 0, 0.1);
&.to-left {
left: auto;
right: 3px;
&::after {
left: auto;
right: 10px;
}
}
&::after { &::after {
content: ''; content: '';
width: 16px; width: 16px;
@ -50,7 +41,7 @@
background-color: #fafafa; background-color: #fafafa;
transform: rotate(45deg); transform: rotate(45deg);
position: absolute; position: absolute;
left: 10px; right: 10px;
bottom: -8px; bottom: -8px;
} }
} }