From fa06e87e0b0c0e824ce5599109ae9632b21ed5cd Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Wed, 6 Sep 2017 21:32:04 +0200
Subject: [PATCH] local stuff

---
 resources/assets/less/nova/bem/header.less     |  9 +++++++--
 resources/views/nova/errors/403.twig           |  3 +++
 resources/views/nova/errors/404.twig           |  3 +++
 resources/views/nova/errors/500.twig           |  1 +
 resources/views/nova/errors/503.twig           |  1 +
 resources/views/nova/errors/master.twig        |  1 +
 resources/views/nova/{meta => home}/index.twig |  4 ++--
 resources/views/nova/home/master.twig          |  1 +
 resources/views/nova/master.twig               | 14 ++++++++------
 resources/views/nova/status/index.twig         |  2 +-
 resources/views/nova/status/master.twig        |  1 +
 resources/views/nova/user/master.twig          |  1 +
 resources/views/nova/user/profile.twig         |  2 +-
 13 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 resources/views/nova/errors/403.twig
 create mode 100644 resources/views/nova/errors/404.twig
 create mode 100644 resources/views/nova/errors/500.twig
 create mode 100644 resources/views/nova/errors/503.twig
 create mode 100644 resources/views/nova/errors/master.twig
 rename resources/views/nova/{meta => home}/index.twig (92%)
 create mode 100644 resources/views/nova/home/master.twig
 create mode 100644 resources/views/nova/status/master.twig
 create mode 100644 resources/views/nova/user/master.twig

diff --git a/resources/assets/less/nova/bem/header.less b/resources/assets/less/nova/bem/header.less
index ad3fcd1..61d09c0 100644
--- a/resources/assets/less/nova/bem/header.less
+++ b/resources/assets/less/nova/bem/header.less
@@ -8,8 +8,13 @@
     text-shadow: 0 @text-shadow-distance @text-shadow-size fade(@grey-0, @text-shadow-opacity);
     padding: 2px;
 
-    display: flex;
-    justify-content: space-between;
+    &__inner {
+        max-width: @container-max-width;
+        margin: 0 auto;
+
+        display: flex;
+        justify-content: space-between;
+    }
 
     &__entry {
         padding-left: 12px;
diff --git a/resources/views/nova/errors/403.twig b/resources/views/nova/errors/403.twig
new file mode 100644
index 0000000..f6ff97d
--- /dev/null
+++ b/resources/views/nova/errors/403.twig
@@ -0,0 +1,3 @@
+{% extends '@nova/errors/master.twig' %}
+
+{% set banner = '/images/access-denied.png' %}
diff --git a/resources/views/nova/errors/404.twig b/resources/views/nova/errors/404.twig
new file mode 100644
index 0000000..f48053e
--- /dev/null
+++ b/resources/views/nova/errors/404.twig
@@ -0,0 +1,3 @@
+{% extends '@nova/errors/master.twig' %}
+
+{% set banner = '/images/not-found.png' %}
diff --git a/resources/views/nova/errors/500.twig b/resources/views/nova/errors/500.twig
new file mode 100644
index 0000000..75a9883
--- /dev/null
+++ b/resources/views/nova/errors/500.twig
@@ -0,0 +1 @@
+{% extends '@nova/errors/master.twig' %}
diff --git a/resources/views/nova/errors/503.twig b/resources/views/nova/errors/503.twig
new file mode 100644
index 0000000..75a9883
--- /dev/null
+++ b/resources/views/nova/errors/503.twig
@@ -0,0 +1 @@
+{% extends '@nova/errors/master.twig' %}
diff --git a/resources/views/nova/errors/master.twig b/resources/views/nova/errors/master.twig
new file mode 100644
index 0000000..e4f20e2
--- /dev/null
+++ b/resources/views/nova/errors/master.twig
@@ -0,0 +1 @@
+{% extends '@nova/master.twig' %}
diff --git a/resources/views/nova/meta/index.twig b/resources/views/nova/home/index.twig
similarity index 92%
rename from resources/views/nova/meta/index.twig
rename to resources/views/nova/home/index.twig
index a63157b..ccba937 100644
--- a/resources/views/nova/meta/index.twig
+++ b/resources/views/nova/home/index.twig
@@ -1,7 +1,7 @@
-{% extends '@nova/master.twig' %}
+{% extends '@nova/home/master.twig' %}
 
 {% set banner_classes = user.isActive ? "banner--large" : "banner--insane landing__banner" %}
-{% set banner = user.isActive ? route('user.header', user.id) : "https://i.flash.moe/7131467636550.jpg" %}
+{% set banner = user.isActive ? route('user.header', user.id) : "https://flash.s-ul.eu/OH5MekNx" %}
 
 {% block banner_content %}
     {% if user.isActive %}
diff --git a/resources/views/nova/home/master.twig b/resources/views/nova/home/master.twig
new file mode 100644
index 0000000..e4f20e2
--- /dev/null
+++ b/resources/views/nova/home/master.twig
@@ -0,0 +1 @@
+{% extends '@nova/master.twig' %}
diff --git a/resources/views/nova/master.twig b/resources/views/nova/master.twig
index 5beacb6..a2170c5 100644
--- a/resources/views/nova/master.twig
+++ b/resources/views/nova/master.twig
@@ -16,8 +16,8 @@
     </head>
     <body>
         <div class="container">
-            <div class="container__wrapper {{ wrapper_classes|default('') }}">
-                <nav class="header">
+            <nav class="header">
+                <div class="header__inner">
                     <div class="header__navigation">
                         <a class="header__entry fa-home" href="{{ route('main.index') }}">home</a>
                         <a class="header__entry fa-comments" href="{{ route('forums.index') }}">forum</a>
@@ -32,20 +32,22 @@
                     {% else %}
                         <a class="header__user" href="#">
                             <div class="header__username">login</div>
-                            <div class="header__avatar" style="background-image: url('/images/no-avatar.png')"></div>
+                            <div class="header__avatar" style="background-image: url('{{ route('user.avatar', 0) }}')"></div>
                         </a>
                     {% endif %}
-                </nav>
+                </div>
+            </nav>
 
+            <div class="container__wrapper {{ wrapper_classes|default('') }}">
                 <noscript>
                     <div class="banner" style="background-image: url('/images/enable-javascript.png')"></div>
                 </noscript>
 
                 <div class="banner {{ banner_large is defined and banner_large ? 'banner--large' : '' }} {{ banner_classes|default('') }}" style="background-image: url('{{ banner|default('/images/default-banner.png') }}')">
-                    {{ block('banner_content') }}
+                    {{ block('banner_content') is defined ? block('banner_content') : '' }}
                 </div>
 
-                {{ block('content') }}
+                {{ block('content') is defined ? block('content') : '' }}
             </div>
             <div class="container__footer">
                 <div class="container__footer-copyright">flash.moe 2013-{{ ''|date('Y') }}</div>
diff --git a/resources/views/nova/status/index.twig b/resources/views/nova/status/index.twig
index 8ec8bf8..d8ded3c 100644
--- a/resources/views/nova/status/index.twig
+++ b/resources/views/nova/status/index.twig
@@ -1,4 +1,4 @@
-{% extends '@nova/master.twig' %}
+{% extends '@nova/status/master.twig' %}
 
 {% set title = 'Status' %}
 {% set banner = '/images/status-banner.png' %}
diff --git a/resources/views/nova/status/master.twig b/resources/views/nova/status/master.twig
new file mode 100644
index 0000000..e4f20e2
--- /dev/null
+++ b/resources/views/nova/status/master.twig
@@ -0,0 +1 @@
+{% extends '@nova/master.twig' %}
diff --git a/resources/views/nova/user/master.twig b/resources/views/nova/user/master.twig
new file mode 100644
index 0000000..e4f20e2
--- /dev/null
+++ b/resources/views/nova/user/master.twig
@@ -0,0 +1 @@
+{% extends '@nova/master.twig' %}
diff --git a/resources/views/nova/user/profile.twig b/resources/views/nova/user/profile.twig
index affb1a3..05cd015 100644
--- a/resources/views/nova/user/profile.twig
+++ b/resources/views/nova/user/profile.twig
@@ -1,4 +1,4 @@
-{% extends '@nova/master.twig' %}
+{% extends '@nova/user/master.twig' %}
 
 {% set title = 'profile / ' ~ profile.username %}
 {% set banner_large = true %}