From 13f258308ea5dc158a61f7e89b634450171d30ad Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 28 Sep 2018 15:34:34 +0900 Subject: [PATCH] wip --- src/client/app/desktop/script.ts | 2 - .../received-follow-requests-window.vue | 11 +- .../desktop/views/components/renote-form.vue | 13 +- .../views/components/ui-notification.vue | 14 +- .../views/components/user-lists-window.vue | 11 +- .../desktop/views/components/user-preview.vue | 21 +-- .../desktop/views/pages/deck/deck.column.vue | 14 +- .../desktop/views/pages/deck/deck.note.vue | 20 +-- .../desktop/views/pages/deck/deck.notes.vue | 14 +- .../views/pages/deck/deck.notification.vue | 2 +- .../app/desktop/views/pages/deck/deck.vue | 16 +-- .../views/pages/deck/deck.widgets-column.vue | 13 +- .../desktop/views/pages/user-list.users.vue | 125 ------------------ .../app/desktop/views/pages/user-list.vue | 71 ---------- src/client/theme/dark.json | 6 + src/client/theme/light.json | 8 +- 16 files changed, 45 insertions(+), 316 deletions(-) delete mode 100644 src/client/app/desktop/views/pages/user-list.users.vue delete mode 100644 src/client/app/desktop/views/pages/user-list.vue diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 8b184a4aa..05aa928fa 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -29,7 +29,6 @@ import MkUser from './views/pages/user/user.vue'; import MkFavorites from './views/pages/favorites.vue'; import MkSelectDrive from './views/pages/selectdrive.vue'; import MkDrive from './views/pages/drive.vue'; -import MkUserList from './views/pages/user-list.vue'; import MkHomeCustomize from './views/pages/home-customize.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue'; import MkNote from './views/pages/note.vue'; @@ -63,7 +62,6 @@ init(async (launch) => { { path: '/i/messaging/:user', component: MkMessagingRoom }, { path: '/i/drive', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive }, - { path: '/i/lists/:list', component: MkUserList }, { path: '/selectdrive', component: MkSelectDrive }, { path: '/search', component: MkSearch }, { path: '/tags/:tag', component: MkTag }, diff --git a/src/client/app/desktop/views/components/received-follow-requests-window.vue b/src/client/app/desktop/views/components/received-follow-requests-window.vue index 8ade6a721..3df1329c4 100644 --- a/src/client/app/desktop/views/components/received-follow-requests-window.vue +++ b/src/client/app/desktop/views/components/received-follow-requests-window.vue @@ -47,8 +47,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/renote-form.vue b/src/client/app/desktop/views/components/renote-form.vue index ad23740f1..6717ced3b 100644 --- a/src/client/app/desktop/views/components/renote-form.vue +++ b/src/client/app/desktop/views/components/renote-form.vue @@ -57,16 +57,13 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/ui-notification.vue b/src/client/app/desktop/views/components/ui-notification.vue index 883a880e5..dafede4c3 100644 --- a/src/client/app/desktop/views/components/ui-notification.vue +++ b/src/client/app/desktop/views/components/ui-notification.vue @@ -36,7 +36,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/user-lists-window.vue b/src/client/app/desktop/views/components/user-lists-window.vue index 4f944981a..9c384314c 100644 --- a/src/client/app/desktop/views/components/user-lists-window.vue +++ b/src/client/app/desktop/views/components/user-lists-window.vue @@ -47,8 +47,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue index 01b6cdbdc..7f5e79eae 100644 --- a/src/client/app/desktop/views/components/user-preview.vue +++ b/src/client/app/desktop/views/components/user-preview.vue @@ -83,9 +83,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/pages/deck/deck.column.vue index 2dba7d252..1b939f2f5 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column.vue @@ -269,9 +269,7 @@ export default Vue.extend({ 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 2555c6f7e..eac0e78f0 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -214,9 +214,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue index 7e171a239..884be3a84 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notes.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue @@ -195,9 +195,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/pages/deck/deck.notification.vue b/src/client/app/desktop/views/pages/deck/deck.notification.vue index ff10ac2aa..b318579b3 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notification.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue @@ -142,7 +142,7 @@ root(isDark) > .mk-time margin-left auto - color isDark ? #606984 : #c0c0c0 + color var(--noteHeaderInfo) font-size 0.9em > .note-preview diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index cd3336079..22b4c50bb 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -221,9 +221,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue index fe190bf89..e1fecc98b 100644 --- a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue @@ -135,9 +135,7 @@ export default Vue.extend({ diff --git a/src/client/app/desktop/views/pages/user-list.users.vue b/src/client/app/desktop/views/pages/user-list.users.vue deleted file mode 100644 index 7d9a4606a..000000000 --- a/src/client/app/desktop/views/pages/user-list.users.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/pages/user-list.vue b/src/client/app/desktop/views/pages/user-list.vue deleted file mode 100644 index 2241b84e5..000000000 --- a/src/client/app/desktop/views/pages/user-list.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 462999a64..97ec96827 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -126,9 +126,13 @@ "desktopHeaderSearchBg": "rgba(0, 0, 0, 0.1)", "desktopHeaderSearchHoverBg": "rgba(255, 255, 255, 0.04)", "desktopHeaderSearchFg": "#fff", + "desktopNotificationBg": ":alpha<0.9<$secondary", + "desktopNotificationFg": ":alpha<0.7<$text", + "desktopNotificationShadow": "rgba(0, 0, 0, 0.4)", "desktopPostFormBg": "@face", "desktopPostFormTextareaBg": "rgba(0, 0, 0, 0.25)", "desktopPostFormTextareaFg": "#fff", + "desktopRenoteFormFooter": ":lighten<5<$secondary", "desktopTimelineHeaderShadow": "rgba(0, 0, 0, 0.15)", "desktopTimelineSrc": "@faceTextButton", "desktopTimelineSrcHover": "@faceTextButtonHover", @@ -136,6 +140,8 @@ "desktopSettingsNavItem": ":alpha<0.8<$text", "desktopSettingsNavItemHover": ":lighten<10<$text", + "deckAcrylicColumnBg": "rgba(0, 0, 0, 0.25)", + "mobileHeaderBg": ":lighten<5<$secondary", "mobileHeaderFg": "$text", "mobileNavBackdrop": "rgba(0, 0, 0, 0.7)", diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 60824e0a8..52822bc5f 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -126,9 +126,13 @@ "desktopHeaderSearchBg": "rgba(0, 0, 0, 0.05)", "desktopHeaderSearchHoverBg": "rgba(0, 0, 0, 0.08)", "desktopHeaderSearchFg": "#000", - "desktopPostFormBg": "#fff6f6", + "desktopNotificationBg": ":alpha<0.9<$secondary", + "desktopNotificationFg": ":alpha<0.7<$text", + "desktopNotificationShadow": "rgba(0, 0, 0, 0.2)", + "desktopPostFormBg": ":lighten<33<$primary", "desktopPostFormTextareaBg": "#fff", "desktopPostFormTextareaFg": "#333", + "desktopRenoteFormFooter": ":lighten<33<$primary", "desktopTimelineHeaderShadow": "rgba(0, 0, 0, 0.08)", "desktopTimelineSrc": "#6f7477", "desktopTimelineSrcHover": "#525a5f", @@ -136,6 +140,8 @@ "desktopSettingsNavItem": ":alpha<0.8<$text", "desktopSettingsNavItemHover": ":darken<10<$text", + "deckAcrylicColumnBg": "rgba(0, 0, 0, 0.1)", + "mobileHeaderBg": ":lighten<5<$secondary", "mobileHeaderFg": "$text", "mobileNavBackdrop": "rgba(0, 0, 0, 0.2)",