diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 4b37b1c325..631c7df0c3 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -109,6 +109,8 @@ a:focus { /* DEFAULTS */ body, html { + display: flex; + flex-direction: column; height: 100%; width: auto; color: var(--white); @@ -122,10 +124,10 @@ html { } #header { + order: 1; display: flex; justify-content: center; position: fixed; - pointer-events: none; width: 100%; height: calc(5 * var(--unit-size)); @@ -159,29 +161,32 @@ html { /* CONTAINS ALL ELEMENTS BESIDES HEADER */ .container { - padding-top: calc(3 * var(--small-size) + var(--main-size)); + order: 2; display: flex; + justify-content: space-evenly; + + width: 100%; + max-height: calc(100% - (3 * var(--small-size) + var(--main-size))); + margin-top: auto; } /* THE FOCUSED (middle) DIV */ .content { order: 2; - max-width: calc(100vw / 2); - margin-left: auto; - margin-right: auto; + display: flex; + flex-direction: column; + width: calc(3 * (100%/5)); + padding: var(--small-size); } /* EVERY SIDE PANEL DETAIL ELEMENT */ .panel { all: unset; + width: calc(1 * (100%/5)); } .panel[open] { - width: calc((100vw / 4) - var(--small-size)); - display: flex; - flex-direction: column; - padding: var(--small-size); - box-sizing: border-box; + height: 100%; } /* diff --git a/public/assets/css/left/left.css b/public/assets/css/left/left.css index 1361777a1e..35922b6bc3 100644 --- a/public/assets/css/left/left.css +++ b/public/assets/css/left/left.css @@ -17,17 +17,25 @@ height: auto; } +#right-container { + order: 1; +} + #left-container[open] > div { opacity: 100%; } #left-container[open] { order: 1; + width: calc(100vw / 4); border-right: solid 1px var(--bg2); } -#left-panel { +#left-container[open] > #left-panel { position: fixed; display: flex; flex-direction: column; + + width: 100%; + padding: var(--small-size); } \ No newline at end of file diff --git a/public/assets/css/right/right.css b/public/assets/css/right/right.css index 4be686b23d..24e9757ae9 100644 --- a/public/assets/css/right/right.css +++ b/public/assets/css/right/right.css @@ -12,8 +12,8 @@ vertical-align: middle; } -#right-container > div { - opacity: 0; +#right-container { + order: 3; } #right-container[open] > div { @@ -21,7 +21,7 @@ } #right-container[open] { - order: 3; + width: calc(100vw / 4); border-left: solid 1px var(--bg2); } @@ -29,4 +29,7 @@ position: fixed; display: flex; flex-direction: column; + + width: 100%; + padding: var(--small-size); } \ No newline at end of file diff --git a/public/assets/icons/attach.svg.twig b/public/assets/icons/attach.svg.twig index 0cf4b6aedc..3e4bfcd21c 100644 --- a/public/assets/icons/attach.svg.twig +++ b/public/assets/icons/attach.svg.twig @@ -1,4 +1,3 @@ - attach diff --git a/public/assets/icons/avatar.svg.twig b/public/assets/icons/avatar.svg.twig index 6e65450877..4c6cddfec1 100644 --- a/public/assets/icons/avatar.svg.twig +++ b/public/assets/icons/avatar.svg.twig @@ -1,4 +1,3 @@ - avatar diff --git a/public/assets/icons/heart.svg.twig b/public/assets/icons/heart.svg.twig index ea0571c0c8..727ad722c5 100644 --- a/public/assets/icons/heart.svg.twig +++ b/public/assets/icons/heart.svg.twig @@ -1,4 +1,3 @@ - heart diff --git a/public/assets/icons/logo.svg.twig b/public/assets/icons/logo.svg.twig index 2507072608..91874001b1 100644 --- a/public/assets/icons/logo.svg.twig +++ b/public/assets/icons/logo.svg.twig @@ -1,5 +1,4 @@ - -logo +{{ config('site', 'name') }} diff --git a/public/assets/icons/menu.svg.twig b/public/assets/icons/menu.svg.twig index f47d8eb29b..e3ec3f652a 100644 --- a/public/assets/icons/menu.svg.twig +++ b/public/assets/icons/menu.svg.twig @@ -1,4 +1,3 @@ - menu diff --git a/public/assets/icons/notes.svg.twig b/public/assets/icons/notes.svg.twig new file mode 100644 index 0000000000..eb5c60cb55 --- /dev/null +++ b/public/assets/icons/notes.svg.twig @@ -0,0 +1,6 @@ + + + + Create a note + + \ No newline at end of file diff --git a/public/assets/icons/person.svg.twig b/public/assets/icons/person.svg.twig new file mode 100644 index 0000000000..58a1f17d4b --- /dev/null +++ b/public/assets/icons/person.svg.twig @@ -0,0 +1,6 @@ + + + + Profile + + \ No newline at end of file diff --git a/public/assets/icons/repeat.svg.twig b/public/assets/icons/repeat.svg.twig index c16b283a10..94d1a7acfc 100644 --- a/public/assets/icons/repeat.svg.twig +++ b/public/assets/icons/repeat.svg.twig @@ -1,4 +1,3 @@ - repeat diff --git a/public/assets/icons/reply.svg.twig b/public/assets/icons/reply.svg.twig index 462239b9a7..66c2a3ed89 100644 --- a/public/assets/icons/reply.svg.twig +++ b/public/assets/icons/reply.svg.twig @@ -1,4 +1,3 @@ - reply diff --git a/public/assets/icons/search.svg.twig b/public/assets/icons/search.svg.twig index ddc037d4e7..94ce89d6c0 100644 --- a/public/assets/icons/search.svg.twig +++ b/public/assets/icons/search.svg.twig @@ -1,4 +1,3 @@ - search diff --git a/templates/base.html.twig b/templates/base.html.twig index 641298fa1b..eeeddbdfae 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -42,31 +42,20 @@
- {{ icon('menu', 'icon icon-left') | raw }} -
- {{ block("leftpanel", "stdgrid.html.twig") }} -
+ {{ icon('person', 'icon icon-left') | raw }}
-
- {{ block("leftpanel", "stdgrid.html.twig") }} -
+ {{ block("leftpanel", "stdgrid.html.twig") }}
- {% block nav %}{% endblock %} {% block body %}{% endblock %} {% block javascripts %}{% endblock javascripts %}
- {{ icon('drop', 'icon icon-right') | raw }} -
- {{ block("rightpanel", "stdgrid.html.twig") }} -
+ {{ icon('notes', 'icon icon-right') | raw }}
-
- {{ block("rightpanel", "stdgrid.html.twig") }} -
+ {{ block("rightpanel", "stdgrid.html.twig") }}
diff --git a/templates/sidepanel/right/right.html.twig b/templates/sidepanel/right/right.html.twig index b814e5da52..a70be2fab5 100644 --- a/templates/sidepanel/right/right.html.twig +++ b/templates/sidepanel/right/right.html.twig @@ -1,9 +1,7 @@
{% if post_form is defined %} - {{ post_form }} - - {#{{ form_start(post_form) }} + {{ form_start(post_form) }}
@@ -42,7 +40,8 @@
- {{ form_end(post_form) }}#} + {{ form_end(post_form) }} + {% endif %} {% set current_path = app.request.get('_route') %}