From baa5a0d6509a8a18d15d1cf49ed51c41e94436f9 Mon Sep 17 00:00:00 2001 From: a1batross Date: Wed, 8 Jan 2020 07:03:26 +0100 Subject: [PATCH] emr: move all customization to instance/ --- .../static/static}/emr_bg.jpg | Bin {priv => instance}/static/static/logo2.png | Bin instance/static/static/styles.json | 16 ++++++++ instance/static/static/terms-of-service.html | 35 ++++++++++++++++ .../static/static/themes/monokai-mod.json | 0 priv/static/static/styles.json | 3 +- priv/static/static/terms-of-service.html | 38 +++--------------- 7 files changed, 57 insertions(+), 35 deletions(-) rename {priv/static/images => instance/static/static}/emr_bg.jpg (100%) rename {priv => instance}/static/static/logo2.png (100%) create mode 100644 instance/static/static/styles.json create mode 100644 instance/static/static/terms-of-service.html rename {priv => instance}/static/static/themes/monokai-mod.json (100%) diff --git a/priv/static/images/emr_bg.jpg b/instance/static/static/emr_bg.jpg similarity index 100% rename from priv/static/images/emr_bg.jpg rename to instance/static/static/emr_bg.jpg diff --git a/priv/static/static/logo2.png b/instance/static/static/logo2.png similarity index 100% rename from priv/static/static/logo2.png rename to instance/static/static/logo2.png diff --git a/instance/static/static/styles.json b/instance/static/static/styles.json new file mode 100644 index 000000000..8c858e295 --- /dev/null +++ b/instance/static/static/styles.json @@ -0,0 +1,16 @@ +{ + "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], + "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], + "classic-dark": [ "Classic Dark", "#161c20", "#282e32", "#b9b9b9", "#baaa9c", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], + "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"], + "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ], + "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ], + + "redmond-xx": "/static/themes/redmond-xx.json", + "redmond-xx-se": "/static/themes/redmond-xx-se.json", + "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", + "monokai-mod": "/static/themes/monokai-mod.json" +} diff --git a/instance/static/static/terms-of-service.html b/instance/static/static/terms-of-service.html new file mode 100644 index 000000000..d6d44f41a --- /dev/null +++ b/instance/static/static/terms-of-service.html @@ -0,0 +1,35 @@ +

Expired Mentality

+ +

Welcome to Expired Mentality or EMR in short. +The idea behind instance is providing friendly place to communicate, so this is:

+ + +

Sadly, I may not know your language. If you plan to talk primarily in something other than English, Russian or Kazakh, this instance maybe isn't for you.

+

However, I believe in open communication, so I hope we can reach in agreement in bad cases. +Also, I believe that everyone here is mature enough to solve their own social problems by themselves.

+

Just don't be asshole and have fun.

+

P.S. If you think someone is violating the rules, please contact me at first.

+

-- @a1batross

+ + + + + +

Third-party stuff

+ + + + diff --git a/priv/static/static/themes/monokai-mod.json b/instance/static/static/themes/monokai-mod.json similarity index 100% rename from priv/static/static/themes/monokai-mod.json rename to instance/static/static/themes/monokai-mod.json diff --git a/priv/static/static/styles.json b/priv/static/static/styles.json index 8dee748e5..23508970d 100644 --- a/priv/static/static/styles.json +++ b/priv/static/static/styles.json @@ -12,6 +12,5 @@ "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", - "monokai-mod": "/static/themes/monokai-mod.json" + "mammal": "/static/themes/mammal.json" } diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html index d6d44f41a..c02cb7198 100644 --- a/priv/static/static/terms-of-service.html +++ b/priv/static/static/terms-of-service.html @@ -1,35 +1,7 @@ -

Expired Mentality

+

Terms of Service

-

Welcome to Expired Mentality or EMR in short. -The idea behind instance is providing friendly place to communicate, so this is:

- +

This is a placeholder ToS.

-

Sadly, I may not know your language. If you plan to talk primarily in something other than English, Russian or Kazakh, this instance maybe isn't for you.

-

However, I believe in open communication, so I hope we can reach in agreement in bad cases. -Also, I believe that everyone here is mature enough to solve their own social problems by themselves.

-

Just don't be asshole and have fun.

-

P.S. If you think someone is violating the rules, please contact me at first.

-

-- @a1batross

- - - - - -

Third-party stuff

- - - - +

Edit "/static/terms-of-service.html" to make it fit the needs of your instance.

+
+