From 35c10e0c7d85732ed8a266ab0ee955b75404ca28 Mon Sep 17 00:00:00 2001 From: cutls Date: Thu, 17 Sep 2020 21:05:08 +0900 Subject: [PATCH] css fix --- app/css/userdata.css | 172 +- app/js/userdata/showOnTL.js | 2 + app/main/css.js | 2 +- app/view/make/index.sample.html | 3053 +++++++++++++------------------ 4 files changed, 1364 insertions(+), 1865 deletions(-) diff --git a/app/css/userdata.css b/app/css/userdata.css index ff44b8df..6d5cd2a6 100644 --- a/app/css/userdata.css +++ b/app/css/userdata.css @@ -1,151 +1,159 @@ /*アイコンをクリックした時とかにでてくるユーザーデータ*/ #his-data { - background-repeat: no-repeat; - background-image: url("../img/loading.svg"); - overflow-y: hidden; + background-repeat: no-repeat; + background-image: url('../img/loading.svg'); + overflow-y: hidden; } -#his-data .btn .material-icons{ - float:left; +#his-data .btn .material-icons { + float: left; } #his-data-content { - display: flex; - justify-content: center; + display: flex; + justify-content: center; } #his-name { - font-size: 1.5rem; + font-size: 1.5rem; } #his-prof { - float: left; - width: 7.7rem; - margin-right: 0.4rem; + width: 7.7rem; + margin-right: 0.4rem; } .his-float { - overflow-y: scroll; - padding: 0.4rem; + overflow-y: scroll; + padding: 0.4rem; } #his-float-data { - height: 100%; + height: 100%; overflow-y: hidden; + } #his-leftside { - width: 38.4rem; + width: 28.4rem; + max-width: 30vw; } #his-float-timeline { - max-width: 59.6rem; - height: 100%; - overflow-y: hidden; + max-width: 47.5rem; + min-width: calc(100% - 29.4rem); + height: 100%; + overflow-y: hidden; } #his-basic-prof { - min-height: 10rem; + display: flex; + min-height: 10rem; } #his-field { - vertical-align: baseline; - text-align: center; - padding: 0; + vertical-align: baseline; + text-align: center; + padding: 0; } #his-field tr { - height: 1.5rem; + height: 1.5rem; } .his-field-title { - height: 1.5rem; - padding: 0; - background-color: #757575; - text-align: center; - padding: 0.4rem; - margin-bottom: 1px; - width: 30%; + height: 1.5rem; + padding: 0; + background-color: #757575; + text-align: center; + padding: 0.4rem; + margin-bottom: 1px; + width: 30%; } .his-field-content { - height: 1.5rem; - padding: 0; - padding-left: 0.4rem; + height: 1.5rem; + padding: 0; + padding-left: 0.4rem; } .his-var-content a span.ellipsis:after { - content: "..."; + content: '...'; } .his-var-content a:not(.mention) span:last-of-type { - display: none; + display: none; } #his-data a .rep_ct, #his-data a .rt_ct, #his-data a .fav_ct { - display: inline !important; + display: inline !important; } #his-data-show { - margin: 1.5rem; - margin-left: 3.8rem; - margin-right: 3.8rem; - background-color: var(--his-data); - height: calc(100% - 1.5rem); - margin-bottom: 0; - padding: 0.4rem; + margin: 1.5rem; + margin-left: 3.8rem; + margin-right: 3.8rem; + background-color: var(--his-data); + height: calc(100% - 1.5rem); + margin-bottom: 0; + padding: 0.4rem; } #his-data-wrap { - display: flex; + display: flex; } .his-var-content { - overflow-y: scroll; - overflow-x: hidden; - height: calc(100% - 3.4rem); - padding-bottom: 60px; + overflow-y: scroll; + overflow-x: hidden; + height: calc(100% - 3.4rem); + padding-bottom: 60px; } #my-data-nav .btn { - width: 10.7rem; + width: 10.6rem; } -.active-back { - background-color: var(--active); +#my-data-nav .active-back { + display: none; } #his-name .emojione, #his-name .emoji-img { - width: 1.538rem; + width: 1.538rem; } #his-plus-action .btn { - padding-right: 0.4rem; - padding-left: 0.4rem; + padding-right: 0.4rem; + padding-left: 0.4rem; } .tabs { - display: flex; + display: flex; } .tabs .tab a { - padding: 0.6rem 0.9rem; + padding: 0.6rem 0.9rem; } #his-des { - max-height: 17.7rem; - overflow-y: scroll; + max-height: 17.7rem; + overflow-y: scroll; } #his-sign-action { - border: 1px solid; - border-radius: 0.4rem; - display: flex; - align-items: center; - padding-left: 0.75rem; - padding-right: 0.75rem; - flex-wrap: wrap; + border: 1px solid; + border-radius: 0.4rem; + display: flex; + align-items: center; + padding-left: 0.75rem; + padding-right: 0.75rem; + flex-wrap: wrap; } #his-sign-action .btn { - flex-basis: 31.2%; + flex-basis: calc(50% - 10.6px); } #his-des .mention { - color: #039be5; - cursor: pointer; + color: #039be5; + cursor: pointer; } -#his-table{ - max-height: 11.538rem; - overflow-y: scroll; +#his-table { + max-height: 11.538rem; + overflow-y: scroll; } #his-float-blocked { - display: flex; - justify-content: center; - align-items: center; - font-size: 2rem; - height: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 2rem; + height: 100%; } -#hisdropdown{ - background-color: var(--bg); +#hisdropdown { + background-color: var(--bg); } #hisdropdown li a { - color: white; + color: white; +} +#hisdropdown li:hover { + background-color: var(--active); +} +#his-data-title { + width: 100%; + text-align: center; + font-size: 1.5rem; } -#hisdropdown li:hover{ - background-color: var(--active); -} \ No newline at end of file diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index c6a2375e..5630ae87 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -554,6 +554,8 @@ function reset() { $("#my-data-nav .anc-link").on("click", function() { var target = $(this).attr("go") if (target) { + const title = $(this).html() + $('#his-data-title').html(title) $("#my-data-nav .anc-link").removeClass("active-back") $(this).addClass("active-back") $(target).show() diff --git a/app/main/css.js b/app/main/css.js index 0903642c..72152e78 100644 --- a/app/main/css.js +++ b/app/main/css.js @@ -144,7 +144,7 @@ function css(mainWindow) { hisData + ";--active:" + active + ";--postbox:" + postbox + ";--modalfooter:" + modalFooter + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + - "--gray:" + gray + ";}" + + ";--gray:" + gray + ";}" + ".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}"; } else { var css = compatibleTheme(json) diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 0e086d1c..0f17bb22 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -1,1795 +1,1284 @@ - - - - - - - - - - - - - - @@comment-start@@ - - - @@comment-end@@ @@pwa@@ @@store@@ - - - - - -
- - - -
-
- - -
-
-

@@demoBottomBtns@@

- @@lookAtBottom@@ - -
- account_circle: @@acctMan@@
- @@acctManDesc@@ -
- settings: @@setting@@
- @@settingDesc@@ -
- remove_from_queue: TheDesk Nano @@nanoDes@@
- @@nanoDescPlus@@ -
- apps: @@menu@@
- @@menuDesc@@
-
- -
-
- -
-
- @@draghere@@ -
- -
-
-
-
-
- @@post-new@@Reaction -
- -
-
-
- - - -
-
- -
- - cancel - - -
-
-
- format_bold - format_italic - format_underlined - strikethrough_s - format_quote - short_text - code - format_list_bulleted - format_list_numbered - - - autorenew - flare - swap_vert - swap_horiz - - Markdownエディタを隠す - -
- format_size - px - color_lens - -
- link -   - -
- image -   - -
-
-
-
- - Edit - -
-
- - -
- - Preview - - - Markdownエディタを表示 - -
-
- visibility_off - public - CW - photo_library - tag_faces - more_vert - clear -
-
-
-
- @@replyMode@@: @@no@@/@@temp@@: - @@nothing@@ - @@stamp@@: Off - /@@poll@@:@@no@@ - public - -
- -
- @@postat@@
@@scheduleWarn@@Expire mode(beta)
- -
-
-
- - - - - - - - - - -
-
- - -
-
-
-
- -
- @@emojiWarn@@ - @@refreshEmoji@@ -
- -
-
- - / - - -
- -
- -
-
- - - - - - - @@days@@ - @@hours@@ - @@mins@@ -
-
-
-
- - - - - - - - - - - -
- chevron_right - expand_less - close -
-
- - -
- -
-
- - -
-
-
- -
-
-
- + +
+
+ + +
+
+

@@demoBottomBtns@@

+ @@lookAtBottom@@ +
+ -
- -
- - -
-
-
ご支援いただけませんか？
- (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
- あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
- 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。

- TheDeskになぜ金銭が発生するかについて: - 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
- 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
- @@TheDeskDes@@ -
-
-
Support me
- It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
- @@TheDeskDes@@ -
- -
-
@@once@@
- - @@AWLSupport@@ - + account_circle: @@acctMan@@
+ @@acctManDesc@@ +
+ settings: @@setting@@
+ @@settingDesc@@ +
+ remove_from_queue: TheDesk Nano @@nanoDes@@
+ @@nanoDescPlus@@ +
+ apps: @@menu@@
+ @@menuDesc@@

- @@SendAmazonGift1@@web-pro@cutls.com@@SendAmazonGift2@@
- Kyash
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+
+ @@draghere@@ +
+ +
+
+
+
+
+ @@post-new@@Reaction +
+ +
+
+
+ + + +
+
+ +
+ + cancel + + +
+
+
+ format_bold + format_italic + format_underlined + strikethrough_s + format_quote + short_text + code + format_list_bulleted + format_list_numbered + + + autorenew + flare + swap_vert + swap_horiz + + Markdownエディタを隠す + +
+ format_size + px + color_lens + +
+ link +   + +
+ image +   + +
+
+
+
+ + Edit + +
+
+ + +
+ + Preview + + + Markdownエディタを表示 + +
+
+ visibility_off + public + CW + photo_library + tag_faces + more_vert + clear +
+
+
+
+ @@replyMode@@: @@no@@/@@temp@@: + @@nothing@@ + @@stamp@@: Off + /@@poll@@:@@no@@ + public + +
+ +
+ @@postat@@
@@scheduleWarn@@Expire + mode(beta)
+ +
+
+
+ + + + + + + + + + +
+
+ + +
+
+
+
+ +
+ @@emojiWarn@@ + @@refreshEmoji@@ +
+ +
+
+ + / + + +
+ +
+ +
+
+ + + + + + + @@days@@ + @@hours@@ + @@mins@@ +
+
+
+
+ + + + + + + + + + + +
+ chevron_right + expand_less + close +
+
+ + +
+ +
+
+ + +
+
+
+ + + +
+
+
ご支援いただけませんか？
+ (これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)
+ あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
+ 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
+
+ TheDeskになぜ金銭が発生するかについて: + 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。
+ 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。
+ @@TheDeskDes@@ +
+
+
Support me
+ It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
+ @@TheDeskDes@@ +
+ +
+
@@once@@
+ + @@AWLSupport@@ + +
+ @@SendAmazonGift1@@web-pro@cutls.com@@SendAmazonGift2@@
+ Kyash
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file