diff --git a/priv/static/index.html b/priv/static/index.html
index 6e1f751ce..557ee5849 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1 +1 @@
-Pleroma
\ No newline at end of file
+Pleroma
\ No newline at end of file
diff --git a/priv/static/static/css/app.ae04505b31bb0ee2765e.css b/priv/static/static/css/app.1055039ce3f2fe4dd110.css
similarity index 90%
rename from priv/static/static/css/app.ae04505b31bb0ee2765e.css
rename to priv/static/static/css/app.1055039ce3f2fe4dd110.css
index 05e3f2087..1867ca81a 100644
Binary files a/priv/static/static/css/app.ae04505b31bb0ee2765e.css and b/priv/static/static/css/app.1055039ce3f2fe4dd110.css differ
diff --git a/priv/static/static/css/app.1055039ce3f2fe4dd110.css.map b/priv/static/static/css/app.1055039ce3f2fe4dd110.css.map
new file mode 100644
index 000000000..861ee8313
--- /dev/null
+++ b/priv/static/static/css/app.1055039ce3f2fe4dd110.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/hocs/with_load_more/with_load_more.scss","webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_subscription/with_subscription.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACxFA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.1055039ce3f2fe4dd110.css","sourcesContent":[".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}",".tab-switcher {\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher .contents {\n -ms-flex: 1 0 auto;\n flex: 1 0 auto;\n min-height: 0px;\n}\n.tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .contents.scrollable-tabs {\n -ms-flex-preferred-size: 0;\n flex-basis: 0;\n overflow-y: auto;\n}\n.tab-switcher .tabs {\n display: -ms-flexbox;\n display: flex;\n position: relative;\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n content: \"\";\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher .tabs .tab-wrapper {\n height: 28px;\n position: relative;\n display: -ms-flexbox;\n display: flex;\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n}\n.tab-switcher .tabs .tab-wrapper .tab {\n width: 100%;\n min-width: 1px;\n position: relative;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding: 6px 1em;\n padding-bottom: 99px;\n margin-bottom: -93px;\n white-space: nowrap;\n color: #b9b9ba;\n color: var(--tabText, #b9b9ba);\n background-color: #182230;\n background-color: var(--tab, #182230);\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tabs .tab-wrapper .tab.active {\n background: transparent;\n z-index: 5;\n color: #b9b9ba;\n color: var(--tabActiveText, #b9b9ba);\n}\n.tab-switcher .tabs .tab-wrapper .tab img {\n max-height: 26px;\n vertical-align: top;\n margin-top: -5px;\n}\n.tab-switcher .tabs .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: 7;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}",".with-subscription-loading {\n padding: 10px;\n text-align: center;\n}\n.with-subscription-loading .error {\n font-size: 14px;\n}"],"sourceRoot":""}
\ No newline at end of file
diff --git a/priv/static/static/css/app.ae04505b31bb0ee2765e.css.map b/priv/static/static/css/app.ae04505b31bb0ee2765e.css.map
deleted file mode 100644
index 72f33316e..000000000
--- a/priv/static/static/css/app.ae04505b31bb0ee2765e.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/hocs/with_load_more/with_load_more.scss","webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_subscription/with_subscription.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;AClFA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.ae04505b31bb0ee2765e.css","sourcesContent":[".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}",".tab-switcher {\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher .contents {\n -ms-flex: 1 0 auto;\n flex: 1 0 auto;\n min-height: 0px;\n}\n.tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .contents.scrollable-tabs {\n -ms-flex-preferred-size: 0;\n flex-basis: 0;\n overflow-y: auto;\n}\n.tab-switcher .tabs {\n display: -ms-flexbox;\n display: flex;\n position: relative;\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n content: \"\";\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher .tabs .tab-wrapper {\n height: 28px;\n position: relative;\n display: -ms-flexbox;\n display: flex;\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n}\n.tab-switcher .tabs .tab-wrapper .tab {\n width: 100%;\n min-width: 1px;\n position: relative;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding: 6px 1em;\n padding-bottom: 99px;\n margin-bottom: -93px;\n white-space: nowrap;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tabs .tab-wrapper .tab.active {\n background: transparent;\n z-index: 5;\n}\n.tab-switcher .tabs .tab-wrapper .tab img {\n max-height: 26px;\n vertical-align: top;\n margin-top: -5px;\n}\n.tab-switcher .tabs .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: 7;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}",".with-subscription-loading {\n padding: 10px;\n text-align: center;\n}\n.with-subscription-loading .error {\n font-size: 14px;\n}"],"sourceRoot":""}
\ No newline at end of file
diff --git a/priv/static/static/css/base16-3024.css b/priv/static/static/css/base16-3024.css
deleted file mode 100644
index 91859e272..000000000
Binary files a/priv/static/static/css/base16-3024.css and /dev/null differ
diff --git a/priv/static/static/css/base16-apathy.css b/priv/static/static/css/base16-apathy.css
deleted file mode 100644
index 2e99ba1f0..000000000
Binary files a/priv/static/static/css/base16-apathy.css and /dev/null differ
diff --git a/priv/static/static/css/base16-ashes.css b/priv/static/static/css/base16-ashes.css
deleted file mode 100644
index d10e1918e..000000000
Binary files a/priv/static/static/css/base16-ashes.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-cave.css b/priv/static/static/css/base16-atelier-cave.css
deleted file mode 100644
index 5ac17f97e..000000000
Binary files a/priv/static/static/css/base16-atelier-cave.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-dune.css b/priv/static/static/css/base16-atelier-dune.css
deleted file mode 100644
index cfb2d9a1e..000000000
Binary files a/priv/static/static/css/base16-atelier-dune.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-estuary.css b/priv/static/static/css/base16-atelier-estuary.css
deleted file mode 100644
index 76d82c754..000000000
Binary files a/priv/static/static/css/base16-atelier-estuary.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-forest.css b/priv/static/static/css/base16-atelier-forest.css
deleted file mode 100644
index 8108ed8f6..000000000
Binary files a/priv/static/static/css/base16-atelier-forest.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-heath.css b/priv/static/static/css/base16-atelier-heath.css
deleted file mode 100644
index 8858cb807..000000000
Binary files a/priv/static/static/css/base16-atelier-heath.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-lakeside.css b/priv/static/static/css/base16-atelier-lakeside.css
deleted file mode 100644
index 77d44c5fa..000000000
Binary files a/priv/static/static/css/base16-atelier-lakeside.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-plateau.css b/priv/static/static/css/base16-atelier-plateau.css
deleted file mode 100644
index a7445030b..000000000
Binary files a/priv/static/static/css/base16-atelier-plateau.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-savanna.css b/priv/static/static/css/base16-atelier-savanna.css
deleted file mode 100644
index be728d07d..000000000
Binary files a/priv/static/static/css/base16-atelier-savanna.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-seaside.css b/priv/static/static/css/base16-atelier-seaside.css
deleted file mode 100644
index 8b3914669..000000000
Binary files a/priv/static/static/css/base16-atelier-seaside.css and /dev/null differ
diff --git a/priv/static/static/css/base16-atelier-sulphurpool.css b/priv/static/static/css/base16-atelier-sulphurpool.css
deleted file mode 100644
index fb44d6e0f..000000000
Binary files a/priv/static/static/css/base16-atelier-sulphurpool.css and /dev/null differ
diff --git a/priv/static/static/css/base16-bespin.css b/priv/static/static/css/base16-bespin.css
deleted file mode 100644
index 48a9dcf76..000000000
Binary files a/priv/static/static/css/base16-bespin.css and /dev/null differ
diff --git a/priv/static/static/css/base16-brewer.css b/priv/static/static/css/base16-brewer.css
deleted file mode 100644
index c88f219b7..000000000
Binary files a/priv/static/static/css/base16-brewer.css and /dev/null differ
diff --git a/priv/static/static/css/base16-bright.css b/priv/static/static/css/base16-bright.css
deleted file mode 100644
index c2333b8d1..000000000
Binary files a/priv/static/static/css/base16-bright.css and /dev/null differ
diff --git a/priv/static/static/css/base16-chalk.css b/priv/static/static/css/base16-chalk.css
deleted file mode 100644
index e3cb3c20c..000000000
Binary files a/priv/static/static/css/base16-chalk.css and /dev/null differ
diff --git a/priv/static/static/css/base16-codeschool.css b/priv/static/static/css/base16-codeschool.css
deleted file mode 100644
index 00194bbfc..000000000
Binary files a/priv/static/static/css/base16-codeschool.css and /dev/null differ
diff --git a/priv/static/static/css/base16-darktooth.css b/priv/static/static/css/base16-darktooth.css
deleted file mode 100644
index 534487064..000000000
Binary files a/priv/static/static/css/base16-darktooth.css and /dev/null differ
diff --git a/priv/static/static/css/base16-default-dark.css b/priv/static/static/css/base16-default-dark.css
deleted file mode 100644
index 3cd7e860c..000000000
Binary files a/priv/static/static/css/base16-default-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-default-light.css b/priv/static/static/css/base16-default-light.css
deleted file mode 100644
index 7e660c302..000000000
Binary files a/priv/static/static/css/base16-default-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-eighties.css b/priv/static/static/css/base16-eighties.css
deleted file mode 100644
index 8ffcf04d9..000000000
Binary files a/priv/static/static/css/base16-eighties.css and /dev/null differ
diff --git a/priv/static/static/css/base16-embers.css b/priv/static/static/css/base16-embers.css
deleted file mode 100644
index 74e9b7693..000000000
Binary files a/priv/static/static/css/base16-embers.css and /dev/null differ
diff --git a/priv/static/static/css/base16-flat.css b/priv/static/static/css/base16-flat.css
deleted file mode 100644
index 72918a5df..000000000
Binary files a/priv/static/static/css/base16-flat.css and /dev/null differ
diff --git a/priv/static/static/css/base16-github.css b/priv/static/static/css/base16-github.css
deleted file mode 100644
index 080ed34ce..000000000
Binary files a/priv/static/static/css/base16-github.css and /dev/null differ
diff --git a/priv/static/static/css/base16-google-dark.css b/priv/static/static/css/base16-google-dark.css
deleted file mode 100644
index 988eac51d..000000000
Binary files a/priv/static/static/css/base16-google-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-google-light.css b/priv/static/static/css/base16-google-light.css
deleted file mode 100644
index 2ee2a6069..000000000
Binary files a/priv/static/static/css/base16-google-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-grayscale-dark.css b/priv/static/static/css/base16-grayscale-dark.css
deleted file mode 100644
index dc0dd03a0..000000000
Binary files a/priv/static/static/css/base16-grayscale-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-grayscale-light.css b/priv/static/static/css/base16-grayscale-light.css
deleted file mode 100644
index f9fd213ae..000000000
Binary files a/priv/static/static/css/base16-grayscale-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-green-screen.css b/priv/static/static/css/base16-green-screen.css
deleted file mode 100644
index 205efeaec..000000000
Binary files a/priv/static/static/css/base16-green-screen.css and /dev/null differ
diff --git a/priv/static/static/css/base16-harmonic16-dark.css b/priv/static/static/css/base16-harmonic16-dark.css
deleted file mode 100644
index 0c2c7ce42..000000000
Binary files a/priv/static/static/css/base16-harmonic16-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-harmonic16-light.css b/priv/static/static/css/base16-harmonic16-light.css
deleted file mode 100644
index 37bb7679a..000000000
Binary files a/priv/static/static/css/base16-harmonic16-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-hopscotch.css b/priv/static/static/css/base16-hopscotch.css
deleted file mode 100644
index f2ad232c5..000000000
Binary files a/priv/static/static/css/base16-hopscotch.css and /dev/null differ
diff --git a/priv/static/static/css/base16-ir-black.css b/priv/static/static/css/base16-ir-black.css
deleted file mode 100644
index 8d14ab9b8..000000000
Binary files a/priv/static/static/css/base16-ir-black.css and /dev/null differ
diff --git a/priv/static/static/css/base16-isotope.css b/priv/static/static/css/base16-isotope.css
deleted file mode 100644
index f7a4a0b4b..000000000
Binary files a/priv/static/static/css/base16-isotope.css and /dev/null differ
diff --git a/priv/static/static/css/base16-london-tube.css b/priv/static/static/css/base16-london-tube.css
deleted file mode 100644
index 0537d1ad5..000000000
Binary files a/priv/static/static/css/base16-london-tube.css and /dev/null differ
diff --git a/priv/static/static/css/base16-macintosh.css b/priv/static/static/css/base16-macintosh.css
deleted file mode 100644
index d5969fec2..000000000
Binary files a/priv/static/static/css/base16-macintosh.css and /dev/null differ
diff --git a/priv/static/static/css/base16-marrakesh.css b/priv/static/static/css/base16-marrakesh.css
deleted file mode 100644
index 91f0471fc..000000000
Binary files a/priv/static/static/css/base16-marrakesh.css and /dev/null differ
diff --git a/priv/static/static/css/base16-materia.css b/priv/static/static/css/base16-materia.css
deleted file mode 100644
index 41d935dd1..000000000
Binary files a/priv/static/static/css/base16-materia.css and /dev/null differ
diff --git a/priv/static/static/css/base16-mexico-light.css b/priv/static/static/css/base16-mexico-light.css
deleted file mode 100644
index 1916c67bc..000000000
Binary files a/priv/static/static/css/base16-mexico-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-mocha.css b/priv/static/static/css/base16-mocha.css
deleted file mode 100644
index 6cb2fb580..000000000
Binary files a/priv/static/static/css/base16-mocha.css and /dev/null differ
diff --git a/priv/static/static/css/base16-monokai.css b/priv/static/static/css/base16-monokai.css
deleted file mode 100644
index fc7ccf471..000000000
Binary files a/priv/static/static/css/base16-monokai.css and /dev/null differ
diff --git a/priv/static/static/css/base16-ocean.css b/priv/static/static/css/base16-ocean.css
deleted file mode 100644
index 8622d17e0..000000000
Binary files a/priv/static/static/css/base16-ocean.css and /dev/null differ
diff --git a/priv/static/static/css/base16-oceanicnext.css b/priv/static/static/css/base16-oceanicnext.css
deleted file mode 100644
index df4d9ef5e..000000000
Binary files a/priv/static/static/css/base16-oceanicnext.css and /dev/null differ
diff --git a/priv/static/static/css/base16-paraiso.css b/priv/static/static/css/base16-paraiso.css
deleted file mode 100644
index b68c94071..000000000
Binary files a/priv/static/static/css/base16-paraiso.css and /dev/null differ
diff --git a/priv/static/static/css/base16-phd.css b/priv/static/static/css/base16-phd.css
deleted file mode 100644
index 54276ab11..000000000
Binary files a/priv/static/static/css/base16-phd.css and /dev/null differ
diff --git a/priv/static/static/css/base16-pico.css b/priv/static/static/css/base16-pico.css
deleted file mode 100644
index 86482b72d..000000000
Binary files a/priv/static/static/css/base16-pico.css and /dev/null differ
diff --git a/priv/static/static/css/base16-pleroma-dark.css b/priv/static/static/css/base16-pleroma-dark.css
deleted file mode 100644
index e1d46f927..000000000
Binary files a/priv/static/static/css/base16-pleroma-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-pleroma-light.css b/priv/static/static/css/base16-pleroma-light.css
deleted file mode 100644
index 1a85689aa..000000000
Binary files a/priv/static/static/css/base16-pleroma-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-pop.css b/priv/static/static/css/base16-pop.css
deleted file mode 100644
index 14acac171..000000000
Binary files a/priv/static/static/css/base16-pop.css and /dev/null differ
diff --git a/priv/static/static/css/base16-railscasts.css b/priv/static/static/css/base16-railscasts.css
deleted file mode 100644
index 18f43bfd6..000000000
Binary files a/priv/static/static/css/base16-railscasts.css and /dev/null differ
diff --git a/priv/static/static/css/base16-seti-ui.css b/priv/static/static/css/base16-seti-ui.css
deleted file mode 100644
index bd4f9cc42..000000000
Binary files a/priv/static/static/css/base16-seti-ui.css and /dev/null differ
diff --git a/priv/static/static/css/base16-shapeshifter.css b/priv/static/static/css/base16-shapeshifter.css
deleted file mode 100644
index ded180691..000000000
Binary files a/priv/static/static/css/base16-shapeshifter.css and /dev/null differ
diff --git a/priv/static/static/css/base16-solar-flare.css b/priv/static/static/css/base16-solar-flare.css
deleted file mode 100644
index 7d1d38624..000000000
Binary files a/priv/static/static/css/base16-solar-flare.css and /dev/null differ
diff --git a/priv/static/static/css/base16-solarized-dark.css b/priv/static/static/css/base16-solarized-dark.css
deleted file mode 100644
index ac16f12c9..000000000
Binary files a/priv/static/static/css/base16-solarized-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-solarized-light.css b/priv/static/static/css/base16-solarized-light.css
deleted file mode 100644
index 7164cb046..000000000
Binary files a/priv/static/static/css/base16-solarized-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-spacemacs.css b/priv/static/static/css/base16-spacemacs.css
deleted file mode 100644
index 487376500..000000000
Binary files a/priv/static/static/css/base16-spacemacs.css and /dev/null differ
diff --git a/priv/static/static/css/base16-summerfruit-dark.css b/priv/static/static/css/base16-summerfruit-dark.css
deleted file mode 100644
index 1c8f2332e..000000000
Binary files a/priv/static/static/css/base16-summerfruit-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-summerfruit-light.css b/priv/static/static/css/base16-summerfruit-light.css
deleted file mode 100644
index cb54d4c54..000000000
Binary files a/priv/static/static/css/base16-summerfruit-light.css and /dev/null differ
diff --git a/priv/static/static/css/base16-tomorrow-night.css b/priv/static/static/css/base16-tomorrow-night.css
deleted file mode 100644
index 09ecf08ef..000000000
Binary files a/priv/static/static/css/base16-tomorrow-night.css and /dev/null differ
diff --git a/priv/static/static/css/base16-tomorrow.css b/priv/static/static/css/base16-tomorrow.css
deleted file mode 100644
index f14868230..000000000
Binary files a/priv/static/static/css/base16-tomorrow.css and /dev/null differ
diff --git a/priv/static/static/css/base16-twilight.css b/priv/static/static/css/base16-twilight.css
deleted file mode 100644
index c8dfda3f8..000000000
Binary files a/priv/static/static/css/base16-twilight.css and /dev/null differ
diff --git a/priv/static/static/css/base16-unikitty-dark.css b/priv/static/static/css/base16-unikitty-dark.css
deleted file mode 100644
index e6ef32e33..000000000
Binary files a/priv/static/static/css/base16-unikitty-dark.css and /dev/null differ
diff --git a/priv/static/static/css/base16-unikitty-light.css b/priv/static/static/css/base16-unikitty-light.css
deleted file mode 100644
index 7e4c51b7a..000000000
Binary files a/priv/static/static/css/base16-unikitty-light.css and /dev/null differ
diff --git a/priv/static/static/css/themes.json b/priv/static/static/css/themes.json
deleted file mode 100644
index ea8e5a0c4..000000000
--- a/priv/static/static/css/themes.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-"base16-pleroma-dark.css",
-"base16-pleroma-light.css",
-"base16-3024.css",
-"base16-apathy.css",
-"base16-ashes.css",
-"base16-atelier-cave.css",
-"base16-atelier-dune.css",
-"base16-atelier-estuary.css",
-"base16-atelier-forest.css",
-"base16-atelier-heath.css",
-"base16-atelier-lakeside.css",
-"base16-atelier-plateau.css",
-"base16-atelier-savanna.css",
-"base16-atelier-seaside.css",
-"base16-atelier-sulphurpool.css",
-"base16-bespin.css",
-"base16-brewer.css",
-"base16-bright.css",
-"base16-chalk.css",
-"base16-codeschool.css",
-"base16-darktooth.css",
-"base16-default-dark.css",
-"base16-default-light.css",
-"base16-eighties.css",
-"base16-embers.css",
-"base16-flat.css",
-"base16-github.css",
-"base16-google-dark.css",
-"base16-google-light.css",
-"base16-grayscale-dark.css",
-"base16-grayscale-light.css",
-"base16-green-screen.css",
-"base16-harmonic16-dark.css",
-"base16-harmonic16-light.css",
-"base16-hopscotch.css",
-"base16-ir-black.css",
-"base16-isotope.css",
-"base16-london-tube.css",
-"base16-macintosh.css",
-"base16-marrakesh.css",
-"base16-materia.css",
-"base16-mexico-light.css",
-"base16-mocha.css",
-"base16-monokai.css",
-"base16-ocean.css",
-"base16-oceanicnext.css",
-"base16-paraiso.css",
-"base16-phd.css",
-"base16-pico.css",
-"base16-pop.css",
-"base16-railscasts.css",
-"base16-seti-ui.css",
-"base16-shapeshifter.css",
-"base16-solar-flare.css",
-"base16-solarized-dark.css",
-"base16-solarized-light.css",
-"base16-spacemacs.css",
-"base16-summerfruit-dark.css",
-"base16-summerfruit-light.css",
-"base16-tomorrow-night.css",
-"base16-tomorrow.css",
-"base16-twilight.css",
-"base16-unikitty-dark.css",
-"base16-unikitty-light.css"
-]
diff --git a/priv/static/static/font/fontello.1581425930672.woff2 b/priv/static/static/font/fontello.1581425930672.woff2
deleted file mode 100644
index 81a10daee..000000000
Binary files a/priv/static/static/font/fontello.1581425930672.woff2 and /dev/null differ
diff --git a/priv/static/static/font/fontello.1581425930672.eot b/priv/static/static/font/fontello.1582927362782.eot
similarity index 98%
rename from priv/static/static/font/fontello.1581425930672.eot
rename to priv/static/static/font/fontello.1582927362782.eot
index 0de06da29..bd848d613 100644
Binary files a/priv/static/static/font/fontello.1581425930672.eot and b/priv/static/static/font/fontello.1582927362782.eot differ
diff --git a/priv/static/static/font/fontello.1581425930672.svg b/priv/static/static/font/fontello.1582927362782.svg
similarity index 100%
rename from priv/static/static/font/fontello.1581425930672.svg
rename to priv/static/static/font/fontello.1582927362782.svg
diff --git a/priv/static/static/font/fontello.1581425930672.ttf b/priv/static/static/font/fontello.1582927362782.ttf
similarity index 99%
rename from priv/static/static/font/fontello.1581425930672.ttf
rename to priv/static/static/font/fontello.1582927362782.ttf
index 5a9cefeec..82691040e 100644
Binary files a/priv/static/static/font/fontello.1581425930672.ttf and b/priv/static/static/font/fontello.1582927362782.ttf differ
diff --git a/priv/static/static/font/fontello.1581425930672.woff b/priv/static/static/font/fontello.1582927362782.woff
similarity index 98%
rename from priv/static/static/font/fontello.1581425930672.woff
rename to priv/static/static/font/fontello.1582927362782.woff
index 28f4dda9d..8c8b4043d 100644
Binary files a/priv/static/static/font/fontello.1581425930672.woff and b/priv/static/static/font/fontello.1582927362782.woff differ
diff --git a/priv/static/static/font/fontello.1582927362782.woff2 b/priv/static/static/font/fontello.1582927362782.woff2
new file mode 100644
index 000000000..147707460
Binary files /dev/null and b/priv/static/static/font/fontello.1582927362782.woff2 differ
diff --git a/priv/static/static/fontello.1582927362782.css b/priv/static/static/fontello.1582927362782.css
new file mode 100644
index 000000000..1889379ff
Binary files /dev/null and b/priv/static/static/fontello.1582927362782.css differ
diff --git a/priv/static/static/js/2.9be9f9ec29f7536c73c3.js b/priv/static/static/js/2.9be9f9ec29f7536c73c3.js
deleted file mode 100644
index d464dbf74..000000000
Binary files a/priv/static/static/js/2.9be9f9ec29f7536c73c3.js and /dev/null differ
diff --git a/priv/static/static/js/2.f158cbd2b8770e467dfe.js b/priv/static/static/js/2.f158cbd2b8770e467dfe.js
new file mode 100644
index 000000000..24f80fe7b
Binary files /dev/null and b/priv/static/static/js/2.f158cbd2b8770e467dfe.js differ
diff --git a/priv/static/static/js/2.9be9f9ec29f7536c73c3.js.map b/priv/static/static/js/2.f158cbd2b8770e467dfe.js.map
similarity index 50%
rename from priv/static/static/js/2.9be9f9ec29f7536c73c3.js.map
rename to priv/static/static/js/2.f158cbd2b8770e467dfe.js.map
index 21efd7ec8..94ca6f090 100644
Binary files a/priv/static/static/js/2.9be9f9ec29f7536c73c3.js.map and b/priv/static/static/js/2.f158cbd2b8770e467dfe.js.map differ
diff --git a/priv/static/static/js/app.128bd8b808a3b5b6da6b.js b/priv/static/static/js/app.128bd8b808a3b5b6da6b.js
new file mode 100644
index 000000000..8d36b0c36
Binary files /dev/null and b/priv/static/static/js/app.128bd8b808a3b5b6da6b.js differ
diff --git a/priv/static/static/js/app.128bd8b808a3b5b6da6b.js.map b/priv/static/static/js/app.128bd8b808a3b5b6da6b.js.map
new file mode 100644
index 000000000..e53b74277
Binary files /dev/null and b/priv/static/static/js/app.128bd8b808a3b5b6da6b.js.map differ
diff --git a/priv/static/static/js/app.f8af8a9b83e330e80903.js b/priv/static/static/js/app.f8af8a9b83e330e80903.js
deleted file mode 100644
index f755c141a..000000000
Binary files a/priv/static/static/js/app.f8af8a9b83e330e80903.js and /dev/null differ
diff --git a/priv/static/static/js/app.f8af8a9b83e330e80903.js.map b/priv/static/static/js/app.f8af8a9b83e330e80903.js.map
deleted file mode 100644
index 106368819..000000000
Binary files a/priv/static/static/js/app.f8af8a9b83e330e80903.js.map and /dev/null differ
diff --git a/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js b/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js
deleted file mode 100644
index f59457df6..000000000
Binary files a/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js and /dev/null differ
diff --git a/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js.map b/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js.map
deleted file mode 100644
index b0ccd82fb..000000000
Binary files a/priv/static/static/js/vendors~app.52ac194cbc427f97f06e.js.map and /dev/null differ
diff --git a/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js b/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js
new file mode 100644
index 000000000..8964180cd
Binary files /dev/null and b/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js differ
diff --git a/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js.map b/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js.map
new file mode 100644
index 000000000..fab720d23
Binary files /dev/null and b/priv/static/static/js/vendors~app.c5bbd3734647f0cc7eef.js.map differ
diff --git a/priv/static/static/styles.json b/priv/static/static/styles.json
index 23508970d..23f57c65e 100644
--- a/priv/static/static/styles.json
+++ b/priv/static/static/styles.json
@@ -1,6 +1,6 @@
{
- "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
- "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
+ "pleroma-dark": "/static/themes/pleroma-dark.json",
+ "pleroma-light": "/static/themes/pleroma-light.json",
"pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"],
"classic-dark": [ "Classic Dark", "#161c20", "#282e32", "#b9b9b9", "#baaa9c", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
"bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"],
@@ -12,5 +12,6 @@
"redmond-xxi": "/static/themes/redmond-xxi.json",
"breezy-dark": "/static/themes/breezy-dark.json",
"breezy-light": "/static/themes/breezy-light.json",
- "mammal": "/static/themes/mammal.json"
+ "mammal": "/static/themes/mammal.json",
+ "paper": "/static/themes/paper.json"
}
diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html
index c02cb7198..a6da539e4 100644
--- a/priv/static/static/terms-of-service.html
+++ b/priv/static/static/terms-of-service.html
@@ -1,7 +1,4 @@
Terms of Service
-This is a placeholder ToS.
-
-Edit "/static/terms-of-service.html" to make it fit the needs of your instance.
-
-
+This is a placeholder ToS. Edit "/static/terms-of-service.html" to make it fit the needs of your instance.
+
diff --git a/priv/static/static/themes/breezy-dark.json b/priv/static/static/themes/breezy-dark.json
index 6119bf887..76b962c56 100644
--- a/priv/static/static/themes/breezy-dark.json
+++ b/priv/static/static/themes/breezy-dark.json
@@ -1,7 +1,9 @@
{
"_pleroma_theme_version": 2,
"name": "Breezy Dark (beta)",
- "theme": {
+ "source": {
+ "themeEngineVersion": 3,
+ "fonts": {},
"shadows": {
"panel": [
{
@@ -19,7 +21,7 @@
"y": "0",
"blur": "0",
"spread": "1",
- "color": "#ffffff",
+ "color": "--btn,900",
"alpha": "0.15",
"inset": true
},
@@ -40,7 +42,7 @@
"blur": "40",
"spread": "-40",
"inset": true,
- "color": "#ffffff",
+ "color": "--panel,900",
"alpha": "0.1"
}
],
@@ -50,8 +52,8 @@
"y": "0",
"blur": 0,
"spread": "1",
- "color": "--link",
- "alpha": "0.3",
+ "color": "--accent",
+ "alpha": "1",
"inset": true
},
{
@@ -65,21 +67,12 @@
}
],
"buttonPressed": [
- {
- "x": 0,
- "y": 0,
- "blur": "0",
- "spread": "50",
- "color": "--faint",
- "alpha": 1,
- "inset": true
- },
{
"x": 0,
"y": "0",
"blur": 0,
"spread": "1",
- "color": "#ffffff",
+ "color": "--btn,900",
"alpha": 0.2,
"inset": true
},
@@ -99,31 +92,30 @@
"y": "0",
"blur": 0,
"spread": "1",
- "color": "#FFFFFF",
+ "color": "--input,900",
"alpha": "0.2",
"inset": true
}
]
},
- "fonts": {},
- "opacity": {
- "input": "1",
- "panel": "0"
- },
+ "opacity": {},
"colors": {
"bg": "#31363b",
"text": "#eff0f1",
"link": "#3daee9",
"fg": "#31363b",
- "panel": "#31363b",
- "input": "#232629",
- "topBarLink": "#eff0f1",
- "btn": "#31363b",
+ "panel": "transparent",
+ "input": "--bg,-6.47",
+ "topBarLink": "--topBarText",
+ "btn": "--bg",
"border": "#4c545b",
"cRed": "#da4453",
"cBlue": "#3daee9",
"cGreen": "#27ae60",
- "cOrange": "#f67400"
+ "cOrange": "#f67400",
+ "btnPressed": "--accent",
+ "selectedMenu": "--accent",
+ "selectedMenuPopover": "--accent"
},
"radii": {
"btn": "2",
diff --git a/priv/static/static/themes/breezy-light.json b/priv/static/static/themes/breezy-light.json
index becf704fc..0968fff0c 100644
--- a/priv/static/static/themes/breezy-light.json
+++ b/priv/static/static/themes/breezy-light.json
@@ -1,7 +1,9 @@
{
"_pleroma_theme_version": 2,
"name": "Breezy Light (beta)",
- "theme": {
+ "source": {
+ "themeEngineVersion": 3,
+ "fonts": {},
"shadows": {
"panel": [
{
@@ -19,7 +21,7 @@
"y": "0",
"blur": "0",
"spread": "1",
- "color": "#000000",
+ "color": "--btn,900",
"alpha": "0.3",
"inset": true
},
@@ -40,7 +42,7 @@
"blur": "40",
"spread": "-40",
"inset": true,
- "color": "#ffffff",
+ "color": "--panel,900",
"alpha": "0.1"
}
],
@@ -50,8 +52,8 @@
"y": "0",
"blur": 0,
"spread": "1",
- "color": "--link",
- "alpha": "0.3",
+ "color": "--accent",
+ "alpha": "1",
"inset": true
},
{
@@ -65,21 +67,12 @@
}
],
"buttonPressed": [
- {
- "x": 0,
- "y": 0,
- "blur": "0",
- "spread": "50",
- "color": "--faint",
- "alpha": 1,
- "inset": true
- },
{
"x": 0,
"y": "0",
"blur": 0,
"spread": "1",
- "color": "#ffffff",
+ "color": "--btn,900",
"alpha": 0.2,
"inset": true
},
@@ -99,31 +92,30 @@
"y": "0",
"blur": 0,
"spread": "1",
- "color": "#000000",
+ "color": "--input,900",
"alpha": "0.2",
"inset": true
}
]
},
- "fonts": {},
"opacity": {
"input": "1"
},
"colors": {
"bg": "#eff0f1",
"text": "#232627",
- "link": "#2980b9",
- "fg": "#bcc2c7",
- "panel": "#475057",
- "panelText": "#fcfcfc",
- "input": "#fcfcfc",
- "topBar": "#475057",
- "topBarLink": "#eff0f1",
- "btn": "#eff0f1",
+ "fg": "#475057",
+ "accent": "#2980b9",
+ "input": "--bg,-6.47",
+ "topBarLink": "--topBarText",
+ "btn": "--bg",
"cRed": "#da4453",
"cBlue": "#2980b9",
"cGreen": "#27ae60",
- "cOrange": "#f67400"
+ "cOrange": "#f67400",
+ "btnPressed": "--accent",
+ "selectedMenu": "--accent",
+ "selectedMenuPopover": "--accent"
},
"radii": {
"btn": "2",
diff --git a/priv/static/static/themes/paper.json b/priv/static/static/themes/paper.json
new file mode 100644
index 000000000..a3b90a0a1
--- /dev/null
+++ b/priv/static/static/themes/paper.json
@@ -0,0 +1,172 @@
+{
+ "_pleroma_theme_version": 2,
+ "name": "Paper",
+ "source": {
+ "themeEngineVersion": 3,
+ "fonts": {},
+ "shadows": {
+ "panel": [
+ {
+ "x": "0",
+ "y": "2",
+ "blur": "9",
+ "spread": 0,
+ "inset": false,
+ "color": "#668bb2",
+ "alpha": "0.1"
+ },
+ {
+ "x": "0",
+ "y": "1",
+ "blur": "2",
+ "spread": "-1",
+ "inset": false,
+ "color": "#668bb2",
+ "alpha": "0.1"
+ }
+ ],
+ "topBar": [
+ {
+ "x": 0,
+ "y": "3",
+ "blur": "8",
+ "spread": 0,
+ "inset": false,
+ "color": "#3e618e",
+ "alpha": "0.1"
+ },
+ {
+ "x": 0,
+ "y": "1",
+ "blur": "4",
+ "spread": 0,
+ "inset": false,
+ "color": "#3e618e",
+ "alpha": "0.1"
+ }
+ ],
+ "button": [
+ {
+ "x": 0,
+ "y": "2",
+ "blur": "5",
+ "spread": 0,
+ "color": "#463f78",
+ "alpha": "0.1",
+ "inset": false
+ }
+ ],
+ "input": [
+ {
+ "x": 0,
+ "y": "1",
+ "blur": "2",
+ "spread": 0,
+ "inset": true,
+ "color": "#6277b7",
+ "alpha": "0.1"
+ }
+ ],
+ "buttonHover": [
+ {
+ "x": 0,
+ "y": "2",
+ "blur": "5",
+ "spread": 0,
+ "color": "#494949",
+ "alpha": "0.1"
+ },
+ {
+ "x": 0,
+ "y": "2",
+ "blur": "0",
+ "spread": "20",
+ "color": "#ffffff",
+ "alpha": "1",
+ "inset": true
+ }
+ ],
+ "buttonPressed": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": "4",
+ "spread": "0",
+ "color": "#494949",
+ "alpha": "0.8",
+ "inset": false
+ }
+ ],
+ "avatarStatus": [
+ {
+ "x": "0",
+ "y": "2",
+ "blur": "4",
+ "spread": "0",
+ "inset": false,
+ "color": "#3e618e",
+ "alpha": "0.1"
+ }
+ ],
+ "avatar": [
+ {
+ "x": 0,
+ "y": "2",
+ "blur": "5",
+ "spread": "0",
+ "color": "#3e618e",
+ "alpha": "0.9"
+ }
+ ],
+ "popup": [
+ {
+ "x": "0",
+ "y": "3",
+ "blur": "11",
+ "spread": 0,
+ "color": "#668bb2",
+ "alpha": "0.2"
+ },
+ {
+ "x": "0",
+ "y": "2",
+ "blur": "3",
+ "spread": "-1",
+ "color": "#668bb2",
+ "alpha": "0.2"
+ }
+ ]
+ },
+ "opacity": {
+ "underlay": "1",
+ "border": "0"
+ },
+ "colors": {
+ "bg": "#ffffff",
+ "fg": "#f6f6f6",
+ "text": "#494949",
+ "underlay": "#ffffff",
+ "link": "#788ca1",
+ "accent": "#97a0aa",
+ "cBlue": "#788ca1",
+ "cRed": "#eed7ce",
+ "cGreen": "#788ca1",
+ "cOrange": "#788ca1",
+ "postLink": "#788ca1",
+ "border": "#ffffff",
+ "icon": "#b6c9c4",
+ "panel": "#ffffff",
+ "topBarText": "#4b4b4b"
+ },
+ "radii": {
+ "btn": "0",
+ "input": "0",
+ "checkbox": "0",
+ "panel": "0",
+ "avatar": "2",
+ "avatarAlt": "2",
+ "tooltip": "0",
+ "attachment": "0"
+ }
+ }
+}
diff --git a/priv/static/static/themes/pleroma-dark.json b/priv/static/static/themes/pleroma-dark.json
new file mode 100644
index 000000000..2703fba11
--- /dev/null
+++ b/priv/static/static/themes/pleroma-dark.json
@@ -0,0 +1,191 @@
+{
+ "_pleroma_theme_version": 2,
+ "name": "Pleroma Dark",
+ "source": {
+ "themeEngineVersion": 3,
+ "fonts": {},
+ "shadows": {
+ "buttonHover": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": "1",
+ "spread": "2",
+ "color": "#b9b9ba",
+ "alpha": "0.4",
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": 1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ }
+ ],
+ "buttonPressed": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": 4,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 1,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": 1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "blur": "2",
+ "spread": 0,
+ "inset": false,
+ "color": "#000000",
+ "alpha": 1
+ }
+ ],
+ "panelHeader": [
+ {
+ "x": 0,
+ "y": "1",
+ "blur": "3",
+ "spread": 0,
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.4"
+ },
+ {
+ "x": "0",
+ "y": "1",
+ "blur": "0",
+ "spread": 0,
+ "inset": true,
+ "color": "#ffffff",
+ "alpha": "0.2"
+ }
+ ],
+ "panel": [
+ {
+ "x": "0",
+ "y": "0",
+ "blur": "3",
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.5"
+ },
+ {
+ "x": "0",
+ "y": "4",
+ "blur": "6",
+ "spread": "3",
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.3"
+ }
+ ],
+ "button": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": 2,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 1
+ },
+ {
+ "x": 0,
+ "y": 1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ }
+ ],
+ "topBar": [
+ {
+ "x": 0,
+ "y": "1",
+ "blur": 4,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.4"
+ },
+ {
+ "x": 0,
+ "y": "2",
+ "blur": "7",
+ "spread": 0,
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.3"
+ }
+ ]
+ },
+ "opacity": {
+ "underlay": "0.6"
+ },
+ "colors": {
+ "bg": "#0f161e",
+ "fg": "#151e2b",
+ "text": "#b9b9ba",
+ "underlay": "#090e14",
+ "accent": "#e2b188",
+ "cBlue": "#81beea",
+ "cRed": "#d31014",
+ "cGreen": "#5dc94a",
+ "cOrange": "#ffc459",
+ "border": "--fg,3",
+ "topBarText": "--text,-9.75",
+ "topBarLink": "--topBarText",
+ "btnToggled": "--accent,-24.2",
+ "alertErrorText": "--text,21.2",
+ "badgeNotification": "#e15932",
+ "badgeNotificationText": "#ffffff"
+ },
+ "radii": {
+ "btn": "3",
+ "input": "3",
+ "panel": "3",
+ "avatar": "3",
+ "attachment": "3"
+ }
+ }
+}
diff --git a/priv/static/static/themes/pleroma-light.json b/priv/static/static/themes/pleroma-light.json
new file mode 100644
index 000000000..05fc300aa
--- /dev/null
+++ b/priv/static/static/themes/pleroma-light.json
@@ -0,0 +1,219 @@
+{
+ "_pleroma_theme_version": 2,
+ "name": "Pleroma Light",
+ "source": {
+ "themeEngineVersion": 3,
+ "fonts": {},
+ "shadows": {
+ "button": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": 2,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.2"
+ },
+ {
+ "x": 0,
+ "y": 1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": "0.5",
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ }
+ ],
+ "buttonHover": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": "2",
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.2"
+ },
+ {
+ "x": 0,
+ "y": "0",
+ "blur": "1",
+ "spread": "2",
+ "color": "#ffc39f",
+ "alpha": "1",
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ }
+ ],
+ "input": [
+ {
+ "x": 0,
+ "y": 1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": 0.2,
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": 0,
+ "blur": "2",
+ "inset": true,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.15"
+ }
+ ],
+ "panel": [
+ {
+ "x": "0",
+ "y": 1,
+ "blur": "3",
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.5"
+ },
+ {
+ "x": "0",
+ "y": "3",
+ "blur": "6",
+ "spread": "1",
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.2"
+ }
+ ],
+ "panelHeader": [
+ {
+ "x": 0,
+ "y": "1",
+ "blur": 0,
+ "spread": 0,
+ "inset": true,
+ "color": "#ffffff",
+ "alpha": "0.5"
+ },
+ {
+ "x": 0,
+ "y": "1",
+ "blur": "3",
+ "spread": 0,
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.3"
+ }
+ ],
+ "buttonPressed": [
+ {
+ "x": 0,
+ "y": 0,
+ "blur": 4,
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.2"
+ },
+ {
+ "x": 0,
+ "y": 1,
+ "blur": "1",
+ "spread": "2",
+ "color": "#000000",
+ "alpha": "0.3",
+ "inset": true
+ },
+ {
+ "x": 0,
+ "y": -1,
+ "blur": 0,
+ "spread": 0,
+ "color": "#FFFFFF",
+ "alpha": 0.2,
+ "inset": true
+ }
+ ],
+ "popup": [
+ {
+ "x": "1",
+ "y": "2",
+ "blur": "2",
+ "spread": 0,
+ "color": "#000000",
+ "alpha": "0.2"
+ },
+ {
+ "x": "1",
+ "y": "3",
+ "blur": "7",
+ "spread": "0",
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.2"
+ }
+ ],
+ "avatarStatus": [
+ {
+ "x": 0,
+ "y": "1",
+ "blur": "4",
+ "spread": "0",
+ "inset": false,
+ "color": "#000000",
+ "alpha": "0.2"
+ }
+ ]
+ },
+ "opacity": {
+ "underlay": "0.4"
+ },
+ "colors": {
+ "bg": "#f2f6f9",
+ "fg": "#d6dfed",
+ "text": "#304055",
+ "underlay": "#5d6086",
+ "accent": "#f55b1b",
+ "cBlue": "#0095ff",
+ "cRed": "#d31014",
+ "cGreen": "#0fa00f",
+ "cOrange": "#ffa500",
+ "border": "#d8e6f9",
+ "topBarText": "#304055",
+ "topBarLink": "--topBarText",
+ "btnToggled": "--accent,-24.2",
+ "input": "#dee3ed",
+ "badgeNotification": "#e83802"
+ },
+ "radii": {
+ "btn": "3",
+ "input": "3",
+ "panel": "3",
+ "avatar": "3",
+ "attachment": "3"
+ }
+ }
+}
diff --git a/priv/static/static/themes/redmond-xx-se.json b/priv/static/static/themes/redmond-xx-se.json
index 70ee89d1b..7a4a29da3 100644
--- a/priv/static/static/themes/redmond-xx-se.json
+++ b/priv/static/static/themes/redmond-xx-se.json
@@ -1,7 +1,8 @@
{
"_pleroma_theme_version": 2,
"name": "Redmond XX SE",
- "theme": {
+ "source": {
+ "themeEngineVersion": 3,
"shadows": {
"panel": [
{
@@ -268,6 +269,7 @@
"bg": "#c0c0c0",
"text": "#000000",
"link": "#0000ff",
+ "accent": "#000080",
"fg": "#c0c0c0",
"panel": "#000080",
"panelFaint": "#c0c0c0",
@@ -275,13 +277,16 @@
"topBar": "#000080",
"topBarLink": "#ffffff",
"btn": "#c0c0c0",
+ "btnToggled": "--btn",
"faint": "#3f3f3f",
"faintLink": "#404080",
"border": "#808080",
"cRed": "#FF0000",
"cBlue": "#008080",
"cGreen": "#008000",
- "cOrange": "#808000"
+ "cOrange": "#808000",
+ "highlight": "--accent",
+ "selectedPost": "--bg,-10"
},
"radii": {
"btn": "0",
diff --git a/priv/static/static/themes/redmond-xx.json b/priv/static/static/themes/redmond-xx.json
index 4fd6a3691..ff95b1e06 100644
--- a/priv/static/static/themes/redmond-xx.json
+++ b/priv/static/static/themes/redmond-xx.json
@@ -1,7 +1,8 @@
{
"_pleroma_theme_version": 2,
"name": "Redmond XX",
- "theme": {
+ "source": {
+ "themeEngineVersion": 3,
"shadows": {
"panel": [
{
@@ -259,6 +260,7 @@
"bg": "#c0c0c0",
"text": "#000000",
"link": "#0000ff",
+ "accent": "#000080",
"fg": "#c0c0c0",
"panel": "#000080",
"panelFaint": "#c0c0c0",
@@ -266,13 +268,16 @@
"topBar": "#000080",
"topBarLink": "#ffffff",
"btn": "#c0c0c0",
+ "btnToggled": "--btn",
"faint": "#3f3f3f",
"faintLink": "#404080",
"border": "#808080",
"cRed": "#FF0000",
"cBlue": "#008080",
"cGreen": "#008000",
- "cOrange": "#808000"
+ "cOrange": "#808000",
+ "highlight": "--accent",
+ "selectedPost": "--bg,-10"
},
"radii": {
"btn": "0",
diff --git a/priv/static/static/themes/redmond-xxi.json b/priv/static/static/themes/redmond-xxi.json
index d10bf138f..f788bdb83 100644
--- a/priv/static/static/themes/redmond-xxi.json
+++ b/priv/static/static/themes/redmond-xxi.json
@@ -1,7 +1,8 @@
{
"_pleroma_theme_version": 2,
"name": "Redmond XXI",
- "theme": {
+ "source": {
+ "themeEngineVersion": 3,
"shadows": {
"panel": [
{
@@ -241,6 +242,7 @@
"bg": "#d6d6ce",
"text": "#000000",
"link": "#0000ff",
+ "accent": "#0a246a",
"fg": "#d6d6ce",
"panel": "#042967",
"panelFaint": "#FFFFFF",
@@ -248,13 +250,16 @@
"topBar": "#042967",
"topBarLink": "#ffffff",
"btn": "#d6d6ce",
+ "btnToggled": "--btn",
"faint": "#3f3f3f",
"faintLink": "#404080",
"border": "#808080",
"cRed": "#c42726",
"cBlue": "#6699cc",
"cGreen": "#669966",
- "cOrange": "#cc6633"
+ "cOrange": "#cc6633",
+ "highlight": "--accent",
+ "selectedPost": "--bg,-10"
},
"radii": {
"btn": "0",
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index 42ef52ad4..87455aa6a 100644
Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ