From 6ad31dca762a839d78d9ccfd3c388af3726d68fe Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:43:19 +0100 Subject: [PATCH 1/6] DarkMode user friends --- .../desktop/views/pages/user/user.friends.vue | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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({ </script> <style lang="stylus" scoped> +root(isDark) .friends - background #fff - border solid 1px rgba(#000, 0.075) + background isDark ? #282C37 : #fff + border solid 1px isDark ? #21242f : rgba(#000, 0.075) border-radius 6px > .title @@ -52,7 +53,8 @@ export default Vue.extend({ line-height 42px font-size 0.9em font-weight bold - color #888 + background isDark ? #313543 : inherit + color isDark ? #e3e5e8 : #888 box-shadow 0 1px rgba(#000, 0.07) > i @@ -70,7 +72,7 @@ export default Vue.extend({ > .user padding 16px - border-bottom solid 1px #eee + border-bottom solid 1px isDark ? #21242f : #eee &:last-child border-bottom none @@ -96,18 +98,24 @@ export default Vue.extend({ margin 0 font-size 16px line-height 24px - color #555 + color isDark ? #ccc : #555 > .username display block margin 0 font-size 15px line-height 16px - color #ccc + color isDark ? #555 : #ccc > .mk-follow-button position absolute top 16px right 16px +.friends[data-darkmode] + root(true) + +.friends:not([data-darkmode]) + root(false) + </style> From 530ee6f80e0f43470fa8c3450c8cc34051fb774e Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:45:35 +0100 Subject: [PATCH 2/6] DarkMode User Photos --- .../app/desktop/views/pages/user/user.photos.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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({ </script> <style lang="stylus" scoped> +root(isDark) .photos - background #fff + background isDark ? #282C37 : #fff border solid 1px rgba(#000, 0.075) border-radius 6px @@ -51,7 +52,8 @@ export default Vue.extend({ line-height 42px font-size 0.9em font-weight bold - color #888 + background: isDark ? #313543 : inherit + color isDark ? #e3e5e8 : #888 box-shadow 0 1px rgba(#000, 0.07) > i @@ -85,4 +87,10 @@ export default Vue.extend({ > i margin-right 4px +.photos[data-darkmode] + root(true) + +.photos:not([data-darkmode]) + root(false) + </style> From 09b05c8552dad49d43418ce30cd366fa6d3f9c6e Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:46:27 +0100 Subject: [PATCH 3/6] DarkMode user page bottom nav --- src/client/app/desktop/views/pages/user/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 975e4dd285dae06bfd28c274842f0a453cced394 Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:51:31 +0100 Subject: [PATCH 4/6] Remove temp border change --- src/client/app/desktop/views/pages/user/user.friends.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c07f668f14a3510e270b24ecea7193112b67221c Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 16:06:04 +0100 Subject: [PATCH 5/6] Fix border-radius on photos --- src/client/app/desktop/views/pages/user/user.photos.vue | 1 + 1 file changed, 1 insertion(+) 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 From f283d2423fa3b5b4e0e4ee6fda6a7848b1a53365 Mon Sep 17 00:00:00 2001 From: Hiramiya <Hiramiya@users.noreply.github.com> Date: Mon, 27 Aug 2018 16:06:31 +0100 Subject: [PATCH 6/6] Fix border-radius on friends --- src/client/app/desktop/views/pages/user/user.friends.vue | 1 + 1 file changed, 1 insertion(+) 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