diff --git a/app/css/userdata.css b/app/css/userdata.css index ece42295..d4398f08 100644 --- a/app/css/userdata.css +++ b/app/css/userdata.css @@ -4,6 +4,10 @@ background-image: url("../../loading.svg"); overflow-y: hidden; } +#his-data-content { + display: flex; + justify-content: center; +} #his-name { font-size: 1.5rem; } @@ -13,16 +17,17 @@ margin-right: 5px; } .his-float { - float: left; overflow-y: scroll; padding: 5px; } #his-float-data { - width: 400px; height: 100%; } +#his-leftside { + width: 500px; +} #his-float-timeline { - width: calc(100% - 400px); + max-width: 775px; height: 100%; overflow-y: hidden; } @@ -61,21 +66,30 @@ #his-data a:not(.mention) span:last-of-type { display: none; } +#his-data a .rep_ct, +#his-data a .rt_ct, +#his-data a .fav_ct { + display: inline !important; +} #his-data-show { margin: 20px; + margin-left: 50px; + margin-right: 50px; background-color: var(--his-data); - width: calc(100% - 20px); height: calc(100% - 20px); margin-bottom: 0; padding: 5px; } -.tab-content { +#his-data-wrap { + display: flex; +} +.his-var-content { overflow-y: scroll; overflow-x: hidden; - height: calc(100% - 240px); + height: calc(100% - 45px); } -.my-data-width { - width: 10%; +#my-data-nav .btn { + width: 140px; } .active-back { background-color: var(--active); diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index a20a3cd7..8808c2e9 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -164,7 +164,7 @@ function udg(user, acct_id) { } $("#his-des").attr("data-acct", acct_id); $('#his-data').css('background-size', 'cover'); - $("#his-data .tab-content").css("height", $("#his-float-timeline").height() - 70 + "px") + $("#his-float-timeline").css("height", $("#his-data-show").height() + "px") localStorage.setItem("history", user); //自分の時 if (json.acct == localStorage.getItem("user_" + acct_id)) { @@ -428,8 +428,8 @@ function hisclose() { localStorage.removeItem("history"); } function reset() { - $(".tab-content:eq(0)").show(); - $(".tab-content:gt(0)").hide(); + $(".his-var-content:eq(0)").show(); + $(".his-var-content:gt(0)").hide(); $(".active-back").removeClass("active-back"); $(".column-first").addClass("active-back"); $("#his-name").text("Loading"); @@ -478,10 +478,13 @@ function reset() { $("#his-main-acct").show(); $("#his-proof-prof").html("") } -$('#my-data-nav .tab').on('click', function () { - var target = $(this).find("a").attr("go"); - $("#my-data-nav .tab").removeClass("active-back"); - $(this).addClass("active-back"); - $(target).show(); - $(".tab-content:not(" + target + ")").hide(); +$('#my-data-nav .anc-link').on('click', function () { + var target = $(this).attr("go"); + 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 d688a188..9b7ea92f 100644 --- a/app/view/bg/index.html +++ b/app/view/bg/index.html @@ -423,186 +423,194 @@