From 5607ef7c55d0ceaa7c49b78b193b02b5d5485caa Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 4 Dec 2016 15:55:53 +0100
Subject: [PATCH] cleanup

---
 mahou                                         | 12 ++-----
 resources/assets/less/yuuno/bem/auth.less     |  7 ++++
 resources/assets/less/yuuno/bem/banned.less   | 11 -------
 resources/assets/less/yuuno/bem/comment.less  |  5 +++
 .../assets/less/yuuno/bem/forum-list.less     |  5 +++
 .../less/yuuno/bem/sidepanel-table.less       | 10 +++++-
 resources/assets/less/yuuno/bem/user.less     | 10 ++++++
 resources/assets/less/yuuno/main.less         |  1 -
 resources/views/yuuno/auth/register.twig      |  4 +--
 resources/views/yuuno/elements/comments.twig  |  4 +--
 .../views/yuuno/elements/indexPanel.twig      | 12 ++++---
 .../views/yuuno/forum/elements/forumBase.twig |  2 +-
 .../views/yuuno/forum/elements/replyForm.twig |  6 ++--
 resources/views/yuuno/forum/index.twig        |  4 +--
 resources/views/yuuno/master.twig             |  2 +-
 resources/views/yuuno/meta/banned.twig        | 28 ----------------
 resources/views/yuuno/meta/search.twig        |  2 +-
 resources/views/yuuno/premium/index.twig      | 32 +------------------
 18 files changed, 59 insertions(+), 98 deletions(-)
 delete mode 100644 resources/assets/less/yuuno/bem/banned.less
 delete mode 100644 resources/views/yuuno/meta/banned.twig

diff --git a/mahou b/mahou
index 70286a3..8e0300b 100644
--- a/mahou
+++ b/mahou
@@ -2,26 +2,18 @@
 <?php
 /*
  * Sakura Mahou
- * Get it, because Sakura is a magical girl in that one anime?
- * Kill me.
+ * Handles console interaction.
  */
 
-// Declare Namespace
 namespace Sakura;
 
-// Uses
 use Sakura\Console\Application;
 use GetOptionKit\Exception\InvalidOptionException;
 
-// Include components
 require_once 'sakura.php';
 
-// Create an instance
-$console = new Application;
-
-// Attempt to run
 try {
-    $console->run($argv);
+    (new Application)->run($argv);
 } catch (InvalidOptionException $e) {
     die($e->getMessage());
 }
diff --git a/resources/assets/less/yuuno/bem/auth.less b/resources/assets/less/yuuno/bem/auth.less
index 9630914..4038ae2 100644
--- a/resources/assets/less/yuuno/bem/auth.less
+++ b/resources/assets/less/yuuno/bem/auth.less
@@ -23,4 +23,11 @@
         font-size: 10px;
         line-height: 1.5em;
     }
+
+    &__blocked {
+        display: block;
+        margin: 10px 0 0;
+        text-shadow: 0 0 5px #8364A1;
+        color: #614390;
+    }
 }
diff --git a/resources/assets/less/yuuno/bem/banned.less b/resources/assets/less/yuuno/bem/banned.less
deleted file mode 100644
index 04170e3..0000000
--- a/resources/assets/less/yuuno/bem/banned.less
+++ /dev/null
@@ -1,11 +0,0 @@
-.banned {
-    &__reason {
-        background: #B19DDD;
-        border: 1px solid #9475B2;
-        font-size: 13px;
-        line-height: 19px;
-        overflow: auto;
-        padding: 6px 10px;
-        border-radius: 3px;
-    }
-}
diff --git a/resources/assets/less/yuuno/bem/comment.less b/resources/assets/less/yuuno/bem/comment.less
index abf82ab..3627814 100644
--- a/resources/assets/less/yuuno/bem/comment.less
+++ b/resources/assets/less/yuuno/bem/comment.less
@@ -4,6 +4,11 @@
 
 .comments {
     overflow: auto;
+
+    &__placeholder {
+        text-align: center;
+        padding: 10px 0;
+    }
 }
 
 .comment {
diff --git a/resources/assets/less/yuuno/bem/forum-list.less b/resources/assets/less/yuuno/bem/forum-list.less
index c856b03..9ba93f3 100644
--- a/resources/assets/less/yuuno/bem/forum-list.less
+++ b/resources/assets/less/yuuno/bem/forum-list.less
@@ -18,4 +18,9 @@
         display: flex;
         justify-content: space-between;
     }
+
+    &__empty {
+        margin: 2em auto;
+        text-align: center;
+    }
 }
diff --git a/resources/assets/less/yuuno/bem/sidepanel-table.less b/resources/assets/less/yuuno/bem/sidepanel-table.less
index 4415a37..2629081 100644
--- a/resources/assets/less/yuuno/bem/sidepanel-table.less
+++ b/resources/assets/less/yuuno/bem/sidepanel-table.less
@@ -2,7 +2,7 @@
     width: 100%;
     font-size: .8em;
     line-height: 1.5em;
-    border-spacing: 1px;
+    border-spacing: 0;
 
     &__head {
         background: #9475B2;
@@ -12,5 +12,13 @@
     &__column {
         padding: 0 2px;
         text-align: center;
+
+        &--align-left {
+            text-align: left;
+        }
+
+        &--align-right {
+            text-align: right;
+        }
     }
 }
diff --git a/resources/assets/less/yuuno/bem/user.less b/resources/assets/less/yuuno/bem/user.less
index c874c1d..f726f7f 100644
--- a/resources/assets/less/yuuno/bem/user.less
+++ b/resources/assets/less/yuuno/bem/user.less
@@ -9,6 +9,12 @@
         margin: 0 2px;
         flex-grow: 0;
         flex-shrink: 0;
+
+        &-link {
+            display: block;
+            height: 100%;
+            width: 100%;
+        }
     }
 
     &__info {
@@ -16,4 +22,8 @@
         width: 100%;
         padding: 0 5px;
     }
+
+    &__link {
+        margin: 0 0 2px;
+    }
 }
diff --git a/resources/assets/less/yuuno/main.less b/resources/assets/less/yuuno/main.less
index e1b22c5..1174180 100644
--- a/resources/assets/less/yuuno/main.less
+++ b/resources/assets/less/yuuno/main.less
@@ -9,7 +9,6 @@
 @import "bem/announce-box";
 @import "bem/auth";
 @import "bem/avatar";
-@import "bem/banned";
 @import "bem/bbcode";
 @import "bem/busy";
 @import "bem/comment";
diff --git a/resources/views/yuuno/auth/register.twig b/resources/views/yuuno/auth/register.twig
index 35f3a1f..9c07f58 100644
--- a/resources/views/yuuno/auth/register.twig
+++ b/resources/views/yuuno/auth/register.twig
@@ -4,8 +4,8 @@
 
 {% block content %}
     <div class="auth content content--auth">
-    {% if config('user.disable_registration') %}
-        <div class="fa fa-remove fa-5x" style="display: block; margin: 10px 0 0;"></div>
+    {% if not config('user.disable_registration') %}
+        <div class="fa fa-remove fa-5x auth__blocked"></div>
         <h1>Registration is disabled.</h1>
         <p>Please try again later.</p>
     {% else %}
diff --git a/resources/views/yuuno/elements/comments.twig b/resources/views/yuuno/elements/comments.twig
index 240595b..17a7574 100644
--- a/resources/views/yuuno/elements/comments.twig
+++ b/resources/views/yuuno/elements/comments.twig
@@ -19,7 +19,7 @@
                 </button>
             </div>
         {% else %}
-            <h1 style="text-align: center; padding: 10px 0">Log in to comment!</h1>
+            <h1 class="comments__placeholder">Log in to comment!</h1>
         {% endif %}
     </div>
     <div class="comments">
@@ -30,7 +30,7 @@
                     {% include 'elements/comment.twig' %}
                 {% endfor %}
             {% else %}
-                <h1 style="text-align: center; padding: 10px 0">There are no comments yet!</h1>
+                <h1 class="comments__placeholder">There are no comments yet!</h1>
             {% endif %}
         </ul>
     </div>
diff --git a/resources/views/yuuno/elements/indexPanel.twig b/resources/views/yuuno/elements/indexPanel.twig
index cb6f7a1..eb81df2 100644
--- a/resources/views/yuuno/elements/indexPanel.twig
+++ b/resources/views/yuuno/elements/indexPanel.twig
@@ -1,9 +1,13 @@
 <div id="indexPanel">
     {% if user.isActive %}
         <div class="user" style="background-image: url({{ route('user.header', user.id) }});">
-            <div class="avatar avatar--border user__avatar" style="background-image: url({{ route('user.avatar', user.id) }}); box-shadow: 0 0 5px {{ user.colour }};"><a href="{{ route('user.profile', user.id) }}" style="display: block; height: 100%; width: 100%;"></a></div>
+            <div class="avatar avatar--border user__avatar" style="background-image: url({{ route('user.avatar', user.id) }}); box-shadow: 0 0 5px {{ user.colour }};">
+                <a href="{{ route('user.profile', user.id) }}" class="user__avatar-link"></a>
+            </div>
             <div class="user__info">
-                <a href="{{ route('user.profile', user.id) }}" class="link link--clean"><h1 style="color: {{ user.colour }}; text-shadow: 0 0 7px {% if user.colour != 'inherit' %}{{ user.colour }}{% else %}#222{% endif %}; padding: 0 0 2px;">{{ user.username }}</h1></a>
+                <a href="{{ route('user.profile', user.id) }}" class="link link--clean user__link">
+                    <h1 style="color: {{ user.colour }}; text-shadow: 0 0 7px {% if user.colour != 'inherit' %}{{ user.colour }}{% else %}#222{% endif %};">{{ user.username }}</h1>
+                </a>
                 {% set friendRequests = user.friends(-1, true)|length %}
                 {% if friendRequests %}
                     <a href="{{ route('settings.friends.requests') }}" title="Pending friend requests">{{ friendRequests }} new friend requests</a>
@@ -21,12 +25,12 @@
         <table class="sidepanel-table">
             {% for amount,onlineUser in stats.onlineUsers %}
             <tr>
-                <td class="sidepanel-table__column" style="text-align: left;">
+                <td class="sidepanel-table__column sidepanel-table__column--align-left">
                     <a href="{{ route('user.profile', onlineUser.id) }}" style="font-weight: bold; color: {{ onlineUser.colour }};">
                         {{ onlineUser.username }}
                     </a>
                 </td>
-                <td class="sidepanel-table__column" style="text-align: right;">
+                <td class="sidepanel-table__column sidepanel-table__column--align-right">
                     <time class="time-ago" datetime="{{ onlineUser.lastOnline|date('r') }}">
                         {{ onlineUser.lastOnline|date(config('general.date_format')) }}
                     </time>
diff --git a/resources/views/yuuno/forum/elements/forumBase.twig b/resources/views/yuuno/forum/elements/forumBase.twig
index 6b8fe5d..5b9fd9a 100644
--- a/resources/views/yuuno/forum/elements/forumBase.twig
+++ b/resources/views/yuuno/forum/elements/forumBase.twig
@@ -34,7 +34,7 @@
             {% include 'forum/elements/topicEntry.twig' %}
         {% endfor %}
     {% else %}
-        <h1 style="margin: 2em auto; text-align: center;">There are no posts in this forum!</h1>
+        <h1 class="forum-list__empty">There are no posts in this forum!</h1>
     {% endif %}
 
     {% include 'forum/elements/forumBtns.twig' %}
diff --git a/resources/views/yuuno/forum/elements/replyForm.twig b/resources/views/yuuno/forum/elements/replyForm.twig
index c2c935f..3c043de 100644
--- a/resources/views/yuuno/forum/elements/replyForm.twig
+++ b/resources/views/yuuno/forum/elements/replyForm.twig
@@ -15,13 +15,13 @@
 
 <div id="reply">
     <form id="postingForm" method="post" action="{{ postingAction }}">
-        <div class="posting-subject" id="postingTitleContainer"{% if titleCache is not defined %} style="display: none;"{% endif %}>
+        <div id="postingTitleContainer"{% if titleCache is not defined %} style="display: none;"{% endif %}>
             <input type="text" class="input__text" name="title" id="postingTitle" placeholder="Title" value="{{ titleCache is defined ? titleCache : '' }}">
         </div>
-        <div class="posting-text">
+        <div>
             <textarea class="input__text" name="text" id="postingText" placeholder="Hit ctrl+enter to submit quickly!"{% if titleCache is defined %} autofocus{% endif %}>{{ textCache }}</textarea>
         </div>
-        <div class="posting-buttons">
+        <div>
             <div style="float: left;">
                 {% for code,meta in bbcode %}
                     <button onclick="Sakura.Editor.InsertBBCode(Sakura.DOM.ID('postingText'), '{{ code }}'{% if meta[2] is defined %}, true{% endif %});" type="button"{% if meta[0] %} title="{{ meta[0] }}"{% endif %} class="input__button{% if meta[1] %} fa fa-{{ meta[1] }}{% endif %}">{% if not meta[1] %}{{ code }}{% endif %}</button>
diff --git a/resources/views/yuuno/forum/index.twig b/resources/views/yuuno/forum/index.twig
index 7cbce61..12fb608 100644
--- a/resources/views/yuuno/forum/index.twig
+++ b/resources/views/yuuno/forum/index.twig
@@ -7,7 +7,7 @@
         <div class="content--right">
             <div id="forumIndexPopularTopics">
                 <div class="content__header content__header--alt">Popular topics</div>
-                <table class="sidepanel-table" style="border-spacing: 0;">
+                <table class="sidepanel-table">
                     <tr>
                         <th class="sidepanel-table__head">Title</th>
                         <th class="sidepanel-table__head">Last reply</th>
@@ -24,7 +24,7 @@
             </div>
             <div id="forumIndexNewPosts">
                 <div class="content__header content__header--alt">Latest posts</div>
-                <table class="sidepanel-table" style="border-spacing: 0;">
+                <table class="sidepanel-table">
                     <tr>
                         <th class="sidepanel-table__head">Title &amp; user</th>
                         <th class="sidepanel-table__head">Posted</th>
diff --git a/resources/views/yuuno/master.twig b/resources/views/yuuno/master.twig
index 8c21b62..9b8223e 100644
--- a/resources/views/yuuno/master.twig
+++ b/resources/views/yuuno/master.twig
@@ -97,7 +97,7 @@
                 {% endif %}
 
                 {% if user.restricted %}
-                    <div class="announce-box announce-box--restricted" style="background: repeating-linear-gradient(-45deg, #B33, #B33 10px, #B00 10px, #B00 20px); color: #FFF; border: 1px solid #C00; box-shadow: 0 0 3px #C00;">
+                    <div class="announce-box announce-box--restricted">
                         <h1>Your account is currently in <span style="font-weight: 700 !important;">restricted mode</span>!</h1>
                         <div>A staff member has set your account to restricted mode most likely due to violation of the rules. While restricted you won't be able to use most public features of the site. If you think this is a mistake please <a href="{{ route('info.contact') }}" style="color: inherit;">get in touch with one of our staff members</a>.</div>
                     </div>
diff --git a/resources/views/yuuno/meta/banned.twig b/resources/views/yuuno/meta/banned.twig
deleted file mode 100644
index ee2a3cc..0000000
--- a/resources/views/yuuno/meta/banned.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends 'master.twig' %}
-
-{% set title = 'You are banned!' %}
-
-{% block content %}
-    <div class="content banned">
-        <div style="padding: 20px;">
-            <h1>You got dunked on!</h1>
-            {% if ban.reason %}
-            <h3>The following reason was supplied:</h3>
-            <p class="banned__reason">
-                {{ ban.reason|raw }}
-            </p>
-            {% else %}
-            <h3>No reason was supplied.</h3>
-            {% endif %}
-            <br>
-            <h2>Additional information</h2>
-            <ul style="margin-left: 30px;">
-                <li>You were banned on {{ ban.issued|date(config('general.date_format')) }}.</li>
-                <li>{% if ban.expires %}This ban expires on {{ ban.expires|date(config('general.date_format')) }}.{% else %}<b>You are permanently banned.</b>{% endif %}</li>
-                {% if ban.expires %}
-                <li>You were banned by <a href="{{ route('user.profile', ban.issuer.id) }}">{{ ban.issuer.username }}</a>.</li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-{% endblock %}
diff --git a/resources/views/yuuno/meta/search.twig b/resources/views/yuuno/meta/search.twig
index 20ce0db..c285641 100644
--- a/resources/views/yuuno/meta/search.twig
+++ b/resources/views/yuuno/meta/search.twig
@@ -3,7 +3,7 @@
 {% set title = 'Search' %}
 
 {% block content %}
-<div class="content" style="background: #FFF;">
+<div class="content" style="background: #fff;">
     <div class="content__header">Search</div>
     <script>
         (function() {
diff --git a/resources/views/yuuno/premium/index.twig b/resources/views/yuuno/premium/index.twig
index 954a44e..491f820 100644
--- a/resources/views/yuuno/premium/index.twig
+++ b/resources/views/yuuno/premium/index.twig
@@ -2,22 +2,10 @@
 
 {% set title %}Support {{ config('general.name') }}{% endset %}
 
-{% set features = {
-    "money": "Helping us pay for the bills to survive",
-    "certificate": "A <span style='font-weight: bold; color: #EE9400'>special</span> name colour to stand out in the crowd",
-    "magic": "The ability to change your username once a month",
-    "pencil": "You can set a custom user title",
-    "lock": "Access to some exclusive forums",
-    "picture-o": "You get the ability to set a profile background"
-} %}
-
 {% block content %}
     <div class="content support">
         <div class="content__header">Support {{ config('general.name') }}</div>
-        <h1 style="font-size: 10em; line-height: 1.5em">redo this entirely</h1>
-        <div style="font-size: .9em; margin-bottom: 10px;">
-            <p>To keep the site and everything surrounding it running I need money to pay the bills, however instead of just having a donate button I decided on adding a premium system to the site which gives you a few extras. The premium rank is indentified on the site by Tenshi. More stuff that literally doesn't exist yet will be added to the list of featuring down the line but in order, the stuff that already exist can be seen further down on this page. With your help we can keep adding new stuff, get new hardware and keep the site awesome!</p>
-        </div>
+        <h1>redo this entirely</h1>
         {% if user.isPremium %}
             <div class="sectionHeader">
                 Your current Tenshi tag
@@ -28,24 +16,6 @@
                 {#<progress value="{{ 100 - (((date().timestamp - user.premiumInfo.start) / (user.premiumInfo.expire - user.premiumInfo.start)) * 100) }}" max="100" style="width: 100%"></progress>#}
             </div>
         {% endif %}
-        <div class="sectionHeader">
-            Why should I get Tenshi?
-        </div>
-        <div class="featureParent">
-            {% for k, v in features %}
-                <div class="featureBox">
-                    <div class="featureBoxIcon fa fa-{{ k }}"></div>
-                    <div class="featureBoxDesc">{{ v|raw }}</div>
-                    <div class="clear"></div>
-                </div>
-            {% endfor %}
-            <div class="featureBox final">
-                <div class="featureBoxIcon fa fa-heart"></div>
-                <div class="featureBoxIcon right fa fa-heart"></div>
-                <div class="featureBoxDesc">The good feeling of helping the staff of your favourite site keep it up and awesome</div>
-                <div class="clear"></div>
-            </div>
-        </div>
         <div class="sectionHeader">
             Payment Options
             <div style="float: right; font-size: 10px; text-align: right;">