flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uhh updates

Browse source
This commit is contained in:
flash 2018-09-23 18:31:47 +02:00
parent ae7e08ca21
commit 774527c616
16 changed files with 77 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/less/classes/management.less → assets/less/classes/manage/manage.less
View file

@ -1,18 +1,16 @@
.management { .manage {
display: flex; display: flex;
@media (max-width: @site-mobile-width) { @media (max-width: @site-mobile-width) {
flex-direction: column; flex-direction: column;
} }
&__navigation { &__sidebar {
flex: 0 0 auto; flex: 0 0 auto;
width: 300px; width: 280px;
margin-right: 2px;
@media (max-width: @site-mobile-width) { @media (max-width: @site-mobile-width) {
width: 100%; width: 100%;
margin-right: 0;
} }
} }

20
assets/less/classes/manage/navigation.less Normal file
View file

@ -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;
}
}
}

47
assets/less/classes/side-navigation.less
View file

@ -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;
}
}
}

4
assets/less/classes/usercard.less
View file

@ -5,10 +5,10 @@
z-index: 1; z-index: 1;
color: #fff; color: #fff;
text-shadow: 0 1px 4px #111; text-shadow: 0 1px 4px #111;
box-shadow: 0 1px 4px #111; box-shadow: 0 1px 2px #111;
&:hover { &:hover {
box-shadow: 0 1px 8px #111; box-shadow: 0 1px 4px #111;
z-index: 2; z-index: 2;
} }

2
assets/less/classes/userlist.less
View file

@ -4,7 +4,7 @@
justify-content: center; justify-content: center;
&__item { &__item {
margin: 2px; margin: 0 2px 2px 0;
} }
&__selection { &__selection {

6
assets/less/main.less
View file

@ -69,8 +69,6 @@ body {
@import "classes/flag"; @import "classes/flag";
@import "classes/navigation"; @import "classes/navigation";
@import "classes/pagination"; @import "classes/pagination";
@import "classes/management";
@import "classes/side-navigation";
@import "classes/warning"; @import "classes/warning";
// Specific styles // Specific styles
@ -80,6 +78,10 @@ body {
@import "classes/permissions"; @import "classes/permissions";
@import "classes/auth"; @import "classes/auth";
// Manage
@import "classes/manage/manage";
@import "classes/manage/navigation";
// Profile // Profile
@import "classes/profile/profile"; @import "classes/profile/profile";
@import "classes/profile/header"; @import "classes/profile/header";

0
docs/site/privacy.md → docs/privacy.md
View file

0
docs/site/rules.md → docs/rules.md
View file

0
docs/site/terms.md → docs/terms.md
View file

2
public/info.php
View file

@ -37,7 +37,7 @@ if ($filename !== 'LICENSE') {
$filename .= '.md'; $filename .= '.md';
} }
$filename = __DIR__ . '/../' . ($isMisuzuDoc ? '' : 'docs/site/') . $filename; $filename = __DIR__ . '/../' . ($isMisuzuDoc ? '' : 'docs/') . $filename;
$document['content'] = is_file($filename) ? file_get_contents($filename) : ''; $document['content'] = is_file($filename) ? file_get_contents($filename) : '';
if (empty($document['content'])) { if (empty($document['content'])) {

2
templates/manage/general/overview.twig
View file

@ -1,7 +1,7 @@
{% extends 'manage/general/master.twig' %} {% extends 'manage/general/master.twig' %}
{% block manage_content %} {% block manage_content %}
<div class="container"> <div class="container container--new">
<div class="container__title">Overview</div> <div class="container__title">Overview</div>
<div class="container__content"> <div class="container__content">
Welcome to Manage, here you can manage things. Welcome to Manage, here you can manage things.

27
templates/manage/macros.twig
View file

@ -1,19 +1,16 @@
{% macro manage_navigation(navi, level) %} {% macro manage_navigation(nav) %}
{% from _self import manage_navigation %}
{% set level = level|default(0) %}
<ul class="side-navigation side-navigation--layer-{{ level }}"> {% for name, value in nav %}
{% for name, value in navi %} <div class="container container--new manage__navigation">
<li class="side-navigation__item"> <div class="container__title">{{ name }}</div>
{% if value is iterable %}
<span class="side-navigation__title">{{ name }}</span> <div class="manage__navigation__links">
{{ manage_navigation(value, level + 1) }} {% for title, link in value %}
{% else %} <a href="{{ link }}" class="manage__navigation__link">{{ title }}</a>
<a href="{{ value }}" class="side-navigation__link">{{ name }}</a> {% endfor %}
{% endif %} </div>
</li> </div>
{% endfor %} {% endfor %}
</ul>
{% endmacro %} {% endmacro %}
{% macro permissions_table(permissions) %} {% macro permissions_table(permissions) %}

17
templates/manage/master.twig
View file

@ -3,21 +3,14 @@
{% set title = 'Broom Closet' %} {% set title = 'Broom Closet' %}
{% block content %} {% block content %}
<div class="management"> <div class="manage">
<nav class="management__navigation"> <nav class="manage__sidebar">
<div class="container"> {{ manage_navigation(manage_menu) }}
<div class="container__title">
The Broom Closet
</div>
<div class="side-navigation__wrapper">
{{ manage_navigation(manage_menu) }}
</div>
</div>
</nav> </nav>
<div class="management__content"> <div class="manage__content">
{% block manage_content %} {% block manage_content %}
<div class="container"> <div class="container container--new">
<div class="container__title">No brooms</div> <div class="container__title">No brooms</div>
<div class="container__content"> <div class="container__content">
This broom closet is empty. This broom closet is empty.

42
templates/manage/users/roles.twig
View file

@ -9,32 +9,42 @@
<div class="userlist"> <div class="userlist">
{% for role in manage_roles %} {% for role in manage_roles %}
<div class="userlist__item"> <div class="userlist__item">
<div class="usercard"> <div class="usercard">
<a href="?v=role&amp;r={{ role.role_id }}" <a href="?v=role&amp;r={{ role.role_id }}"
class="usercard__background"></a> class="usercard__background"></a>
<div class="usercard__container"> <div class="usercard__container">
<div class="avatar usercard__avatar" <div class="usercard__main">
style="{{ role.role_colour|html_colour('background-color') }}"> <div class="avatar avatar--new usercard__avatar"
style="{{ role.role_colour|html_colour('background-color') }}">
</div>
<div class="usercard__details">
<div class="usercard__name">
{{ role.role_name }}
</div>
<div class="usercard__info">
<span class="usercard__item usercard__item--title">
{{ role.role_title }}
</span>
<span class="usercard__item usercard__item--title">
{{ role.users|number_format }} users
</span>
</div>
</div>
</div> </div>
<div class="usercard__content"> <div class="usercard__actions">
<div class="usercard__name"> <a class="usercard__action" href="/members.php?r={{ role.role_id }}">
{{ role.role_name }} Members
</div> </a>
<div class="usercard__info">
<span class="usercard__item usercard__item--title">
{{ role.role_title }}
</span>
<span class="usercard__item usercard__item--title">
{{ role.users|number_format }} users
</span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

7
templates/master.twig
View file

@ -6,13 +6,6 @@
{% include '_layout/meta.twig' %} {% include '_layout/meta.twig' %}
<link href="{{ '/css/style.css'|asset_url }}" rel="stylesheet"> <link href="{{ '/css/style.css'|asset_url }}" rel="stylesheet">
<link href="{{ '/css/libraries.css'|asset_url }}" rel="stylesheet"> <link href="{{ '/css/libraries.css'|asset_url }}" rel="stylesheet">
{% if manage_menu is defined %}
<style>
:root {
--site-max-width: 1500px;
}
</style>
{% endif %}
{% if site_background_url is defined %} {% if site_background_url is defined %}
<style> <style>
:root { :root {

4
templates/user/listing.twig
View file

@ -24,11 +24,11 @@
</div> </div>
<div class="userlist__selection"> <div class="userlist__selection">
<select class="input__select" name="r" <select class="input__select" name="r"
style="{{ role.role_colour|html_colour }}"> style="{{ role.role_colour|html_colour('color') }}">
{% for r in roles %} {% for r in roles %}
<option <option
value="{{ r.role_id }}" value="{{ r.role_id }}"
style="{{ r.role_colour|html_colour }}" style="{{ r.role_colour|html_colour('color') }}"
{% if r.role_id == role.role_id %} selected{% endif %}> {% if r.role_id == role.role_id %} selected{% endif %}>
{{ r.role_name }} {{ r.role_name }}
</option> </option>