diff --git a/README.md b/README.md index bdab5251eb..114228d805 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 diff --git a/src/App.scss b/src/App.scss index 8a1942c63a..0a7e1ce5d6 100644 --- a/src/App.scss +++ b/src/App.scss @@ -213,13 +213,20 @@ nav { } .main { - flex: 1; - flex-basis: 65%; + flex-basis: 60%; + flex-grow: 1; + flex-shrink: 1; } .sidebar { - flex: 1; - flex-basis: 35%; + flex: 0; + flex-basis: 35%; +} + +.sidebar-flexer { + flex: 1; + flex-basis: 345px; + width: 365px; } .mobile-shown { @@ -238,6 +245,30 @@ nav { } } +@media all and (min-width: 960px) { + .sidebar { + overflow: hidden; + max-height: 100vh; + width: 350px; + position: fixed; + margin-top: -10px; + + .sidebar-container { + height: 96vh; + width: 362px; + padding-top: 10px; + padding-right: 20px; + overflow-x: hidden; + overflow-y: scroll; + } + } + .sidebar-flexer { + max-height: 96vh; + flex-shrink: 0; + flex-grow: 0; + } +} + @media all and (max-width: 959px) { .mobile-hidden { display: none; diff --git a/src/App.vue b/src/App.vue index c4b3cb1366..fcfdae97a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,10 +15,14 @@ -
- - - +
+
+
+ + + +
+
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 1ba1c02af4..d50664b6d1 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 { diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 9bc2a5ecfc..c7c650a945 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 diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 8c971d537c..bba1658496 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: { @@ -117,7 +116,6 @@ } .profile-panel-body { - padding-top: 0em; top: -0em; padding-top: 4em; } diff --git a/static/config.json b/static/config.json index fb8d401581..3b6d56c44a 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 0000000000..8190d2a78e --- /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 0000000000..1a85689aa9 --- /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 e3c35d6dd4..ea8e5a0c4c 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",