commit 313e30487d93d900abda5120966f3e29f24ce6e5 (tree)
parent 55015a045603dfba3cb9d952a42799e4e95ce1dd
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date: Fri, 26 Jan 2024 10:12:15 +0200
e11sync: move base template to e11sync/
Diffstat:
6 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/app/e11sync/apps.py b/app/e11sync/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class E11SyncConfig(AppConfig):
+ default_auto_field = 'django.db.models.BigAutoField'
+ name = 'e11sync'
diff --git a/app/e11sync/settings.py b/app/e11sync/settings.py
@@ -46,6 +46,7 @@ INTERNAL_IPS = ["127.0.0.1"]
INSTALLED_APPS = (['debug_toolbar'] if DEBUG else []) + [
'compressor',
+ 'e11sync.apps.E11SyncConfig',
'signup.apps.SignupConfig',
'django.contrib.admin',
diff --git a/app/e11sync/templates/base.html b/app/e11sync/templates/base.html
@@ -0,0 +1,34 @@
+{% load compress static %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title>{% block "title" %}11sync.net{% endblock %}</title>
+ <meta name="viewport" content="width=device-width,initial-scale=1">
+ {% compress css %}
+ <link rel="stylesheet" type="text/x-scss" href="{% static "signup/style.scss" %}">
+ {% endcompress %}
+ <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+</head>
+<body id="page-{% block "pagename" %}{% endblock %}">
+
+<div>
+ <nav>
+ {% comment %}
+ <a href="{% url "index" %}">Signup</a>
+ <a href="{% url "blog" %}">Blog</a>
+ {% endcomment %}
+ </nav>
+
+ <header>
+ <h1 class="brand-title"><a href="{% url "index" %}">11sync.net</a></h1>
+ <h2 class="brand-subtitle">Hosted Syncthing + Backups</h2>
+ </header>
+
+ <main>
+ {% block "body" %}{% endblock %}
+ </main>
+</div>
+
+</body>
+</html>
diff --git a/app/signup/static/signup/style.scss b/app/signup/static/signup/style.scss
@@ -102,17 +102,24 @@ main {
margin-top: 33px;
}
-#header {
+header {
margin-left: auto;
margin-right: auto;
padding: 1rem 2rem 2rem 2rem;
border-radius: 10px;
max-width: 1000px;
-
background-color: #e6e6e6;
background: radial-gradient(circle at top left, $lightBlue 0%, #aaa 50%, #666 100%);
}
+nav {
+ padding: 10px 0;
+ text-align: right;
+ a {
+ padding-left: 15px;
+ }
+}
+
/*******************************/
/* Shared by a couple of pages */
/*******************************/
@@ -272,7 +279,7 @@ blockquote {
color: #ececec;
}
- #header {
+ header {
background-color: $darkBgGrey;
background: radial-gradient(circle at top left, $blueLinkVisited 0%, $darkBgGrey 50%, $darkTextColor 100%);
}
diff --git a/app/signup/templates/signup/base.html b/app/signup/templates/signup/base.html
@@ -1,27 +0,0 @@
-{% load compress static %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title>{% block "title" %}11sync.net{% endblock %}</title>
- <meta name="viewport" content="width=device-width,initial-scale=1">
- {% compress css %}
- <link rel="stylesheet" type="text/x-scss" href="{% static "signup/style.scss" %}">
- {% endcompress %}
- <link rel="icon" href="data:;base64,iVBORw0KGgo=">
-</head>
-<body id="page-{% block "pagename" %}{% endblock %}">
-
-<div>
- <section id="header">
- <h1 class="brand-title"><a href="{% url "index" %}">11sync.net</a></h1>
- <h2 class="brand-subtitle">Hosted Syncthing + Backups</h2>
- </section><!-- #header -->
-
- <main>
- {% block "body" %}{% endblock %}
- </main>
-</div>
-
-</body>
-</html>
diff --git a/app/signup/templates/signup/index.html b/app/signup/templates/signup/index.html
@@ -1,4 +1,4 @@
-{% extends "signup/base.html" %}
+{% extends "base.html" %}
{% block "pagename" %}index{% endblock %}
