diff --git a/app/css/tl.css b/app/css/tl.css index d32e6049..c2412b2c 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -94,7 +94,8 @@ display: none; } } -iframe, .cvo video { +iframe, +.cvo video { max-width: 100%; max-height: 300px; } @@ -127,7 +128,7 @@ iframe, .cvo video { } .marquee { width: 100%; - padding: .5em 0; + padding: 0.5em 0; overflow: hidden; margin-bottom: 0; position: relative; @@ -143,14 +144,15 @@ iframe, .cvo video { animation-iteration-count: infinite; } @keyframes marquee { -0% { - -webkit-transform: translate(0); - transform: translate(0); -} -99%, 100% { - -webkit-transform: translate(-100%); - transform: translate(-100%); -} + 0% { + -webkit-transform: translate(0); + transform: translate(0); + } + 99%, + 100% { + -webkit-transform: translate(-100%); + transform: translate(-100%); + } } .boxIn { display: flex; @@ -209,7 +211,8 @@ iframe, .cvo video { width: 100%; display: grid; grid-template-columns: 43px 2fr 1fr; - grid-template-areas: "notice notice notice" "icon display_name display_name" "icon toot toot" "vis additional additional" "actions actions side"; + 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"; } .cvo h1, .cvo h2, @@ -254,7 +257,8 @@ iframe, .cvo video { .area-toot { cursor: text; user-select: auto; - margin: 2px; + margin-top: 5px; + margin-bottom: 5px; margin-left: 5px; grid-area: toot; } @@ -276,7 +280,8 @@ iframe, .cvo video { .area-actions { padding: 0; margin: 0; - top: -20px; + top: -5px; + position: relative; display: flex; justify-content: space-around; width: 250px; @@ -286,9 +291,12 @@ iframe, .cvo video { .area-vis { margin: 2px; grid-area: vis; + text-align: center; } .area-side { display: flex; + top: -5px; + position: relative; justify-content: flex-end; margin: 2px; grid-area: side; @@ -341,7 +349,7 @@ iframe, .cvo video { } .gray { - color: gray; + color: #cccccc; } .sml { font-size: 0.8em; @@ -600,18 +608,31 @@ p:not(:last-child) { width: 100%; height: 100%; } -.shared.selectedToot{ +.shared.selectedToot { background-color: var(--selectedWithShare); } -.selectedToot{ +.selectedToot { background-color: var(--selected); } -audio{ +audio { height: 2rem; } -.translate{ +.translate { white-space: normal; } +.cw_btn { + margin: 3px; + background-color: var(--emphasized); + color: var(--color); + padding-left: 3px; + padding-right: 3px; + border-radius: 3px; + border: 1px solid var(--color); +} +.vis-data { + font-size: 1rem !important; + margin: 5px; +} @keyframes jump { 0% { transform: translateY(0); diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js index 255cd711..554ab916 100644 --- a/app/js/tl/misskeyparse.js +++ b/app/js/tl/misskeyparse.js @@ -184,9 +184,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { noticeavatar = toot.user.avatarUrl; } noticeavatar = '' + + '\',' + acct_id + ');" user="' + toot.user.username + '" class="udg notf-icon">' + ''; if (toot.type == "reply") { var what = lang.lang_parse_mentioned; @@ -375,7 +375,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { var spoiler = "cw cw_hide_" + toot.id; var api_spoil = "gray"; var spoiler_show = '' + lang.lang_parse_cwshow + '
'; + '\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '
'; } else { var ct1 = nl2br(toot.text).split('
').length - 2; var ct2 = nl2br(toot.text).split('
').length - 2; @@ -387,7 +387,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { '' + lang.lang_parse_autofold + ''; var spoiler = "cw cw_hide_" + toot.id; var spoiler_show = '' + lang.lang_parse_more + '
'; + '\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '
'; } else { var content = escapeHTMLtemp(toot.text); if (toot.cw) { diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 72750b54..55430bdb 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -359,9 +359,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { noticeavatar = toot.account.avatar_static; } noticeavatar = '' + + '\',' + acct_id + ');" user="' + toot.account.acct + '" class="notf-icon udg">' + ''; var rebtxt = lang.lang_parse_btedsimple; var rticon = "fa-retweet light-blue-text"; @@ -376,6 +376,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var uniqueid = toot.id; var toot = toot.reblog; var dis_name = escapeHTML(toot.account.display_name); + if(!dis_name){ + dis_name = toot.account.acct + } if (toot.account.emojis) { var actemojick = toot.account.emojis[0]; } else { @@ -460,7 +463,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var spoiler = "cw cw_hide_" + toot.id; var api_spoil = "gray"; var spoiler_show = '' + lang.lang_parse_cwshow + '
'; + '\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '
'; } else { var ct1 = toot.content.split('

').length + toot.content.split('
').length - 2; var ct2 = toot.content.split('

').length + toot.content.split('
').length - 2; @@ -472,7 +475,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { '' + lang.lang_parse_autofold + ''; var spoiler = "cw cw_hide_" + toot.id; var spoiler_show = '' + lang.lang_parse_more + '
'; + '\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '
'; } else { var content = toot.content; var spoil = escapeHTML(toot.spoiler_text); @@ -647,19 +650,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var visen = toot.visibility; if (visen == "public") { var vis = - 'public'; + 'public'; var can_rt = ""; } else if (visen == "unlisted") { var vis = - 'lock_open'; + 'lock_open'; var can_rt = ""; } else if (visen == "private") { var vis = - 'lock'; + 'lock'; var can_rt = "unvisible"; } else if (visen == "direct") { var vis = - 'mail'; + 'mail'; var can_rt = "unvisible"; } if (toot.account.acct == localStorage.getItem("user_" + acct_id)) { @@ -856,9 +859,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { '
' + analyze + '' + '' + mentions + tags + '
' + - '
' + + '
' + vis + '
' + '
' + - '
' + vis + '
' + '
' + lang.lang_parse_det + '
' + '
' + lang.lang_parse_thread + '
' + '