diff --git a/app/css/tl.css b/app/css/tl.css index 1abb86ec..3669f183 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -308,7 +308,6 @@ grid-area: toot; .toot-img { object-fit: cover; width: 100%; - margin-right:1px; } .toot img:not(.emoji-img) { max-width: 100%; @@ -532,6 +531,24 @@ p:not(:last-child){ .jump{ display: inline-block; animation: jump 0.75s linear infinite; } +.img-link{ + position:relative; + display:block; + margin-right:1px; + float: left; +} +.nsfw-media{ + position:absolute; + top:0; + right:0; + background-color: black; + color:white; +} +.img-link img{ + display:block; + width:100%; + height:100%; +} @keyframes jump { 0% { transform: translateY(0); diff --git a/app/js/common/version.js b/app/js/common/version.js index b45088be..be0c5d9f 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -239,7 +239,7 @@ function infowebsocket(){ } } if(show){ - Materialize.toast(escapeHTML(obj.Text)+toot+'(スライドして消去)', 86400); + Materialize.toast(escapeHTML(obj.text)+toot+'(スライドして消去)', 86400); } }else{ $("#persons").text(obj.text); diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index a9e7e4c2..a4cd4452 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -585,7 +585,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var sense = "sensitive" var blur=media.blurhash if(blur){ - nsfwmes='NSFW media' + nsfwmes='