From 0d8c83f27cc03efe2f332f84928f14309e646632 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 6 Jun 2018 04:00:48 +0900 Subject: [PATCH] wip --- src/client/app/desktop/api/post.ts | 2 +- .../received-follow-requests-window.vue | 6 ++--- .../views/components/user-lists-window.vue | 6 ++--- .../desktop/views/pages/deck/deck.column.vue | 1 - .../desktop/views/pages/deck/deck.note.vue | 26 ------------------- .../app/desktop/views/pages/deck/deck.vue | 19 +++++++++++++- 6 files changed, 25 insertions(+), 35 deletions(-) diff --git a/src/client/app/desktop/api/post.ts b/src/client/app/desktop/api/post.ts index af71829c7b..cfc78e50fa 100644 --- a/src/client/app/desktop/api/post.ts +++ b/src/client/app/desktop/api/post.ts @@ -6,7 +6,7 @@ export default (os: OS) => opts => { const o = opts || {}; if (o.renote) { const vm = os.new(RenoteFormWindow, { - renote: o.renote + note: o.renote }); document.body.appendChild(vm.$el); } else { 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 fd37c0a6aa..26b7ec2590 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 @@ -2,7 +2,7 @@ %fa:envelope R% %i18n:@title% -
+
{{ req.follower | userName }} @@ -63,10 +63,10 @@ root(isDark) > span margin 0 0 0 auto -[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"][data-darkmode] +.slpqaxdoxhvglersgjukmvizkqbmbokc[data-darkmode] root(true) -[data-id="c1136cec-1278-49b1-9ea7-412c1ef794f4"]:not([data-darkmode]) +.slpqaxdoxhvglersgjukmvizkqbmbokc:not([data-darkmode]) root(false) 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 109d1695d8..47648c287d 100644 --- a/src/client/app/desktop/views/components/user-lists-window.vue +++ b/src/client/app/desktop/views/components/user-lists-window.vue @@ -2,7 +2,7 @@ %fa:list% %i18n:@title% -
+
{{ list.title }}
@@ -60,10 +60,10 @@ root(isDark) border solid 1px isDark ? #1c2023 : #eee border-radius 4px -[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"][data-darkmode] +.xkxvokkjlptzyewouewmceqcxhpgzprp[data-darkmode] root(true) -[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"]:not([data-darkmode]) +.xkxvokkjlptzyewouewmceqcxhpgzprp:not([data-darkmode]) root(false) 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 eb1c47c46c..bae28f3a64 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column.vue @@ -61,7 +61,6 @@ root(isDark) min-width 330px max-width 330px height 100% - margin-right 16px background isDark ? #282C37 : #fff border-radius 6px box-shadow 0 2px 16px rgba(#000, 0.1) 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 8582a37b91..27d1cb8d47 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -111,14 +111,6 @@ export default Vue.extend({ return this.isRenote ? this.note.renote : this.note; }, - reactionsCount(): number { - return this.p.reactionCounts - ? Object.keys(this.p.reactionCounts) - .map(key => this.p.reactionCounts[key]) - .reduce((a, b) => a + b) - : 0; - }, - urls(): string[] { if (this.p.text) { const ast = parse(this.p.text); @@ -144,24 +136,6 @@ export default Vue.extend({ if (this.$store.getters.isSignedIn) { this.connection.on('_connected_', this.onStreamConnected); } - - // Draw map - if (this.p.geo) { - const shouldShowMap = this.$store.getters.isSignedIn ? this.$store.state.settings.showMaps : true; - if (shouldShowMap) { - (this as any).os.getGoogleMaps().then(maps => { - const uluru = new maps.LatLng(this.p.geo.coordinates[1], this.p.geo.coordinates[0]); - const map = new maps.Map(this.$refs.map, { - center: uluru, - zoom: 15 - }); - new maps.Marker({ - position: uluru, - map: map - }); - }); - } - } }, beforeDestroy() { diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index 079260972f..a31eb44dd0 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -1,12 +1,13 @@ @@ -72,6 +73,22 @@ root(isDark) padding 16px 0 16px 16px overflow auto + > div + margin-right 16px + + &:last-of-type + margin-right 0 + + > button + padding 0 16px + color isDark ? #93a0a5 : #888 + + &:hover + color isDark ? #b8c5ca : #777 + + &:active + color isDark ? #fff : #555 + .qlvquzbjribqcaozciifydkngcwtyzje[data-darkmode] root(true)