From 6ad31dca762a839d78d9ccfd3c388af3726d68fe Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 15:43:19 +0100 Subject: DarkMode user friends --- .../app/desktop/views/pages/user/user.friends.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.friends.vue b/src/client/app/desktop/views/pages/user/user.friends.vue index 4af0f0bca6..175c5ac916 100644 --- a/src/client/app/desktop/views/pages/user/user.friends.vue +++ b/src/client/app/desktop/views/pages/user/user.friends.vue @@ -40,9 +40,10 @@ export default Vue.extend({ -- cgit v1.2.3-freya From 530ee6f80e0f43470fa8c3450c8cc34051fb774e Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 15:45:35 +0100 Subject: DarkMode User Photos --- src/client/app/desktop/views/pages/user/user.photos.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.photos.vue b/src/client/app/desktop/views/pages/user/user.photos.vue index ce7791a96b..2318f2b8e4 100644 --- a/src/client/app/desktop/views/pages/user/user.photos.vue +++ b/src/client/app/desktop/views/pages/user/user.photos.vue @@ -39,8 +39,9 @@ export default Vue.extend({ -- cgit v1.2.3-freya From 09b05c8552dad49d43418ce30cd366fa6d3f9c6e Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 15:46:27 +0100 Subject: DarkMode user page bottom nav --- src/client/app/desktop/views/pages/user/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue index 300fd68f06..afb5e674d9 100644 --- a/src/client/app/desktop/views/pages/user/user.vue +++ b/src/client/app/desktop/views/pages/user/user.vue @@ -138,7 +138,7 @@ root(isDark) padding 16px font-size 12px color #aaa - background #fff + background isDark ? #21242f : #fff border solid 1px rgba(#000, 0.075) border-radius 6px -- cgit v1.2.3-freya From 975e4dd285dae06bfd28c274842f0a453cced394 Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 15:51:31 +0100 Subject: Remove temp border change --- src/client/app/desktop/views/pages/user/user.friends.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.friends.vue b/src/client/app/desktop/views/pages/user/user.friends.vue index 175c5ac916..49ca7a3f8f 100644 --- a/src/client/app/desktop/views/pages/user/user.friends.vue +++ b/src/client/app/desktop/views/pages/user/user.friends.vue @@ -43,7 +43,7 @@ export default Vue.extend({ root(isDark) .friends background isDark ? #282C37 : #fff - border solid 1px isDark ? #21242f : rgba(#000, 0.075) + border solid 1px rgba(#000, 0.075) border-radius 6px > .title -- cgit v1.2.3-freya From c07f668f14a3510e270b24ecea7193112b67221c Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 16:06:04 +0100 Subject: Fix border-radius on photos --- src/client/app/desktop/views/pages/user/user.photos.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.photos.vue b/src/client/app/desktop/views/pages/user/user.photos.vue index 2318f2b8e4..8397e56484 100644 --- a/src/client/app/desktop/views/pages/user/user.photos.vue +++ b/src/client/app/desktop/views/pages/user/user.photos.vue @@ -44,6 +44,7 @@ root(isDark) background isDark ? #282C37 : #fff border solid 1px rgba(#000, 0.075) border-radius 6px + overflow hidden > .title z-index 1 -- cgit v1.2.3-freya From f283d2423fa3b5b4e0e4ee6fda6a7848b1a53365 Mon Sep 17 00:00:00 2001 From: Hiramiya Date: Mon, 27 Aug 2018 16:06:31 +0100 Subject: Fix border-radius on friends --- src/client/app/desktop/views/pages/user/user.friends.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/pages/user/user.friends.vue b/src/client/app/desktop/views/pages/user/user.friends.vue index 49ca7a3f8f..516eea0288 100644 --- a/src/client/app/desktop/views/pages/user/user.friends.vue +++ b/src/client/app/desktop/views/pages/user/user.friends.vue @@ -45,6 +45,7 @@ root(isDark) background isDark ? #282C37 : #fff border solid 1px rgba(#000, 0.075) border-radius 6px + overflow hidden > .title z-index 1 -- cgit v1.2.3-freya From f55fcd33055adb5b1395938a89903c1ab2211a78 Mon Sep 17 00:00:00 2001 From: Zero King Date: Wed, 29 Aug 2018 04:34:53 +0000 Subject: Use https:// for maps.google.com links --- src/client/app/desktop/views/components/note-detail.vue | 2 +- src/client/app/desktop/views/components/notes.note.vue | 2 +- src/client/app/desktop/views/pages/deck/deck.note.vue | 2 +- src/client/app/mobile/views/components/note-detail.vue | 2 +- src/client/app/mobile/views/components/note.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 227bcc349d..1ba4a9a447 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -47,7 +47,7 @@ - %fa:map-marker-alt% %i18n:@location% + %fa:map-marker-alt% %i18n:@location%
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 87acf7974d..7592ae3905 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -32,7 +32,7 @@
- %fa:map-marker-alt% 位置情報 + %fa:map-marker-alt% 位置情報
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue index c7df715a05..e6d062eac9 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -32,7 +32,7 @@
- %fa:map-marker-alt% %i18n:@location% + %fa:map-marker-alt% %i18n:@location%
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index 317f08dcfa..f9996f9da6 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -45,7 +45,7 @@ - %fa:map-marker-alt% %i18n:@location% + %fa:map-marker-alt% %i18n:@location%
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index 8fc8af7f8d..d0cea135f9 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -33,7 +33,7 @@
- %fa:map-marker-alt% %i18n:@location% + %fa:map-marker-alt% %i18n:@location%
-- cgit v1.2.3-freya From e50fa4762dea5dd802dd8a1abbd94ffce7bfb444 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Aug 2018 03:37:23 +0900 Subject: Clean up --- src/client/app/desktop/views/components/ui.header.nav.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue index f01aade306..6292b764c6 100644 --- a/src/client/app/desktop/views/components/ui.header.nav.vue +++ b/src/client/app/desktop/views/components/ui.header.nav.vue @@ -11,7 +11,7 @@
  • %fa:columns% -

    %i18n:@deck% (beta)

    +

    %i18n:@deck%
  • -- cgit v1.2.3-freya From 1b7d98c17e7535f71d35290cc74905aab56fd6c6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Aug 2018 03:56:04 +0900 Subject: :art: --- src/client/app/desktop/views/components/charts.vue | 6 ++++-- src/client/app/desktop/views/pages/stats/stats.vue | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/client/app/desktop/views') diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue index e400aebbb7..c4e92e429f 100644 --- a/src/client/app/desktop/views/components/charts.vue +++ b/src/client/app/desktop/views/components/charts.vue @@ -88,7 +88,9 @@ export default Vue.extend({ }, created() { - (this as any).api('chart').then(chart => { + (this as any).api('chart', { + limit: 32 + }).then(chart => { this.chart = chart; }); }, @@ -580,6 +582,6 @@ export default Vue.extend({ > div > * display block - height 300px + height 320px diff --git a/src/client/app/desktop/views/pages/stats/stats.vue b/src/client/app/desktop/views/pages/stats/stats.vue index 6fcbf069ee..41005b6398 100644 --- a/src/client/app/desktop/views/pages/stats/stats.vue +++ b/src/client/app/desktop/views/pages/stats/stats.vue @@ -60,5 +60,5 @@ export default Vue.extend({ font-size 70% > div - max-width 800px + max-width 850px -- cgit v1.2.3-freya From f0abc4642969587039909d5f50adb7d4592f48ba Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Aug 2018 22:10:29 +0900 Subject: 開発モードで警告を表示するようにするなど MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 2 ++ src/client/app/config.ts | 2 ++ src/client/app/desktop/views/components/ui.header.vue | 19 ++++++++++++++++++- src/client/app/mobile/views/components/ui.header.vue | 18 +++++++++++++++--- src/client/app/mobile/views/components/ui.vue | 7 +++++++ webpack.config.ts | 3 ++- 6 files changed, 46 insertions(+), 5 deletions(-) (limited to 'src/client/app/desktop/views') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 84b7ddb26f..6ebd167803 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -94,6 +94,8 @@ common: verified-user: "公式アカウント" disable-animated-mfm: "投稿内の動きのあるテキストを無効にする" + do-not-use-in-production: 'これは開発ビルドです。本番環境で使用しないでください。' + reversi: drawn: "引き分け" my-turn: "あなたのターンです" diff --git a/src/client/app/config.ts b/src/client/app/config.ts index 74b9ea21c8..a326c521db 100644 --- a/src/client/app/config.ts +++ b/src/client/app/config.ts @@ -4,6 +4,7 @@ declare const _THEME_COLOR_: string; declare const _COPYRIGHT_: string; declare const _VERSION_: string; declare const _CODENAME_: string; +declare const _ENV_: string; const address = new URL(location.href); @@ -18,3 +19,4 @@ export const themeColor = _THEME_COLOR_; export const copyright = _COPYRIGHT_; export const version = _VERSION_; export const codename = _CODENAME_; +export const env = _ENV_; diff --git a/src/client/app/desktop/views/components/ui.header.vue b/src/client/app/desktop/views/components/ui.header.vue index 6de4eaf744..ac8a6c7765 100644 --- a/src/client/app/desktop/views/components/ui.header.vue +++ b/src/client/app/desktop/views/components/ui.header.vue @@ -1,5 +1,6 @@