diff --git a/assets/less/classes/management.less b/assets/less/classes/manage/manage.less similarity index 70% rename from assets/less/classes/management.less rename to assets/less/classes/manage/manage.less index f9aa6dc4..3c931393 100644 --- a/assets/less/classes/management.less +++ b/assets/less/classes/manage/manage.less @@ -1,18 +1,16 @@ -.management { +.manage { display: flex; @media (max-width: @site-mobile-width) { flex-direction: column; } - &__navigation { + &__sidebar { flex: 0 0 auto; - width: 300px; - margin-right: 2px; + width: 280px; @media (max-width: @site-mobile-width) { width: 100%; - margin-right: 0; } } diff --git a/assets/less/classes/manage/navigation.less b/assets/less/classes/manage/navigation.less new file mode 100644 index 00000000..db7254a2 --- /dev/null +++ b/assets/less/classes/manage/navigation.less @@ -0,0 +1,20 @@ +.manage__navigation { + margin: 0 2px 2px; + + &__links { + display: flex; + flex-direction: column; + font-size: 1.2em; + } + + &__link { + color: inherit; + text-decoration: none; + padding: 2px 5px; + margin-bottom: 2px; + + &:hover { + text-decoration: underline; + } + } +} diff --git a/assets/less/classes/side-navigation.less b/assets/less/classes/side-navigation.less deleted file mode 100644 index aef5591b..00000000 --- a/assets/less/classes/side-navigation.less +++ /dev/null @@ -1,47 +0,0 @@ -.side-navigation { - list-style: none; - - @media (min-width: @site-mobile-width) { - padding: 2px 5px; - } - - &--layer-0 { - @media (max-width: @site-mobile-width) { - font-size: 2em; - line-height: 1.1em; - } - } - - &:not(.side-navigation--layer-0) { - padding-left: 1em; - - @media (max-width: @site-mobile-width) { - padding-left: .5em; - } - } - - &__title { - color: var(--text-colour-header); - font-family: @mio-font-heading; - display: block; - font-weight: 700; - - @media (max-width: @site-mobile-width) { - padding: 4px 6px; - } - } - - &__link { - display: block; - text-decoration: none; - color: inherit; - - @media (max-width: @site-mobile-width) { - padding: 4px 10px; - } - - &:hover { - text-decoration: underline; - } - } -} diff --git a/assets/less/classes/usercard.less b/assets/less/classes/usercard.less index 5987b3bd..a3d5a4fb 100644 --- a/assets/less/classes/usercard.less +++ b/assets/less/classes/usercard.less @@ -5,10 +5,10 @@ z-index: 1; color: #fff; text-shadow: 0 1px 4px #111; - box-shadow: 0 1px 4px #111; + box-shadow: 0 1px 2px #111; &:hover { - box-shadow: 0 1px 8px #111; + box-shadow: 0 1px 4px #111; z-index: 2; } diff --git a/assets/less/classes/userlist.less b/assets/less/classes/userlist.less index 3f41cf4f..dd786fab 100644 --- a/assets/less/classes/userlist.less +++ b/assets/less/classes/userlist.less @@ -4,7 +4,7 @@ justify-content: center; &__item { - margin: 2px; + margin: 0 2px 2px 0; } &__selection { diff --git a/assets/less/main.less b/assets/less/main.less index 4dde0bfb..e0eb12c4 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -69,8 +69,6 @@ body { @import "classes/flag"; @import "classes/navigation"; @import "classes/pagination"; -@import "classes/management"; -@import "classes/side-navigation"; @import "classes/warning"; // Specific styles @@ -80,6 +78,10 @@ body { @import "classes/permissions"; @import "classes/auth"; +// Manage +@import "classes/manage/manage"; +@import "classes/manage/navigation"; + // Profile @import "classes/profile/profile"; @import "classes/profile/header"; diff --git a/docs/site/privacy.md b/docs/privacy.md similarity index 100% rename from docs/site/privacy.md rename to docs/privacy.md diff --git a/docs/site/rules.md b/docs/rules.md similarity index 100% rename from docs/site/rules.md rename to docs/rules.md diff --git a/docs/site/terms.md b/docs/terms.md similarity index 100% rename from docs/site/terms.md rename to docs/terms.md diff --git a/public/info.php b/public/info.php index ad316f94..fcd8328c 100644 --- a/public/info.php +++ b/public/info.php @@ -37,7 +37,7 @@ if ($filename !== 'LICENSE') { $filename .= '.md'; } -$filename = __DIR__ . '/../' . ($isMisuzuDoc ? '' : 'docs/site/') . $filename; +$filename = __DIR__ . '/../' . ($isMisuzuDoc ? '' : 'docs/') . $filename; $document['content'] = is_file($filename) ? file_get_contents($filename) : ''; if (empty($document['content'])) { diff --git a/templates/manage/general/overview.twig b/templates/manage/general/overview.twig index 482f7357..7b6836eb 100644 --- a/templates/manage/general/overview.twig +++ b/templates/manage/general/overview.twig @@ -1,7 +1,7 @@ {% extends 'manage/general/master.twig' %} {% block manage_content %} -
+
Overview
Welcome to Manage, here you can manage things. diff --git a/templates/manage/macros.twig b/templates/manage/macros.twig index 61de54e7..db0b22ed 100644 --- a/templates/manage/macros.twig +++ b/templates/manage/macros.twig @@ -1,19 +1,16 @@ -{% macro manage_navigation(navi, level) %} - {% from _self import manage_navigation %} - {% set level = level|default(0) %} +{% macro manage_navigation(nav) %} -
    - {% for name, value in navi %} -
  • - {% if value is iterable %} - {{ name }} - {{ manage_navigation(value, level + 1) }} - {% else %} - {{ name }} - {% endif %} -
    • - {% endfor %} -
+ {% for name, value in nav %} +
+
{{ name }}
+ +
+ {% for title, link in value %} + {{ title }} + {% endfor %} +
+
+ {% endfor %} {% endmacro %} {% macro permissions_table(permissions) %} diff --git a/templates/manage/master.twig b/templates/manage/master.twig index c75c2cd0..0e1d3640 100644 --- a/templates/manage/master.twig +++ b/templates/manage/master.twig @@ -3,21 +3,14 @@ {% set title = 'Broom Closet' %} {% block content %} -
-