Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: mouseover

Browse Source
This commit is contained in:
cutls 2019-10-20 13:27:19 +09:00
parent 81a3da550f
commit 8784cae01c
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/css/tl.css
View File

@ -227,6 +227,18 @@ iframe,
grid-template-rows: auto 1.6rem 1fr auto 2.5rem; grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side"; grid-template-areas: "notice notice notice" "icon display_name display_name" "space toot toot" "space additional additional" "vis actions side";
} }
.hide-actions{
grid-template-rows: auto 1.6rem 1fr auto 0;
}
.hide-actions .area-actions{
display:none;
}
.hide-actions .area-vis{
display:none;
}
.hide-actions .area-side{
display:none;
}
.cvo h1, .cvo h1,
.cvo h2, .cvo h2,
.cvo h3, .cvo h3,
@ -325,6 +337,7 @@ iframe,
margin: 2px; margin: 2px;
grid-area: side; grid-area: side;
} }
.quote-inline { .quote-inline {
display: none; display: none;
} }

20
app/js/tl/card.js
View File

@ -238,6 +238,7 @@ function cardCheck(tlid) {
} }
function mov(id, tlid, type) { function mov(id, tlid, type) {
var click = false
if (tlid == "notf") { if (tlid == "notf") {
var tlide = "[data-notf=" + acct_id + "]"; var tlide = "[data-notf=" + acct_id + "]";
} else if (tlid == "user") { } else if (tlid == "user") {
@ -257,12 +258,21 @@ function mov(id, tlid, type) {
} else { } else {
mouseover = "hide"; mouseover = "hide";
} }
click=true
} else if (mouseover == "no") { } else if (mouseover == "no") {
mouseover = ""; mouseover = "";
} }
if (mouseover == "hide") { if (mouseover == "hide") {
$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide") if(click){
$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide") $(tlide + " [toot-id=" + id + "]").toggleClass("hide-actions")
}else{
$(tlide + " [toot-id=" + id + "]").removeClass("hide-actions")
}
//$(tlide + " [toot-id=" + id + "] .area-vis").toggleClass("hide")
//$(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide")
//$(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide")
} }
} }
@ -278,8 +288,10 @@ function resetmv(type) {
mouseover = "hide"; mouseover = "hide";
} }
if (mouseover == "hide") { if (mouseover == "hide") {
$(".area-actions").addClass("hide"); $(".cvo").addClass("hide-actions")
$(".area-side").addClass("hide"); //$(".area-vis").addClass("hide");
//$(".area-actions").addClass("hide");
//$(".area-side").addClass("hide");
} }
} }

4
app/js/tl/parse.js
View File

File diff suppressed because one or more lines are too long