diff --git a/assets/less/main.less b/assets/less/main.less index 71aac0a1..961030b6 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -59,13 +59,17 @@ body { --site-background-meta: repeat; --site-background-image: url('https://mikoto.misaka.nl/i/cloudss.png'); background-blend-mode: multiply; + --accent-colour: #452c4c; + --text-colour: #fff; + --text-colour-inverted: #000; background-color: var(--accent-colour); --gradient-start: var(--accent-colour); } &--legacy { - --background-color: #fbeeff; + --background-colour: #fbeeff; + --accent-colour: #9475b2; } &--bg-blend { diff --git a/misuzu.php b/misuzu.php index e620c39f..c100ed18 100644 --- a/misuzu.php +++ b/misuzu.php @@ -260,9 +260,6 @@ MIG; 'cache' => MSZ_DEBUG ? false : create_directory(build_path(sys_get_temp_dir(), 'msz-tpl-cache-' . md5(MSZ_ROOT))), ]); - // Remove this when the new style is kinda ready - use_legacy_style(); - tpl_var('globals', [ 'site_name' => config_get_default('Misuzu', 'Site', 'name'), 'site_description' => config_get('Site', 'description'), diff --git a/public/auth.php b/public/auth.php index 59ed9480..1d95a021 100644 --- a/public/auth.php +++ b/public/auth.php @@ -5,6 +5,8 @@ $misuzuBypassLockdown = $authMode === 'login' || $authMode === 'get_user'; require_once '../misuzu.php'; +use_legacy_style(); + $usernameValidationErrors = [ 'trim' => 'Your username may not start or end with spaces!', 'short' => sprintf('Your username is too short, it has to be at least %d characters!', MSZ_USERNAME_MIN_LENGTH), diff --git a/public/changelog.php b/public/changelog.php index 2004438a..63c9a619 100644 --- a/public/changelog.php +++ b/public/changelog.php @@ -1,6 +1,8 @@ forum_get_breadcrumbs($forum['forum_id']), - 'forum_colour' => forum_get_colour($forum['forum_id']), + 'global_accent_colour' => forum_get_colour($forum['forum_id']), 'forum_may_have_topics' => $forumMayHaveTopics, 'forum_may_have_children' => $forumMayHaveChildren, 'forum_info' => $forum, diff --git a/public/forum/posting.php b/public/forum/posting.php index f36fb985..c861673a 100644 --- a/public/forum/posting.php +++ b/public/forum/posting.php @@ -137,6 +137,6 @@ if (!empty($topic)) { echo tpl_render('forum.posting', [ 'posting_breadcrumbs' => forum_get_breadcrumbs($forumId), - 'forum_colour' => forum_get_colour($forumId), + 'global_accent_colour' => forum_get_colour($forumId), 'posting_forum' => $forum, ]); diff --git a/public/forum/topic.php b/public/forum/topic.php index 78841ea1..1ffeecb1 100644 --- a/public/forum/topic.php +++ b/public/forum/topic.php @@ -40,7 +40,7 @@ forum_topic_mark_read(user_session_current('user_id', 0), $topic['topic_id'], $t echo tpl_render('forum.topic', [ 'topic_breadcrumbs' => forum_get_breadcrumbs($topic['forum_id']), - 'forum_colour' => forum_get_colour($topic['forum_id']), + 'global_accent_colour' => forum_get_colour($topic['forum_id']), 'topic_info' => $topic, 'topic_posts' => $posts, 'topic_offset' => $postsOffset, diff --git a/public/index.php b/public/index.php index 93ea2d6b..ae48135d 100644 --- a/public/index.php +++ b/public/index.php @@ -1,6 +1,8 @@ config_get('Site', 'name'), diff --git a/public/info.php b/public/info.php index 8dc070ef..f5507dd3 100644 --- a/public/info.php +++ b/public/info.php @@ -1,6 +1,8 @@ - {{ forum_header(forum_info.forum_name, forum_breadcrumbs, true) }} + {{ forum_header(forum_info.forum_name, forum_breadcrumbs, true) }} - {% if forum_may_have_children and forum_info.forum_subforums|length > 0 %} - {{ forum_category_listing(forum_info.forum_subforums, 'Forums') }} - {% endif %} + {% if forum_may_have_children and forum_info.forum_subforums|length > 0 %} + {{ forum_category_listing(forum_info.forum_subforums, 'Forums') }} + {% endif %} - {% if forum_may_have_topics %} - {% set fcbuttons = current_user is defined ? forum_category_buttons(forum_info, forum_perms) : '' %} - {% set fcpagination = pagination( - forum_info.forum_topic_count, - forum_range, - forum_offset, - '/forum/forum.php'|url_construct({'f': forum_info.forum_id}), 'forum__' - ) %} + {% if forum_may_have_topics %} + {% set fcbuttons = current_user is defined ? forum_category_buttons(forum_info, forum_perms) : '' %} + {% set fcpagination = pagination( + forum_info.forum_topic_count, + forum_range, + forum_offset, + '/forum/forum.php'|url_construct({'f': forum_info.forum_id}), 'forum__' + ) %} - {{ fcbuttons }} - {{ fcpagination }} - {{ forum_topic_listing(forum_topics) }} - {{ fcpagination }} - {{ fcbuttons }} - {% endif %} - + {{ fcbuttons }} + {{ fcpagination }} + {{ forum_topic_listing(forum_topics) }} + {{ fcpagination }} + {{ fcbuttons }} + {% endif %} {% endblock %} diff --git a/templates/forum/posting.twig b/templates/forum/posting.twig index b5d6f721..3405042e 100644 --- a/templates/forum/posting.twig +++ b/templates/forum/posting.twig @@ -12,8 +12,6 @@ {% endif %} {% block content %} -
- {{ forum_header('Creating Topic', posting_breadcrumbs) }} - {{ forum_posting_form(form_title, form_target_id, posting_topic is defined) }} -
+ {{ forum_header('Creating Topic', posting_breadcrumbs) }} + {{ forum_posting_form(form_title, form_target_id, posting_topic is defined) }} {% endblock %} diff --git a/templates/forum/topic.twig b/templates/forum/topic.twig index f6a1a8ee..f89b2116 100644 --- a/templates/forum/topic.twig +++ b/templates/forum/topic.twig @@ -27,25 +27,23 @@ ) %} {% block content %} -
- {{ forum_header(topic_info.topic_title, topic_breadcrumbs) }} + {{ forum_header(topic_info.topic_title, topic_breadcrumbs) }} - {{ forum_topic_locked(topic_info.topic_locked, topic_info.topic_archived) }} + {{ forum_topic_locked(topic_info.topic_locked, topic_info.topic_archived) }} - {{ ftbuttons }} - {{ ftpagination }} - {{ forum_post_listing(topic_posts, topic_info.topic_first_post_id) }} - {{ ftpagination }} + {{ ftbuttons }} + {{ ftpagination }} + {{ forum_post_listing(topic_posts, topic_info.topic_first_post_id) }} + {{ ftpagination }} - {% if can_reply %} - {{ forum_posting_form('Reply', topic_info.topic_id, true, 'reply', true) }} + {% if can_reply %} + {{ forum_posting_form('Reply', topic_info.topic_id, true, 'reply', true) }} - - {% endif %} -
+ + {% endif %} {% endblock %} diff --git a/templates/master.twig b/templates/master.twig index fd485290..ac681159 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -15,7 +15,9 @@ {% endif %} - + {% include '_layout/header.twig' %}