diff --git a/README.md b/README.md index b1aa0434..e1355fce 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,11 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/) [Press Kit](https://dl.thedesk.top/press/TheDesk+PressKit.zip) -* [PNG](https://dl.thedesk.top/press/TheDesk.png) -* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg) -* [ico](https://dl.thedesk.top/press/TheDesk.ico) -* [icns](https://dl.thedesk.top/press/TheDesk.icns) +* [PNG 512x512](https://dl.thedesk.top/press/thedesk.png) +* [SVG 4095x4096](https://dl.thedesk.top/press/thedesk-fullcolor.svg) +* [ico 256x256](https://dl.thedesk.top/press/thedesk.ico) +* [icns old](https://dl.thedesk.top/press/thedesk.icns) +* [Illustrator .ai](https://dl.thedesk.top/press/thedesk.ai) The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) diff --git a/README_ja.md b/README_ja.md index 958d02a7..912400bc 100644 --- a/README_ja.md +++ b/README_ja.md @@ -22,10 +22,11 @@ Download:[TheDesk](https://thedesk.top) [![check](https://status.cutls.com/badge アイコンは[クリエイティブ・コモンズ 表示-非営利-継承](https://creativecommons.org/licenses/by-nc-sa/4.0/)で提供されています。 [プレスキット](https://dl.thedesk.top/press/TheDesk+PressKit.zip) -* [PNG](https://dl.thedesk.top/press/TheDesk.png) -* [Monotone SVG](https://dl.thedesk.top/press/TheDesk.svg) -* [ico](https://dl.thedesk.top/press/TheDesk.ico) -* [icns](https://dl.thedesk.top/press/TheDesk.icns) +* [PNG 512x512](https://dl.thedesk.top/press/thedesk.png) +* [SVG 4095x4096](https://dl.thedesk.top/press/thedesk-fullcolor.svg) +* [ico 256x256](https://dl.thedesk.top/press/thedesk.ico) +* [icns old](https://dl.thedesk.top/press/thedesk.icns) +* [Illustrator .ai](https://dl.thedesk.top/press/thedesk.ai) 標準の通知音は [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/) で提供されています。 diff --git a/app/about.html b/app/about.html index 0cacfa58..a4ccca0b 100644 --- a/app/about.html +++ b/app/about.html @@ -78,7 +78,7 @@ - +
TheDesk
Display version
diff --git a/app/build/thedesk.ico b/app/build/thedesk.ico new file mode 100644 index 00000000..ced540c0 Binary files /dev/null and b/app/build/thedesk.ico differ diff --git a/app/img/desk.png b/app/img/desk.png index 5d548758..6d8130c9 100644 Binary files a/app/img/desk.png and b/app/img/desk.png differ diff --git a/app/img/desk.svg b/app/img/desk.svg new file mode 100644 index 00000000..f48c4ad7 --- /dev/null +++ b/app/img/desk.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/img/desk_full.svg b/app/img/desk_full.svg index 834ce2bf..28df7f89 100644 --- a/app/img/desk_full.svg +++ b/app/img/desk_full.svg @@ -1,122 +1,35 @@ - - - - - + + + + + + + + + + + + + + + + + + diff --git a/app/img/osushi_qr.png b/app/img/osushi_qr.png deleted file mode 100644 index 97ea525b..00000000 Binary files a/app/img/osushi_qr.png and /dev/null differ diff --git a/app/img/sticker.png b/app/img/sticker.png deleted file mode 100644 index 1db7973d..00000000 Binary files a/app/img/sticker.png and /dev/null differ diff --git a/app/img/thinking.svg b/app/img/thinking.svg new file mode 100644 index 00000000..ef2c3d6b --- /dev/null +++ b/app/img/thinking.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/img/thinkingdesk.png b/app/img/thinkingdesk.png deleted file mode 100644 index 909f10bb..00000000 Binary files a/app/img/thinkingdesk.png and /dev/null differ diff --git a/app/js/login/login.js b/app/js/login/login.js index 12d8f781..740d3095 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -42,7 +42,8 @@ function ck() { ticker(); multiSelector(false); verck(ver); - $("#something-wrong img").attr("src", "../../img/thinkingdesk.png") + $(".stw").show() + $("#something-wrong img").attr("src", "../../img/thinking.svg") } } } diff --git a/app/view/bg/index.html b/app/view/bg/index.html index 1a18d84a..86d00ab6 100644 --- a/app/view/bg/index.html +++ b/app/view/bg/index.html @@ -945,8 +945,8 @@
- -
Вътрешна грешка: моля изчистете всички данни (в страницата с настройки) Всички данни ще бъдат изтрити.
+ +
diff --git a/app/view/cs/index.html b/app/view/cs/index.html index 8788ab19..0b56db7d 100644 --- a/app/view/cs/index.html +++ b/app/view/cs/index.html @@ -945,8 +945,8 @@
- -
Internal error: please clear all data(at setting page) All data will be deleted.
+ +
diff --git a/app/view/de/index.html b/app/view/de/index.html index cca07def..6e05cc93 100644 --- a/app/view/de/index.html +++ b/app/view/de/index.html @@ -945,8 +945,8 @@
- -
Interner Fehler: Bitte löschen Sie alle Daten (auf der Einstellungsseite) Alle Daten werden gelöscht.
+ +
diff --git a/app/view/en/index.html b/app/view/en/index.html index 81c4585d..13564a47 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -945,8 +945,8 @@
- -
Internal error: please clear all data(at setting page) All data will be deleted.
+ +
diff --git a/app/view/ja/index.html b/app/view/ja/index.html index bd737089..685d1f3b 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -945,8 +945,8 @@
- -
内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)
+ +
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 617fcc29..6256c99a 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -945,8 +945,8 @@
- -
@@helloTheDesk@@
+ +
diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 52c61756..37dfa743 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -945,8 +945,8 @@
- -
crwdns511:0crwdne511:0
+ +