From 40a884b4f56ae11e08a0586e0ca8196dd579ba49 Mon Sep 17 00:00:00 2001 From: cutls Date: Tue, 8 Sep 2020 18:50:05 +0900 Subject: [PATCH] Redesign of column setting --- app/css/tl.css | 15 ++++ app/js/ui/layout.js | 97 ++++++++++++-------------- app/view/make/language/en/main.json | 10 ++- app/view/make/language/ja-KS/main.json | 10 ++- app/view/make/language/ja/main.json | 10 ++- 5 files changed, 81 insertions(+), 61 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index 7c3166fb..d3a68897 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -634,6 +634,21 @@ p:not(:last-child) { box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.3), 0px -10px 10px 0px rgba(0, 0, 0, 0.3) inset; } +.notf-indv-box label span { + padding-left: 23px !important; + margin-right: 5px; +} +.notf-indv-box .setting { + font-size: 1rem; + width: calc(25% - 3px); + text-align: left; + padding: 5px; + height: 70px; +} +.notf-exclude-btn:hover { + background-color: inherit !important; + border: 1px solid; +} .type-b { display: none; } diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 428d96c6..c09c6a64 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -228,65 +228,63 @@ function parseColumn(target, dontclose) { var animecss = '' } var unread = ` - more - ${lang.lang_layout_unread}
` + class="setting nex waves-effect" title="${lang.lang_layout_unread}"> + more
${lang.lang_layout_unread} + ` var notfDomain = acct.domain var notfKey = key var if_tag = '' var if_tag_btn = '' if (acct.type == 'notf') { var exclude = - lang.lang_excluded + - `:
+ `
${lang.lang_layout_excluded}:
+ - ` +
+ ` if (checkNotfFilter(key)) { exclude = exclude + - `` } - exclude = exclude + '
' + exclude = exclude + '
' notfDomain = 'dummy' notfKey = 'dummy' } else if (acct.type == 'home') { - var exclude = ` - - Off - + var exclude = ` + + Off
${lang.lang_layout_excludingbt} -
` + ` } else if (acct.type == 'tag') { if (acct.data.name) { var name = acct.data.name @@ -335,15 +333,13 @@ function parseColumn(target, dontclose) { var basehtml = `
` $('#timeline-container').append(basehtml) } - var left_hold = ` - view_agenda - - ${lang.lang_layout_leftFold}
` + var left_hold = ` + view_agenda
+ ${lang.lang_layout_leftFold}` } else { - var left_hold = ` - view_column - - ${lang.lang_layout_leftUnfold}
` + var left_hold = ` + view_column
+ ${lang.lang_layout_leftUnfold}` } if (key === 0) { left_hold = '' @@ -362,15 +358,15 @@ function parseColumn(target, dontclose) { var addHeight = '' } if (acct.type != 'pub' && acct.type != 'pub-media') { - var mediaFil = ` - perm_media - On - ${lang.lang_layout_mediafil}` + var mediaFil = ` + perm_media + On
+ ${lang.lang_layout_mediafil}` } else { - var mediaFil = ` - perm_media + var mediaFil = ` + perm_media
Off - ${lang.lang_layout_remoteOnly}` + ${lang.lang_layout_remoteOnly}` } var html = `
@@ -424,28 +420,25 @@ function parseColumn(target, dontclose) {
+ ${exclude} ${unread} - ${exclude}${left_hold} - ${mediaFil}
- - link - On - + ${left_hold} + ${mediaFil} + + link + On
${lang.lang_layout_linkana} -
- - hearing - On + + hearing + On
${lang.lang_layout_tts} - TL
- - refresh - - + TL + + refresh +
${lang.lang_layout_reconnect} - -
+
${lang.lang_layout_headercolor}
diff --git a/app/view/make/language/en/main.json b/app/view/make/language/en/main.json index ff9dee3e..cf9db669 100644 --- a/app/view/make/language/en/main.json +++ b/app/view/make/language/en/main.json @@ -131,13 +131,17 @@ "lang_layout_linkana": "Auto Link Analyzer", "lang_layout_linkanades": "Auto link analyzer", "lang_layout_tts": "Text to speech ", - "lang_layout_reconnect": "Reload this column", + "lang_layout_reconnect": "Reload", "lang_layout_headercolor": "Header color of this column", "lang_layout_nodata": "[No data]
F5/⌘+R to reload", "lang_layout_dm": "Direct Message", "lang_layout_webviewmode": "Prefer WebView", - "lang_excluded": "Excluded type of notification", - "lang_layout_excludingbt": "Show BT mode(OFF/Exclude BT/Only BT)", + "lang_layout_excluded": "Excluded type of notification", + "lang_layout_mention": "Mentions", + "lang_layout_fav": "Favourites", + "lang_layout_bt": "Boosts", + "lang_layout_poll": "Polls", + "lang_layout_excludingbt": "Show BT mode", "lang_layout_leftFold": "Stack to the left", "lang_layout_leftUnfold": "Dock on the right", "lang_layout_deleteColumn": "Delete this column", diff --git a/app/view/make/language/ja-KS/main.json b/app/view/make/language/ja-KS/main.json index 2edbb96f..a5d5cde5 100644 --- a/app/view/make/language/ja-KS/main.json +++ b/app/view/make/language/ja-KS/main.json @@ -130,13 +130,17 @@ "lang_layout_linkanades": "リンクの解析を切り替え", "lang_layout_remoteOnly": "リモートのみ", "lang_layout_tts": "読み上げ", - "lang_layout_reconnect": "カラム再読込", + "lang_layout_reconnect": "再読込", "lang_layout_headercolor": "TLヘッダーカラー", "lang_layout_nodata": "[トゥートあらへん]
F5/⌘+Rで再読込してみて。", "lang_layout_dm": "ダイレクトメッセージ", "lang_layout_webviewmode": "WebView優先", - "lang_excluded": "見せへん通知", - "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTだけ)", + "lang_layout_excluded": "見せへん通知", + "lang_layout_mention": "メンション", + "lang_layout_fav": "お気に入り", + "lang_layout_bt": "ブースト", + "lang_layout_poll": "投票", + "lang_layout_excludingbt": "BT表示", "lang_layout_leftFold": "左へ重ねる", "lang_layout_leftUnfold": "右へ出す", "lang_layout_deleteColumn": "カラム削除", diff --git a/app/view/make/language/ja/main.json b/app/view/make/language/ja/main.json index 05868abe..f20b3f44 100644 --- a/app/view/make/language/ja/main.json +++ b/app/view/make/language/ja/main.json @@ -132,13 +132,17 @@ "lang_layout_linkana": "リンク解析", "lang_layout_linkanades": "リンクの解析を切り替え", "lang_layout_tts": "読み上げ", - "lang_layout_reconnect": "カラム再読込", + "lang_layout_reconnect": "再読込", "lang_layout_headercolor": "TLヘッダーカラー", "lang_layout_nodata": "[ここにトゥートはありません。]
F5/⌘+Rで再読込できます。", "lang_layout_dm": "ダイレクトメッセージ", "lang_layout_webviewmode": "WebView優先", - "lang_excluded": "除外する通知", - "lang_layout_excludingbt": "BT表示(OFF/BT除外/BTのみ)", + "lang_layout_excluded": "除外する通知", + "lang_layout_mention": "メンション", + "lang_layout_fav": "お気に入り", + "lang_layout_bt": "ブースト", + "lang_layout_poll": "投票", + "lang_layout_excludingbt": "BT表示", "lang_layout_leftFold": "左へ重ねる", "lang_layout_leftUnfold": "右へ出す", "lang_layout_deleteColumn": "カラム削除",