diff --git a/app.py b/app.py index 09de853..1b7e4ab 100644 --- a/app.py +++ b/app.py @@ -12,3 +12,7 @@ def index(): @app.route("/host") def host(): return render_template('host.html') + +@app.route("/us") +def us(): + return render_template('us.html') diff --git a/static/icon/service/gitea.webp b/static/icon/service/gitea.webp new file mode 100644 index 0000000..f2b8e66 Binary files /dev/null and b/static/icon/service/gitea.webp differ diff --git a/static/icon/service/sharkey.webp b/static/icon/service/sharkey.webp new file mode 100644 index 0000000..5ee2c4d Binary files /dev/null and b/static/icon/service/sharkey.webp differ diff --git a/static/icon/us/chest.webp b/static/icon/us/chest.webp new file mode 100644 index 0000000..a5b2e29 Binary files /dev/null and b/static/icon/us/chest.webp differ diff --git a/static/icon/us/risdeveau.webp b/static/icon/us/risdeveau.webp new file mode 100644 index 0000000..418499e Binary files /dev/null and b/static/icon/us/risdeveau.webp differ diff --git a/static/icon/us/zxcqirara.webp b/static/icon/us/zxcqirara.webp new file mode 100644 index 0000000..ece12fb Binary files /dev/null and b/static/icon/us/zxcqirara.webp differ diff --git a/static/scss/main.scss b/static/scss/main.scss index 28a56ba..ab759be 100644 --- a/static/scss/main.scss +++ b/static/scss/main.scss @@ -1,3 +1,5 @@ +@use "sass:color"; + $base: #1e1e2e; $text: #cdd6f4; @@ -15,6 +17,9 @@ $surface2: #585b70; $subtext0: #a6adc8; $subtext1: #bac2de; +$red: #f38ba8; +$green: #a6e3a1; +$peach: #fab387; $blue: #89b4fa; @@ -23,7 +28,6 @@ body { font-family: Pixeloid; color: $text; width: 100%; - /* margin: 0 8px; */ margin: 0; } @@ -90,6 +94,28 @@ header { & + & { margin-top: 8px; } + + &.red { + background-color: color.mix($surface0, $red, 50%); + } + &.orange { + background-color: color.mix($surface0, $peach, 50%); + } + &.green { + background-color: color.mix($surface0, $green, 50%); + } + + & .header { + display: flex; + align-items: center; + font-size: x-large; + + .icon { + margin-right: 4px; + width: 48px; + border-radius: 6px; + } + } } @font-face { @@ -110,10 +136,3 @@ header { url("/static/font/Pixeloid/otf/Sans-Bold.otf") format("opentype"); font-weight: bold; } -@font-face { - font-family: PixeloidMono; - src: - url("/static/font/Pixeloid/woff/Mono.woff2") format("woff2"), - url("/static/font/Pixeloid/otf/Mono.otf") format("opentype"); - font-style: mono; -} diff --git a/templates/header.tmpl b/templates/header.tmpl index 29314e3..4aec285 100644 --- a/templates/header.tmpl +++ b/templates/header.tmpl @@ -1,13 +1,13 @@
{%- for (l, t) in ( - ('#', 'О нас'), - (url_for('host'), 'О сервере') + ('us', 'О нас'), + ('host', 'О хосте') ) %} - {%- if l == request.path %} + {%- if url_for(l) == request.path %} {{ t }} {%- else %} - {{ t }} + {{ t }} {%- endif %} {%- endfor %}
diff --git a/templates/host.html b/templates/host.html index d0905c4..d227799 100644 --- a/templates/host.html +++ b/templates/host.html @@ -1,6 +1,6 @@ - Хост - Coders Squad + Coders Squad @@ -9,7 +9,7 @@ {% include 'header.tmpl' %} -

О сервере

+

О хосте

diff --git a/templates/services.tmpl b/templates/services.tmpl index e1d6d11..e4604af 100644 --- a/templates/services.tmpl +++ b/templates/services.tmpl @@ -1,12 +1,16 @@
-
- -

Федеративная микроблогинговая система поверх протокола ActivityPub

+
+ + Sharkey
-
- -

Selhosted хранилище git-репозиториев со свободным исходным кодом

+

Федеративная микроблогинговая система поверх протокола ActivityPub

+
+
+
+ + Gitea
+

Selhosted хранилище git-репозиториев со свободным исходным кодом

diff --git a/templates/us.html b/templates/us.html new file mode 100644 index 0000000..f5eb5d4 --- /dev/null +++ b/templates/us.html @@ -0,0 +1,40 @@ + + + Coders Squad + + + + + + + {% include 'header.tmpl' %} + +

О нас

+ +
+
+
+ + Sweetbread +
+ Главный админ, занимается почти всеми сервисами. Создал этот сайт +
+ +
+
+ + zxcqirara +
+ Второй админ, занимается майном и VPN +
+ +
+
+ + Chest +
+ Должна была помогать делать этот сайт +
+
+ + \ No newline at end of file