From 66b59f2752e47a9f6349810c8de6d2947d811de0 Mon Sep 17 00:00:00 2001 From: wakarimasen Date: Tue, 11 Apr 2017 11:47:19 +0200 Subject: [PATCH 1/8] Fix daily average on accounts younger than a day --- src/components/user_card_content/user_card_content.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 8c971d53..7b89a7f2 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -79,9 +79,8 @@ return this.$store.state.users.currentUser }, dailyAvg () { - return Math.round( - this.user.statuses_count / ((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000)) - ) + const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000)) + return Math.round(this.user.statuses_count / days) } }, methods: { From 446de1c623020cb0687bf2dd868b39be5267ef1d Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 02:05:31 +0300 Subject: [PATCH 2/8] Potential new default dark and light themes added (base16-pleroma-dark, base16-pleroma-light). The new dark one set as the default. --- static/config.json | 2 +- static/css/base16-pleroma-dark.css | 33 +++++++++++++++++++++++++++++ static/css/base16-pleroma-light.css | 33 +++++++++++++++++++++++++++++ static/css/themes.json | 2 ++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 static/css/base16-pleroma-dark.css create mode 100644 static/css/base16-pleroma-light.css diff --git a/static/config.json b/static/config.json index fb8d4015..3b6d56c4 100644 --- a/static/config.json +++ b/static/config.json @@ -1,6 +1,6 @@ { "name": "Pleroma FE", - "theme": "base16-ashes.css", + "theme": "base16-pleroma-dark.css", "background": "/static/bg.jpg", "logo": "/static/logo.png" } diff --git a/static/css/base16-pleroma-dark.css b/static/css/base16-pleroma-dark.css new file mode 100644 index 00000000..8190d2a7 --- /dev/null +++ b/static/css/base16-pleroma-dark.css @@ -0,0 +1,33 @@ +.base00-background { background-color: #161c20; } +.base01-background { background-color: #282e32; } +.base02-background { background-color: #343a3f; } +.base03-background { background-color: #4e5256; } +.base04-background { background-color: #ababab; } +.base05-background { background-color: #b9b9b9; } +.base06-background { background-color: #d0d0d0; } +.base07-background { background-color: #e7e7e7; } +.base08-background { background-color: #baaa9c; } +.base09-background { background-color: #999999; } +.base0A-background { background-color: #a0a0a0; } +.base0B-background { background-color: #8e8e8e; } +.base0C-background { background-color: #868686; } +.base0D-background { background-color: #686868; } +.base0E-background { background-color: #747474; } +.base0F-background { background-color: #5e5e5e; } + +.base00 { color: #161c20; } +.base01 { color: #282e32; } +.base02 { color: #36393e; } +.base03 { color: #4e5256; } +.base04 { color: #ababab; } +.base05 { color: #b9b9b9; } +.base06 { color: #d0d0d0; } +.base07 { color: #e7e7e7; } +.base08 { color: #baaa9c; } +.base09 { color: #999999; } +.base0A { color: #a0a0a0; } +.base0B { color: #8e8e8e; } +.base0C { color: #868686; } +.base0D { color: #686868; } +.base0E { color: #747474; } +.base0F { color: #5e5e5e; } diff --git a/static/css/base16-pleroma-light.css b/static/css/base16-pleroma-light.css new file mode 100644 index 00000000..1a85689a --- /dev/null +++ b/static/css/base16-pleroma-light.css @@ -0,0 +1,33 @@ +.base00-background { background-color: #f2f4f6; } +.base01-background { background-color: #dde2e6; } +.base02-background { background-color: #c0c6cb; } +.base03-background { background-color: #a4a4a4; } +.base04-background { background-color: #545454; } +.base05-background { background-color: #304055; } +.base06-background { background-color: #040404; } +.base07-background { background-color: #000000; } +.base08-background { background-color: #e92f2f; } +.base09-background { background-color: #e09448; } +.base0A-background { background-color: #dddd13; } +.base0B-background { background-color: #0ed839; } +.base0C-background { background-color: #23edda; } +.base0D-background { background-color: #3b48e3; } +.base0E-background { background-color: #f996e2; } +.base0F-background { background-color: #69542d; } + +.base00 { color: #f2f4f6; } +.base01 { color: #dde2e6; } +.base02 { color: #c0c6cb; } +.base03 { color: #a4a4a4; } +.base04 { color: #545454; } +.base05 { color: #304055; } +.base06 { color: #040404; } +.base07 { color: #000000; } +.base08 { color: #e46f0f; } +.base09 { color: #e09448; } +.base0A { color: #dddd13; } +.base0B { color: #0ed839; } +.base0C { color: #23edda; } +.base0D { color: #3b48e3; } +.base0E { color: #f996e2; } +.base0F { color: #69542d; } diff --git a/static/css/themes.json b/static/css/themes.json index e3c35d6d..ea8e5a0c 100644 --- a/static/css/themes.json +++ b/static/css/themes.json @@ -1,4 +1,6 @@ [ +"base16-pleroma-dark.css", +"base16-pleroma-light.css", "base16-3024.css", "base16-apathy.css", "base16-ashes.css", From 3fb50205fb718123815ad93681cbb1133719a327 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 08:31:57 -0400 Subject: [PATCH 3/8] Updated README.md screenshot. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bdab5251..114228d8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > A Qvitter-style frontend for certain GS servers. -![screenshot](http://i.imgur.com/3q30Zxt.jpg) +![screenshot](https://my.mixtape.moe/kjzioz.PNG) # FOR ADMINS From 83205b8c0e317d63c9cef86ede6a84a69021f4e2 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 16:17:57 +0300 Subject: [PATCH 4/8] Make sidepanel scroll independently from timeline, allows for seeing notifications and posting new statuses even when scrolled deep down. --- src/App.scss | 28 +++++++++++++++++++ src/App.vue | 12 +++++--- .../notifications/notifications.scss | 2 ++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/App.scss b/src/App.scss index 8a1942c6..6e584f3d 100644 --- a/src/App.scss +++ b/src/App.scss @@ -222,6 +222,12 @@ nav { flex-basis: 35%; } +.sidebar-flexer { + flex: 1; + flex-basis: 35%; + width: 365px; +} + .mobile-shown { display: none; } @@ -238,6 +244,28 @@ nav { } } +@media all and (min-width: 960px) { + .sidebar { + overflow: hidden; + max-height: 100vh; + max-width: 345px; + position: fixed; + margin-top: -10px; + + .sidebar-container { + height: 96vh; + padding-top: 10px; + margin-right: -40px; + padding-right: 25px; + overflow-x: hidden; + overflow-y: auto; + } + } + .sidebar-flexer { + max-height: 96vh; + } +} + @media all and (max-width: 959px) { .mobile-hidden { display: none; diff --git a/src/App.vue b/src/App.vue index c4b3cb13..fcfdae97 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,10 +15,14 @@ -
- - - +
+
+
+ + + +
+
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 9bc2a5ec..c7c650a9 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -1,6 +1,8 @@ @import '../../_variables.scss'; .notifications { + // a bit of a hack to allow scrolling below notifications + padding-bottom: 15em; .panel-heading { // force the text to stay centered, while keeping From f1764796e1f757bd6d51db9b3d8ade3e0d0d80b5 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 17:01:18 +0300 Subject: [PATCH 5/8] Fixed flex issue between 980 and 960 pixels width --- src/App.scss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/App.scss b/src/App.scss index 6e584f3d..16278e98 100644 --- a/src/App.scss +++ b/src/App.scss @@ -213,18 +213,19 @@ nav { } .main { - flex: 1; - flex-basis: 65%; + flex-basis: 60%; + flex-grow: 1; + flex-shrink: 1; } .sidebar { - flex: 1; - flex-basis: 35%; + flex: 1; + flex-basis: 35%; } .sidebar-flexer { flex: 1; - flex-basis: 35%; + flex-basis: 345px; width: 365px; } @@ -263,6 +264,8 @@ nav { } .sidebar-flexer { max-height: 96vh; + flex-shrink: 0; + flex-grow: 0; } } From 69ef9101d4066df5df6780a2bfaeaa949869df02 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 17:57:20 +0300 Subject: [PATCH 6/8] Fix login screen, (remove one duplicate line from user card css). --- src/App.scss | 7 ++++--- src/components/user_card_content/user_card_content.vue | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.scss b/src/App.scss index 16278e98..0f5c13c7 100644 --- a/src/App.scss +++ b/src/App.scss @@ -219,7 +219,7 @@ nav { } .sidebar { - flex: 1; + flex: 0; flex-basis: 35%; } @@ -249,17 +249,18 @@ nav { .sidebar { overflow: hidden; max-height: 100vh; - max-width: 345px; + width: 345px; position: fixed; margin-top: -10px; .sidebar-container { height: 96vh; + width: 360px; padding-top: 10px; margin-right: -40px; padding-right: 25px; overflow-x: hidden; - overflow-y: auto; + overflow-y: scroll; } } .sidebar-flexer { diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 7b89a7f2..bba16584 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -116,7 +116,6 @@ } .profile-panel-body { - padding-top: 0em; top: -0em; padding-top: 4em; } From 2efddaf874b4125dac26415e251d4e542cb0b816 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 23:36:16 +0300 Subject: [PATCH 7/8] Tweak values to minimize distracting artifacting when scrollbars are smaller or don't exist. --- src/App.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/App.scss b/src/App.scss index 0f5c13c7..0a7e1ce5 100644 --- a/src/App.scss +++ b/src/App.scss @@ -249,16 +249,15 @@ nav { .sidebar { overflow: hidden; max-height: 100vh; - width: 345px; + width: 350px; position: fixed; margin-top: -10px; .sidebar-container { height: 96vh; - width: 360px; + width: 362px; padding-top: 10px; - margin-right: -40px; - padding-right: 25px; + padding-right: 20px; overflow-x: hidden; overflow-y: scroll; } From e64905d88ba25074c6ac4f683abd4c1f54870e08 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Fri, 14 Apr 2017 13:43:53 +0300 Subject: [PATCH 8/8] Change attachments margin to not cause the element to overflow. --- src/components/attachment/attachment.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 1ba1c02a..d50664b6 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -33,10 +33,10 @@ .attachments { display: flex; flex-wrap: wrap; - margin-right: -0.8em; + margin-right: -0.7em; .attachment { flex: 1 0 30%; - margin: 0.5em 0.8em 0.6em 0.0em; + margin: 0.5em 0.7em 0.6em 0.0em; align-self: flex-start; &.html {