diff --git a/app/css/tl.css b/app/css/tl.css index 44b8c44f..c2895acb 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -227,6 +227,18 @@ iframe, 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"; } +.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 h2, .cvo h3, @@ -325,6 +337,7 @@ iframe, margin: 2px; grid-area: side; } + .quote-inline { display: none; } diff --git a/app/js/tl/card.js b/app/js/tl/card.js index ebd14da9..d768c801 100644 --- a/app/js/tl/card.js +++ b/app/js/tl/card.js @@ -238,6 +238,7 @@ function cardCheck(tlid) { } function mov(id, tlid, type) { + var click = false if (tlid == "notf") { var tlide = "[data-notf=" + acct_id + "]"; } else if (tlid == "user") { @@ -257,12 +258,21 @@ function mov(id, tlid, type) { } else { mouseover = "hide"; } + click=true } else if (mouseover == "no") { mouseover = ""; } if (mouseover == "hide") { - $(tlide + " [toot-id=" + id + "] .area-actions").toggleClass("hide") - $(tlide + " [toot-id=" + id + "] .area-side").toggleClass("hide") + if(click){ + $(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"; } if (mouseover == "hide") { - $(".area-actions").addClass("hide"); - $(".area-side").addClass("hide"); + $(".cvo").addClass("hide-actions") + //$(".area-vis").addClass("hide"); + //$(".area-actions").addClass("hide"); + //$(".area-side").addClass("hide"); } } \ No newline at end of file diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index ce574a33..744aa8fc 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -176,7 +176,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { if (!mouseover) { mouseover = ""; } else if (mouseover == "yes" || mouseover == "click") { - mouseover = "hide"; + mouseover = "hide-actions"; } else if (mouseover == "no") { mouseover = ""; } @@ -785,7 +785,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { } poll = poll + '
' + '
' + escapeHTML(quoteUser) + '
' + toot.quote.content + '
more_vert
'; } - templete = templete + '
" + '
' + notice + home + "
" + '
' + '' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
' + date(toot.created_at, datetype) + "" + "
" + '
' + tickerdom + '' + spoil + "" + spoiler_show + '
' + content + "
" + poll + "" + viewer + "" + '
' + analyze + "" + "" + mentions + tags + "
" + '
' + vis + "
" + '
' + '" + '" + '" + '" + '
' + '" + '
' + '
' + '' + trans + '
' + via + "" + '' + '' + "
" + ""; + templete = templete + '
" + '
' + notice + home + "
" + '
' + '' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
' + date(toot.created_at, datetype) + "" + "
" + '
' + tickerdom + '' + spoil + "" + spoiler_show + '
' + content + "
" + poll + "" + viewer + "" + '
' + analyze + "" + "" + mentions + tags + "
" + '
' + vis + "
" + '
' + '" + '" + '" + '" + '
' + '" + '
' + '
' + '' + trans + '
' + via + "" + '' + '' + "
" + ""; } }); if (mix == "mix") {