From 446de1c623020cb0687bf2dd868b39be5267ef1d Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 13 Apr 2017 02:05:31 +0300 Subject: 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 (limited to 'static') 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", -- cgit v1.2.3-70-g09d2 From 3a1ae3a30e1418099a71cdc8ea92d5f360b0f65d Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 31 May 2017 12:45:03 +0300 Subject: Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' --- src/main.js | 2 +- static/timeago.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 static/timeago.json (limited to 'static') diff --git a/src/main.js b/src/main.js index 969ca8dc..35261578 100644 --- a/src/main.js +++ b/src/main.js @@ -24,7 +24,7 @@ Vue.use(VueRouter) Vue.use(VueTimeago, { locale: 'en-US', locales: { - 'en-US': require('vue-timeago/locales/en-US.json') + 'en-US': require('../static/timeago.json') } }) diff --git a/static/timeago.json b/static/timeago.json new file mode 100644 index 00000000..b6f669c2 --- /dev/null +++ b/static/timeago.json @@ -0,0 +1,10 @@ +[ + "now", + ["%ss", "%ss"], + ["%smin", "%smin"], + ["%sh", "%sh"], + ["%sd", "%sd"], + ["%sw", "%sw"], + ["%sm", "%sm"], + ["%sy", "%sy"] +] -- cgit v1.2.3-70-g09d2 From bac1d3bd57fb0c04b32c31a048ccf58a3dee6be0 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Sat, 3 Jun 2017 23:42:54 +0300 Subject: Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu. --- src/App.scss | 2 ++ src/App.vue | 3 ++- src/components/user_finder/user_finder.js | 6 +++++- src/components/user_finder/user_finder.vue | 20 +++++++++++++++----- static/font/config.json | 12 ++++++++++++ static/font/css/fontello-codes.css | 4 +++- static/font/css/fontello-embedded.css | 16 +++++++++------- static/font/css/fontello-ie7-codes.css | 4 +++- static/font/css/fontello-ie7.css | 4 +++- static/font/css/fontello.css | 18 ++++++++++-------- static/font/demo.html | 14 +++++++++----- static/font/font/fontello.eot | Bin 8428 -> 9052 bytes static/font/font/fontello.svg | 4 ++++ static/font/font/fontello.ttf | Bin 8260 -> 8884 bytes static/font/font/fontello.woff | Bin 5124 -> 5524 bytes static/font/font/fontello.woff2 | Bin 4384 -> 4720 bytes 16 files changed, 77 insertions(+), 30 deletions(-) (limited to 'static') diff --git a/src/App.scss b/src/App.scss index 3db81537..a5f190cb 100644 --- a/src/App.scss +++ b/src/App.scss @@ -52,6 +52,8 @@ button{ .item { flex: 1; + line-height: 21px; + height: 21px; } .gaps > .item { diff --git a/src/App.vue b/src/App.vue index d0c6671e..d77c34bb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,6 +6,7 @@ {{sitename}}
+
@@ -19,7 +20,7 @@ diff --git a/static/font/font/fontello.eot b/static/font/font/fontello.eot index 4050fa3b..4573d823 100644 Binary files a/static/font/font/fontello.eot and b/static/font/font/fontello.eot differ diff --git a/static/font/font/fontello.svg b/static/font/font/fontello.svg index f1e8b9fc..98105a87 100644 --- a/static/font/font/fontello.svg +++ b/static/font/font/fontello.svg @@ -26,9 +26,13 @@ + + + + \ No newline at end of file diff --git a/static/font/font/fontello.ttf b/static/font/font/fontello.ttf index bec32f07..c3bfb92a 100644 Binary files a/static/font/font/fontello.ttf and b/static/font/font/fontello.ttf differ diff --git a/static/font/font/fontello.woff b/static/font/font/fontello.woff index 245e1d2f..dced1f8c 100644 Binary files a/static/font/font/fontello.woff and b/static/font/font/fontello.woff differ diff --git a/static/font/font/fontello.woff2 b/static/font/font/fontello.woff2 index 9ec54aa4..b91fcbd7 100644 Binary files a/static/font/font/fontello.woff2 and b/static/font/font/fontello.woff2 differ -- cgit v1.2.3-70-g09d2