diff --git a/dirdirold.tar.gz b/dirdirold.tar.gz deleted file mode 100644 index 8fe6e7c..0000000 Binary files a/dirdirold.tar.gz and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index 56ca1bc..4282791 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: network: host dockerfile: Dockerfile context: . + container_name: werc ports: - 80:80 environment: @@ -12,13 +13,37 @@ services: - werc:/var/www/werc - lighttpd:/etc/lighttpd tty: true + networks: + - default-werc + gossa: image: pldubouilh/gossa + container_name: gossa ports: - 8001:8001 volumes: - ./werc/sites/thirdculture.top/_files:/shared - ./werc/sites/ppl.thirdculture.top:/shared/people + networks: + - default-werc + + transfer: + image: dutchcoders/transfer.sh:latest + container_name: transfer + ports: + - "8080:8080" + command: ["--provider", "local", "--basedir", "/uploads/", "--web-path", "/web/"] + volumes: + - ./transfer/uploads:/uploads + - ./transfer/tshweb:/web + restart: always + networks: + - default-werc + +networks: + default-werc: + driver: bridge + volumes: werc: driver: local diff --git a/etc/lighttpd/conf.d/files.thirdculture.top.conf b/etc/lighttpd/conf.d/files.thirdculture.top.conf index e06cd69..ee85e6d 100644 --- a/etc/lighttpd/conf.d/files.thirdculture.top.conf +++ b/etc/lighttpd/conf.d/files.thirdculture.top.conf @@ -14,7 +14,11 @@ $HTTP["host"] =~ "^files\.thirdculture\.top$" { "" => ( ( "host" => "gossa", - "port" => 8001 + "port" => 8001, + "headers" => ( + "Host" => "$HTTP_HOST", + "X-Forwarded-For" => "$REMOTE_ADDR" + ) ) ) ) diff --git a/etc/lighttpd/conf.d/up.thirdculture.top.conf b/etc/lighttpd/conf.d/up.thirdculture.top.conf new file mode 100644 index 0000000..23f491b --- /dev/null +++ b/etc/lighttpd/conf.d/up.thirdculture.top.conf @@ -0,0 +1,19 @@ +$HTTP["host"] =~ "up\.thirdculture\.top" { + server.document-root = "/var/www/localhost/htdocs" + + proxy.server = ( + "" => ( + "localhost" => ( + "host" => "transfer", + "port" => 8080, + "path" => "/web", + "headers" => ( + "Host" => "$HTTP_HOST", + "X-Forwarded-For" => "$REMOTE_ADDR" + ) + ) + ) + ) + + proxy.balance = "round-robin" +} diff --git a/etc/lighttpd/lighttpd.conf b/etc/lighttpd/lighttpd.conf index f132f28..5db072c 100644 --- a/etc/lighttpd/lighttpd.conf +++ b/etc/lighttpd/lighttpd.conf @@ -20,6 +20,7 @@ server.modules = ( "mod_access", # "mod_cml", # "mod_trigger_b4_dl", + "mod_authn_file", "mod_auth", # "mod_status", # "mod_setenv", @@ -37,7 +38,10 @@ server.modules = ( "mod_accesslog" ) # }}} - +# DEBUG +#setenv.add-response-header = ( "X-Debug" => "true" ) +#debug.log-request-header = "enable" +#debug.log-response-header = "enable" # {{{ includes include "mime-types.conf" # uncomment for cgi support diff --git a/transfer/tshweb/404.html b/transfer/tshweb/404.html new file mode 100644 index 0000000..c073c41 --- /dev/null +++ b/transfer/tshweb/404.html @@ -0,0 +1,14 @@ + + + + + + Third Culture Upload + + + +
+

Content not found!

+

404

+ + diff --git a/transfer/tshweb/download.audio.html b/transfer/tshweb/download.audio.html new file mode 100644 index 0000000..89d4b3d --- /dev/null +++ b/transfer/tshweb/download.audio.html @@ -0,0 +1,31 @@ + + + + + + + Third Culture Upload + + + + +
+
+

{{.Filename}}

+ + type: {{.ContentType}} + size: {{.ContentLength | format "#,###."}} bytes + +
+ +

download

+
+ +
+
+ + + \ No newline at end of file diff --git a/transfer/tshweb/download.html b/transfer/tshweb/download.html new file mode 100644 index 0000000..f5bb4ff --- /dev/null +++ b/transfer/tshweb/download.html @@ -0,0 +1,27 @@ + + + + + + + Third Culture Upload + + + + +
+
+

{{.Filename}}

+ + type: {{.ContentType}} + size: {{.ContentLength | format "#,###."}} bytes + +
+

download

+
+ +
+
+ + + \ No newline at end of file diff --git a/transfer/tshweb/download.image.html b/transfer/tshweb/download.image.html new file mode 100644 index 0000000..7d71385 --- /dev/null +++ b/transfer/tshweb/download.image.html @@ -0,0 +1,27 @@ + + + + + + + Third Culture Upload + + + + +
+
+

{{.Filename}}

+ + type: {{.ContentType}} + size: {{.ContentLength | format "#,###."}} bytes + +
+
+

download

+
+ +
+ + + \ No newline at end of file diff --git a/transfer/tshweb/download.markdown.html b/transfer/tshweb/download.markdown.html new file mode 100644 index 0000000..a43e38c --- /dev/null +++ b/transfer/tshweb/download.markdown.html @@ -0,0 +1,28 @@ + + + + + + + Third Culture Upload + + + + +
+
+

{{.Filename}}

+ + type: {{.ContentType}} + size: {{.ContentLength | format "#,###."}} bytes + +
+
{{.Content}}
+

download

+
+ +
+
+ + + \ No newline at end of file diff --git a/transfer/tshweb/download.video.html b/transfer/tshweb/download.video.html new file mode 100644 index 0000000..4a11e8e --- /dev/null +++ b/transfer/tshweb/download.video.html @@ -0,0 +1,31 @@ + + + + + + + Third Culture Upload + + + + +
+
+

{{.Filename}}

+ + type: {{.ContentType}} + size: {{.ContentLength | format "#,###."}} bytes + +
+ +

download

+
+ +
+
+ + + \ No newline at end of file diff --git a/transfer/tshweb/favicon.ico b/transfer/tshweb/favicon.ico new file mode 100644 index 0000000..cb6f257 Binary files /dev/null and b/transfer/tshweb/favicon.ico differ diff --git a/transfer/tshweb/includes/download-bottom.html b/transfer/tshweb/includes/download-bottom.html new file mode 100644 index 0000000..a22c387 --- /dev/null +++ b/transfer/tshweb/includes/download-bottom.html @@ -0,0 +1,4 @@ + download

+
+ +
\ No newline at end of file diff --git a/transfer/tshweb/includes/download-top.html b/transfer/tshweb/includes/download-top.html new file mode 100644 index 0000000..82c39d5 --- /dev/null +++ b/transfer/tshweb/includes/download-top.html @@ -0,0 +1,4 @@ +
+

{{.Filename}}

+

type: {{.ContentType}}

+

size: {{.ContentLength | format "#,###."}} bytes

diff --git a/transfer/tshweb/index.html b/transfer/tshweb/index.html new file mode 100644 index 0000000..803ab0a --- /dev/null +++ b/transfer/tshweb/index.html @@ -0,0 +1,37 @@ + + + + + + + Third Culture Upload + + + + +

Third Culture Upload

+
+ + +

+ +
+


+

Make sure to copy the link in the next page!

+

More info on third culture upload here.

+


+ + + + + + + + + \ No newline at end of file diff --git a/transfer/tshweb/scripts/info.html b/transfer/tshweb/scripts/info.html new file mode 100644 index 0000000..23553ed --- /dev/null +++ b/transfer/tshweb/scripts/info.html @@ -0,0 +1,16 @@ + + + + + + + Third Culture Upload + + + + +

up.thirdculture.top info

+

Third culture upload supports uploading through the browser but also using the terminal as well you can find more details on the transfer.sh github. I will include some simple examples here for quick reference.

+ + + \ No newline at end of file diff --git a/transfer/tshweb/styles/main.css b/transfer/tshweb/styles/main.css new file mode 100644 index 0000000..036e249 --- /dev/null +++ b/transfer/tshweb/styles/main.css @@ -0,0 +1,99 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: Arial, sans-serif; + background-color: #121212; + color: #e0e0e0; + padding: 20px; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +h1 { + color: #9b4d96; + margin-bottom: 20px; +} + +.preview-image { + text-align: center; +} + +.preview-image img { + max-width: 600px; + margin-left: auto; + margin-right: auto; +} + +.page-title { + text-align: center; + color: #9b4d96; +} + +.accent { + color: #7bbc7f; +} + +form { + background-color: #1e1e1e; + padding: 20px; + border-radius: 8px; + width: 300px; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.5); +} + +label { + font-size: 16px; + color: #ddd; + margin-bottom: 10px; + display: block; +} + +input[type="file"] { + width: 100%; + padding: 10px; + margin: 10px 0; + border: 2px solid #9b4d96; + background-color: #333; + color: #fff; + border-radius: 4px; +} + +input[type="file"]:hover { + border-color: #be2b90; +} + +button { + background-color: #9b4d96; + color: #fff; + padding: 12px; + border: none; + border-radius: 4px; + width: 100%; + font-size: 16px; + cursor: pointer; + transition: background-color 0.3s ease; +} + +.dwn { + text-align: center; + margin-top: 5px; + margin-bottom: 15px; +} + +button:hover { + background-color: #be2b90; +} + +button:active { + background-color: #9b4d96; +} + +.qrcode { + text-align: center; +} diff --git a/werc/pub/style/style.css b/werc/pub/style/style.css index e1f08e4..5f15c60 100644 --- a/werc/pub/style/style.css +++ b/werc/pub/style/style.css @@ -279,7 +279,7 @@ article h8 { } article p, article li { - color: var(--white); + color: var(--text-primary); font-size: large; } @@ -430,6 +430,11 @@ blockquote { text-align: left; } +#test-search { + padding: 5px; + margin: 5px; +} + /* animations */ .fire { diff --git a/werc/sites/ppl.thirdculture.top/_werc/pub/style.css b/werc/sites/ppl.thirdculture.top/_werc/pub/style.css index ffa27a5..d147bb2 100644 --- a/werc/sites/ppl.thirdculture.top/_werc/pub/style.css +++ b/werc/sites/ppl.thirdculture.top/_werc/pub/style.css @@ -1,3 +1,18 @@ +body { + background: var(--bg-primary); + background-color: var(--bg-primary); + font-family: var(--font-body); +} + +article p, article li { + font-size: large; + font-family: var(--font-body); +} + +img { + max-width: 600px; +} + .main { display: flex; justify-content: center; diff --git a/werc/sites/ppl.thirdculture.top/adil/_werc/style.css b/werc/sites/ppl.thirdculture.top/adil/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/adil/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/adil/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/bea/_werc/style.css b/werc/sites/ppl.thirdculture.top/bea/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/bea/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/bea/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/dulien/_werc/style.css b/werc/sites/ppl.thirdculture.top/dulien/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/dulien/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/dulien/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/geunf/_werc/style.css b/werc/sites/ppl.thirdculture.top/geunf/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/geunf/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/geunf/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/iancobain/_werc/style.css b/werc/sites/ppl.thirdculture.top/iancobain/_werc/style.css index 2e84e74..4e9a1d3 100644 --- a/werc/sites/ppl.thirdculture.top/iancobain/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/iancobain/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} \ No newline at end of file diff --git a/werc/sites/ppl.thirdculture.top/kaz/_werc/style.css b/werc/sites/ppl.thirdculture.top/kaz/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/kaz/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/kaz/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/nevada/_werc/style.css b/werc/sites/ppl.thirdculture.top/nevada/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/nevada/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/nevada/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/q/_images/q.jpg b/werc/sites/ppl.thirdculture.top/q/_images/q.jpg new file mode 100644 index 0000000..1d78fb1 Binary files /dev/null and b/werc/sites/ppl.thirdculture.top/q/_images/q.jpg differ diff --git a/werc/sites/ppl.thirdculture.top/q/_werc/style.css b/werc/sites/ppl.thirdculture.top/q/_werc/style.css index 2e84e74..b69ac28 100644 --- a/werc/sites/ppl.thirdculture.top/q/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/q/_werc/style.css @@ -1 +1,47 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #0bda51; + --color-secondary: #6c3082; + --color-accent: #6c3082; + + /* Background colors */ + --bg-primary: #0C1713; + --bg-secondary: #230903; + + /* Text colors */ + --text-primary: #D9D0DE; + --text-secondary: #65655E; + --text-accent: #CC8899; + + /* Header colours */ + --header-primary:#0bda51; + --header-secondary: #0bda51; + --header-tertiary: #CC8899; + --header-other: #6c3082; + + /* Link colors */ + --link-color: #1d75d4ff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #0bda51; + --border-secondary: #0bda51; + --border-image: #230903; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #0C1713; + --header-text: #D9D0DE; + + /* Font families */ + --font-headers: monospace; + --font-body: monospace; +} + +article p, article li { + font-size: x-large; +} + +header nav { + font-size: large; +} \ No newline at end of file diff --git a/werc/sites/ppl.thirdculture.top/q/index.md b/werc/sites/ppl.thirdculture.top/q/index.md index ee3b30c..d0990a4 100644 --- a/werc/sites/ppl.thirdculture.top/q/index.md +++ b/werc/sites/ppl.thirdculture.top/q/index.md @@ -1,3 +1,7 @@ # Q -Guitarist and vocalist for moridori +Guitarist and vocalist for moridori. + +![picture of me](_images/q.jpg) + +You can find my personal releases under the name morisuki sometimes as well. diff --git a/werc/sites/ppl.thirdculture.top/sean/_werc/style.css b/werc/sites/ppl.thirdculture.top/sean/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/sean/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/sean/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/thomas/_werc/style.css b/werc/sites/ppl.thirdculture.top/thomas/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/thomas/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/thomas/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/ppl.thirdculture.top/vanne/_werc/style.css b/werc/sites/ppl.thirdculture.top/vanne/_werc/style.css index 2e84e74..ab6602e 100644 --- a/werc/sites/ppl.thirdculture.top/vanne/_werc/style.css +++ b/werc/sites/ppl.thirdculture.top/vanne/_werc/style.css @@ -1 +1,39 @@ -/* Put custom styles here */ +:root { + /* Main color scheme */ + --color-primary: #E4F0FEff; + --color-secondary: #AEA3F0ff; + --color-accent: #A4D1ADff; + + /* Background colors */ + --bg-primary: #000300ff; + --bg-secondary: #1C202Fff; + + /* Text colors */ + --text-primary: #E4F0FEff; + --text-secondary: #989898ff; + --text-accent: #AEA3F0ff; + + /* Header colours */ + --header-primary:#AEA3F0ff; + --header-secondary: #AEA3F0ff; + --header-tertiary: #A4D1ADff; + --header-other: #E4F0FEff; + + /* Link colors */ + --link-color: #2667deff; + --link-hover: #5B3D8Aff; + + /* Border colors */ + --border-primary: #C0CEE8ff; + --border-secondary: #0C072Cff; + --border-image: #000300ff; + + /* Special purpose colors */ + --code-color: #18A02Cff; + --header-bg: #AEA3F0ff; + --header-text: #0C072Cff; + + /* Font families */ + --font-headers: 'rumeur', sans-serif; + --font-body: verdana, helvetica, arial, sans-serif; +} diff --git a/werc/sites/thirdculture.top/_trust/welcome.md b/werc/sites/thirdculture.top/_trust/welcome.md index b7acf01..07623bb 100644 --- a/werc/sites/thirdculture.top/_trust/welcome.md +++ b/werc/sites/thirdculture.top/_trust/welcome.md @@ -8,17 +8,19 @@ With an account you have access to edit the wiki, create guides, control over yo Third culture is currently under construction check the [TODO](todo) page to see more details on whats getting done. -A high priority todo is providing easy file uploads but right now that is not completely possible. You can use your login to access the [files.thirdculture.top](https://files.thirdculture.top) page there you can upload files/media directly to the *uploaded* directory where your content can be accessed using the link `http://thirdculture.top/_files/uploaded/FILENAME` on other pages (for example the wiki). Or you can access the *people* pages directly (where I'm trusting you to only edit and upload to the location that belongs to you) there you can upload files directly to the person directory where things can be more easily accessed for your personal pages. +A high priority todo is providing easy file uploads but right now that is not completely possible. For right now you can use the [up.thirdculture.top](https://up.thridculture.top) file uploading service and then make sure to copy the link given to you once it is uploaded and use that link in your image tags. -Note: to include an image in markdown you can use: +Alternatively, if a file management system is better for you, use your login to access the [files.thirdculture.top](https://files.thirdculture.top) page there you can upload files/media directly to the *uploaded* directory where your content can be accessed using the link `http://thirdculture.top/_files/uploaded/FILENAME` on other pages (for example the wiki). Or you can access the *people* pages directly (where I'm trusting you to only edit and upload to the location that belongs to you) there you can upload files directly to the person directory where things can be more easily accessed/managed for your personal pages. + +Note: to include an image in markdown (if used file upload service) you can use: Not centered ``` -![image description](http://thirdculture.top/_files/uploaded/FILENAME.png) +![image description](https://up.thridculture.top/9Rz0GsM4Mt/gaming.png) ``` Centered ``` -![image description](http://thirdculture.top/_files/uploaded/FILENAME.png "main") +![image description](https://up.thridculture.top/9Rz0GsM4Mt/gaming.png "main") ``` This is a temporary solution for the time being as I develop a way to upload pictures better. diff --git a/werc/sites/thirdculture.top/collective/4mdv/_werc/config b/werc/sites/thirdculture.top/collective/4mdv/_werc/config index 7c9fa3e..cd9a9e4 100644 --- a/werc/sites/thirdculture.top/collective/4mdv/_werc/config +++ b/werc/sites/thirdculture.top/collective/4mdv/_werc/config @@ -1,2 +1,3 @@ extraHeaders='' conf_enable_wiki +wiki_editors_groups=mori diff --git a/werc/sites/thirdculture.top/collective/faal/_werc/config b/werc/sites/thirdculture.top/collective/faal/_werc/config index 7c9fa3e..cd9a9e4 100644 --- a/werc/sites/thirdculture.top/collective/faal/_werc/config +++ b/werc/sites/thirdculture.top/collective/faal/_werc/config @@ -1,2 +1,3 @@ extraHeaders='' conf_enable_wiki +wiki_editors_groups=mori diff --git a/werc/sites/thirdculture.top/collective/index.md b/werc/sites/thirdculture.top/collective/index.md index 6f350ba..49e3500 100644 --- a/werc/sites/thirdculture.top/collective/index.md +++ b/werc/sites/thirdculture.top/collective/index.md @@ -12,6 +12,8 @@ Our sounds, drawings, writing all support a grander purpose towards community. O * [498,516,889 Dead Virgins](4mdv) * [Public Sector](public_sector) +A larger members list can be found on the members page along with their works. + ## Connect You can subscribe to our [news](//news) feed with RSS and I'll make a mailing list one of these days too! diff --git a/werc/sites/thirdculture.top/collective/los3r/_werc/config b/werc/sites/thirdculture.top/collective/los3r/_werc/config index 51c18fd..d30532a 100644 --- a/werc/sites/thirdculture.top/collective/los3r/_werc/config +++ b/werc/sites/thirdculture.top/collective/los3r/_werc/config @@ -2,3 +2,4 @@ extraHeaders='' conf_enable_wiki conf_enable_cssedit loser css_file='_werc/style.css' +wiki_editors_groups=loser diff --git a/werc/sites/thirdculture.top/collective/moridori/_werc/config b/werc/sites/thirdculture.top/collective/moridori/_werc/config index 7c9fa3e..cd9a9e4 100644 --- a/werc/sites/thirdculture.top/collective/moridori/_werc/config +++ b/werc/sites/thirdculture.top/collective/moridori/_werc/config @@ -1,2 +1,3 @@ extraHeaders='' conf_enable_wiki +wiki_editors_groups=mori diff --git a/werc/sites/thirdculture.top/collective/public_sector/_werc/config b/werc/sites/thirdculture.top/collective/public_sector/_werc/config index 7c9fa3e..697a626 100644 --- a/werc/sites/thirdculture.top/collective/public_sector/_werc/config +++ b/werc/sites/thirdculture.top/collective/public_sector/_werc/config @@ -1,2 +1,3 @@ extraHeaders='' conf_enable_wiki +wiki_editors_groups=ps diff --git a/werc/sites/thirdculture.top/wiki/_werc/config b/werc/sites/thirdculture.top/wiki/_werc/config index 4cafe34..ddc613e 100644 --- a/werc/sites/thirdculture.top/wiki/_werc/config +++ b/werc/sites/thirdculture.top/wiki/_werc/config @@ -1,3 +1,2 @@ conf_enable_wiki conf_enable_comments -allow_new_user_comments=yes