From d2214480f6b7897ab39b02918ba826695ba7741d Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 21 Aug 2019 00:36:47 +0900 Subject: [PATCH] Fix: gray color --- app/css/themes.css | 6 ++++++ app/css/tl.css | 2 +- app/js/tl/misskeyparse.js | 4 ++-- app/js/tl/parse.js | 12 ++++++------ app/main/css.js | 6 +++++- app/view/bg/index.html | 23 ++++++++--------------- app/view/cs/index.html | 23 ++++++++--------------- app/view/de/index.html | 23 ++++++++--------------- app/view/en/index.html | 23 ++++++++--------------- app/view/ja/index.html | 23 ++++++++--------------- app/view/make/index.sample.html | 23 ++++++++--------------- app/view/ps/index.html | 23 ++++++++--------------- 12 files changed, 76 insertions(+), 115 deletions(-) diff --git a/app/css/themes.css b/app/css/themes.css index 48abc210..f62c4adb 100644 --- a/app/css/themes.css +++ b/app/css/themes.css @@ -17,6 +17,7 @@ --accentbtn: #009688; --selected: #c0c0c0; --selectedWithShare: #b2babd; + --gray: #757575; } #imagemodal { background: url("../img/pixel.white.svg"); @@ -40,6 +41,7 @@ --accentbtn: #3f51b5; --selected: #3f3f3f; --selectedWithShare: #003a30; + --gray: #cccccc; } .blacktheme #imagemodal { background: url("../img/pixel.svg"); @@ -63,6 +65,7 @@ --accentbtn: #00acc1; --selected: #214f8a; --selectedWithShare: #003a30; + --gray: #cccccc ; } .indigotheme #imagemodal { background: url("../img/pixel.svg"); @@ -86,6 +89,7 @@ --accentbtn: #827717; --selected: #6d352b; --selectedWithShare: #003a30; + --gray: #cccccc; } .browntheme #imagemodal { background: url("../img/pixel.svg"); @@ -109,6 +113,7 @@ --accentbtn: #33691e; --selected: #78c17a; --selectedWithShare: #caa266; + --gray: #757575; } .greentheme #imagemodal { background: url("../img/pixel.white.svg"); @@ -132,6 +137,7 @@ --accentbtn: #2f7bb7; --selected: #9dcade; --selectedWithShare: #c1dac4; + --gray: #757575; } .bluetheme #imagemodal { background: url("../img/pixel.white.svg"); diff --git a/app/css/tl.css b/app/css/tl.css index c2412b2c..d7a4fd7f 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -349,7 +349,7 @@ iframe, } .gray { - color: #cccccc; + color: var(--gray); } .sml { font-size: 0.8em; diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js index 554ab916..a8aec42b 100644 --- a/app/js/tl/misskeyparse.js +++ b/app/js/tl/misskeyparse.js @@ -510,7 +510,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url + '" data-type="image" class="img-parsed">'; + ' toot-img pointer" style="width:' + cwdt + '%; height:' + imh + 'px;" onerror="this.src=\'../../img/loading.svg\'">'; } }); @@ -788,7 +788,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { '\',' + acct_id + ');" user="' + toot.user.username + '" class="udg">' + '' + + '" onerror="this.src=\'../../img/loading.svg\'">' + '
' + dis_name + ' @' + diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 55430bdb..adf59fdb 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -362,7 +362,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { '\',' + acct_id + ');" user="' + toot.account.acct + '" class="notf-icon udg">' + ''; + '" onerror="this.src=\'../../img/loading.svg\'">'; var rebtxt = lang.lang_parse_btedsimple; var rticon = "fa-retweet light-blue-text"; if (localStorage.getItem("domain_" + acct_id) == "imastodon.net" && !locale) { @@ -587,7 +587,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url + '" data-type="' + media.type + '" class="img-parsed img-link" style="width:calc(' + cwdt + '% - 1px); height:' + imh + ';">' + nsfwmes + ''; + ' toot-img pointer" onerror="this.src=\'../../img/loading.svg\'">' + nsfwmes + ''; } } @@ -821,7 +821,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { for (var i = 0; i < tickerdata.length; i++) { var value = tickerdata[i]; if (value.domain == thisdomain) { - var tickerdom = '
' + escapeHTML(value.name) + '
'; + var tickerdom = '
' + escapeHTML(value.name) + '
'; break; } } @@ -841,7 +841,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { '\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '' + noticeavatar + '
' + + '" onerror="this.src=\'../../img/loading.svg\'">' + noticeavatar + '
' + '
' + dis_name + ' @' + @@ -1016,14 +1016,14 @@ function userparse(obj, auth, acct_id, tlid, popup) { '
' + '
' + + .acct + '" onerror="this.src=\'../../img/loading.svg\'">
' + '
' + dis_name + '' + ' @' + toot.acct + locked + '' + '
' + '
' + - '
Follows:' + + '
Follows:' + toot.following_count + '
Followers:' + toot.followers_count + '
' + authhtml + diff --git a/app/main/css.js b/app/main/css.js index 45da89f2..1efe2e88 100644 --- a/app/main/css.js +++ b/app/main/css.js @@ -55,11 +55,13 @@ function css(mainWindow) { var beforehover = "#757575"; var selected = "#3f3f3f" var selectedWithShare = "#b2babd" + var gray = "#757575" } else { var drag = "rgba(0, 0, 0, 0.8)"; var beforehover = "#9e9e9e"; var selected = "#c0c0c0" var selectedWithShare = "#003a30" + var gray = "#cccccc" } if (json.props) { if (json.props.TheDeskAccent) { @@ -79,7 +81,9 @@ function css(mainWindow) { secondary + ";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" + primary + - ";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}.customtheme #imagemodal{background: url(\"../img/pixel.svg\");}"; + ";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}"+ + "--gray:" + gray + ";"+ + ".customtheme #imagemodal{background: url(\"../img/pixel.svg\");}"; e.sender.webContents.send('theme-css-response', css); } catch (e) { var css = ""; diff --git a/app/view/bg/index.html b/app/view/bg/index.html index 88f28cc0..c16ee722 100644 --- a/app/view/bg/index.html +++ b/app/view/bg/index.html @@ -666,24 +666,17 @@ HP
GitHub

-