diff --git a/app/css/userdata.css b/app/css/userdata.css index d4398f08..af2b8422 100644 --- a/app/css/userdata.css +++ b/app/css/userdata.css @@ -116,7 +116,11 @@ justify-content: center; align-items: center; font-size: 2rem; - width: 90%; height: 100%; - position: absolute; } +#hisdropdown{ + background-color: var(--bg); +} +#hisdropdown li:hover{ + background-color: var(--active); +} \ No newline at end of file diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js index d7226cc7..0436e944 100644 --- a/app/js/userdata/his-data.js +++ b/app/js/userdata/his-data.js @@ -622,12 +622,17 @@ function showMat() { var templete = ""; Object.keys(json).forEach(function (key) { var user = json[key]; + if (user.avatar) { + var avatar = user.avatar + } else { + var avatar = "../../img/loading.svg" + } templete = templete + '
' + '
' + '
' + - '
' + + '
' + '
' + escapeHTML(user.screen_name) + '
' + '
@' + diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index 8808c2e9..a1301031 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -79,8 +79,10 @@ function udg(user, acct_id) { } //moved設定時 if (json.moved) { - M.toast({ html: lang.lang_showontl_movetxt + '', displayLength: 4000 }) + M.toast({ + html: lang.lang_showontl_movetxt + '', displayLength: 4000 + }) } $('#his-data').modal('open'); $('#his-data').attr("user-id", user); @@ -193,7 +195,7 @@ function udg(user, acct_id) { $("#his-emp-btn").hide(); $(".only-my-data").show(); $(".only-his-data").hide(); - if(localStorage.getItem("main")==acct_id){ + if (localStorage.getItem("main") == acct_id) { $("#his-main-acct").hide(); } } else { @@ -296,7 +298,7 @@ function misskeyUdg(user, acct_id) { $("#his-emp-btn").hide(); $(".only-my-data").show(); $(".only-his-data").hide(); - if(localStorage.getItem("main")==acct_id){ + if (localStorage.getItem("main") == acct_id) { $("#his-main-acct").hide(); } } else { @@ -403,8 +405,9 @@ function relations(user, acct_id) { } //Blocked if (json.blocked_by) { - $("#his-float-timeline").hide(); - $("#his-float-blocked").show(); + $("#my-data-nav .btn").addClass("disabled") + $(".his-var-content").hide(); + $("#his-float-blocked").show() $("#his-follow-btn").hide() } @@ -430,6 +433,7 @@ function hisclose() { function reset() { $(".his-var-content:eq(0)").show(); $(".his-var-content:gt(0)").hide(); + $("#my-data-nav .btn").removeClass("disabled") $(".active-back").removeClass("active-back"); $(".column-first").addClass("active-back"); $("#his-name").text("Loading"); @@ -480,11 +484,11 @@ function reset() { } $('#my-data-nav .anc-link').on('click', function () { var target = $(this).attr("go"); - if(target){ + if (target) { $("#my-data-nav .anc-link").removeClass("active-back"); $(this).addClass("active-back"); $(target).show(); $(".his-var-content:not(" + target + ")").hide(); } - + }); \ No newline at end of file diff --git a/app/view/bg/index.html b/app/view/bg/index.html index 9b7ea92f..ede76e5c 100644 --- a/app/view/bg/index.html +++ b/app/view/bg/index.html @@ -458,14 +458,6 @@ Set it an main account
-

-
- Намерете хора подобни на този потребител.
- Powered by Mastodon User - Matching
-
-
@@ -494,7 +486,7 @@ -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    Вие сте блокирани. Защо?
    +
    + Намерете хора подобни на този потребител.
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    Вие сте блокирани. Защо?
    +
    diff --git a/app/view/cs/index.html b/app/view/cs/index.html index 947f22ea..1f9a6b76 100644 --- a/app/view/cs/index.html +++ b/app/view/cs/index.html @@ -458,14 +458,6 @@ Set it an main account
    -
    -
    - Get people resembling this user.
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    You are blocked. Why?
    +
    + Get people resembling this user.
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    You are blocked. Why?
    +
    diff --git a/app/view/de/index.html b/app/view/de/index.html index 3b55405b..9be846f7 100644 --- a/app/view/de/index.html +++ b/app/view/de/index.html @@ -458,14 +458,6 @@ Im Hauptkonto einstellen
    -
    -
    - Get people resembling this user.
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    Sie sind blockiert. Warum?
    +
    + Get people resembling this user.
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    Sie sind blockiert. Warum?
    +
    diff --git a/app/view/en/index.html b/app/view/en/index.html index 59e4f58d..acdca154 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -458,14 +458,6 @@ Set it an main account
    -
    -
    - Get people resembling this user.
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    You are blocked. Why?
    +
    + Get people resembling this user.
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    You are blocked. Why?
    +
    diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 1cc6ac83..c12c4d4e 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -458,14 +458,6 @@ メインアカウントに設定
    -
    -
    - 似ているユーザーを取得できます。
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    ブロックされています。なぜでしょう?
    +
    + 似ているユーザーを取得できます。
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    ブロックされています。なぜでしょう?
    +
    diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 438b034d..129c7322 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -458,14 +458,6 @@ @@mainacct@@
    -
    -
    - @@likeUserDes@@
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    @@blocked@@
    +
    + @@likeUserDes@@
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    @@blocked@@
    +
    diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 890ca73c..2a0a8350 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -458,14 +458,6 @@ @@mainacct@@
    -
    -
    - crwdns469:0crwdne469:0
    - Powered by Mastodon User - Matching
    -
    -
    @@ -494,7 +486,7 @@
    -
  • - Coming soon... +
  • @@ -607,9 +600,16 @@
    - -
    -
    @@blocked@@
    +
    + crwdns469:0crwdne469:0
    + Powered by Mastodon User + Matching
    +
    + +
    +
    +
    @@blocked@@
    +