diff --git a/app/css/master.css b/app/css/master.css
index 10f8497f..743951ec 100644
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -461,6 +461,35 @@ textarea {
.contributor img {
width: 1rem;
}
+.tagComp{
+ display: grid;
+ grid-template-columns: 60px 80px 1fr;
+ grid-template-rows: 1fr 1fr;
+ grid-template-areas: "svg toot user" "svg toot tag" "svg toots tag";
+ border-top: dotted 0.5px var(--gray);
+ padding: 5px
+}
+.tagCompSvg {
+ grid-area: svg;
+}
+.tagCompToot {
+ grid-area: toot;
+ text-align: center;
+}
+.tagCompToots {
+ grid-area: toots;
+ text-align: center;
+}
+.tagCompUser {
+ grid-area: user;
+}
+.tagCompTag {
+ grid-area: tag;
+ padding-top: 10px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
/*スクロールバー*/
::-webkit-scrollbar {
diff --git a/app/js/tl/src.js b/app/js/tl/src.js
index 4a4dc78e..e6bb93c4 100644
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -216,6 +216,9 @@ function moreTs(tlid, q) {
function graphDraw(tag, acct_id) {
var tags = ''
var his = tag.history
+ return graphDrawCore(his, tag)
+}
+function graphDrawCore(his, tag){
var max = Math.max.apply(null, [
his[0].uses,
his[1].uses,
@@ -232,36 +235,32 @@ function graphDraw(tag, acct_id) {
var two = 50 - (his[2].uses / max) * 50
var one = 50 - (his[1].uses / max) * 50
var zero = 50 - (his[0].uses / max) * 50
- if (max === 0) {
- tags =
- `
- ${his[0].uses}
- toot(s)
-
- #${escapeHTML(tag.name)}
- ` +
- his[0].accounts +
- lang.lang_src_people
- } else {
- tags =
- `
-
- ${his[0].uses}
- toot
-
- #${escapeHTML(tag.name)}
- ` +
- his[0].accounts +
- lang.lang_src_people
- }
-
- return tags
+ return `