diff --git a/web/app/static/img/firebreak-brand.svg b/web/app/static/img/firebreak-brand.svg deleted file mode 100644 index 600ab1f..0000000 --- a/web/app/static/img/firebreak-brand.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/app/static/img/firebreak-logo-black.svg b/web/app/static/img/firebreak-logo-black.svg deleted file mode 100644 index 809a132..0000000 --- a/web/app/static/img/firebreak-logo-black.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/app/static/img/firebreak-logo-red.svg b/web/app/static/img/firebreak-logo-red.svg deleted file mode 100644 index ea22167..0000000 --- a/web/app/static/img/firebreak-logo-red.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/web/app/templates/base.html b/web/app/templates/base.html index 37a5e9b..9fb9d03 100644 --- a/web/app/templates/base.html +++ b/web/app/templates/base.html @@ -1,3 +1,4 @@ +{% from "partials/_brand.html" import mark %} @@ -13,60 +14,106 @@ rel="stylesheet" /> + -
-
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - + {{ mark("size-7 shrink-0") }} + Firebreak - -
+
{% if user %} - Logout + {% set account_name = user.display_name or user.email or "User" %} + +
+ + + +
+
+

{{ account_name }}

+ {% if user.email and user.email != account_name %} +

{{ user.email }}

+ {% endif %} +
+ + + Settings + + + + Logout + +
+
{% else %}
+ class="{% block main_class %}flex-1 w-full px-4 py-8 mx-auto max-w-5xl sm:px-8{% endblock %}"> {% block content %}{% endblock %}
{% if debug %} @@ -106,7 +153,6 @@ } } - // Check every second. setInterval(checkForCssChanges, 1000); {% endif %} diff --git a/web/app/templates/error.html b/web/app/templates/error.html index 152d867..925940a 100644 --- a/web/app/templates/error.html +++ b/web/app/templates/error.html @@ -1,18 +1,26 @@ {% extends "base.html" %} +{% from "partials/_brand.html" import mark %} {% block title %}{{ status_code }} — Firebreak{% endblock %} {% block main_class %}flex-1 flex flex-col{% endblock %} {% block content %}
-