diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 38ea2173d8..e5c25ddd44 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -47,7 +47,6 @@ height: 3rem; font-size: var(--main-size); display: flex; - justify-content: space-between; position: fixed; top: 0; background-color: var(--bg1); @@ -68,6 +67,8 @@ display: flex; align-items: center; align-self: center; + margin-left: auto; + margin-right: auto; } #instance:focus svg, @@ -270,10 +271,10 @@ /* MEDIA RESIZE */ @media (min-width: 1200px) { /* no need to make the panels disappear at this size */ - .icon-left, + /*.icon-left, .icon-right { visibility: hidden; - } + }*/ } @media (max-width: 1200px) { @@ -286,8 +287,11 @@ /* we need to control panel's view at this size */ .icon-left, .icon-right { - display: block; - + display: flex; + align-self: center; + align-items: center; + width: 1em; + height: 1em; } /* by default they are hidden */ @@ -413,7 +417,7 @@ /* BUTTONS AND INPUT SHENANIGANS */ button, -input:not([type=radio]):not([type=checkbox]):not([type=text]):not([type=password]) { +input:not([type=radio]):not([type=checkbox]):not([type=text]):not([type=password]):not([type=email]) { font-size: var(--small-size) !important; background-image: linear-gradient(180deg, var(--bg2), transparent) !important; color: var(--white) !important; @@ -423,7 +427,8 @@ input:not([type=radio]):not([type=checkbox]):not([type=text]):not([type=password textarea, input[type=text], -input[type=password] { +input[type=password], +input[type=email] { font-size: inherit !important; display: inline-block; position: relative; diff --git a/public/assets/css/left/left.css b/public/assets/css/left/left.css index 4bec038841..af0ed5cfd2 100644 --- a/public/assets/css/left/left.css +++ b/public/assets/css/left/left.css @@ -51,7 +51,7 @@ #user-avatar:hover img, #user-avatar:focus img { - border-radius: var(--unit-size) !important; + border-radius: 50% !important; box-shadow: var(--shadow-light) !important; } diff --git a/public/assets/icons/menu.svg.twig b/public/assets/icons/menu.svg.twig index 46b4a66c77..38c914d74b 100644 --- a/public/assets/icons/menu.svg.twig +++ b/public/assets/icons/menu.svg.twig @@ -1,6 +1,6 @@ - + Open left sidepanel. diff --git a/public/assets/icons/notes.svg.twig b/public/assets/icons/notes.svg.twig index 60c25e2de8..05ff4afad6 100644 --- a/public/assets/icons/notes.svg.twig +++ b/public/assets/icons/notes.svg.twig @@ -1,6 +1,6 @@ - + Create a note diff --git a/templates/base.html.twig b/templates/base.html.twig index 39e7e17f8f..87a5443f67 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -28,32 +28,34 @@ {% endfor %} - + {% block header %} {% endblock header %}
-
+
{% block nav %}{% endblock %} {% block body %}{% endblock %} {% block javascripts %}{% endblock javascripts %} diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig index ab721b3eeb..09940dcfb3 100644 --- a/templates/note/view.html.twig +++ b/templates/note/view.html.twig @@ -16,12 +16,13 @@ {% trans with {'%name%': reply_to} %} in reply to %name% {% endtrans %} {% endif %} + {% if app.user %}
{% if have_user %} {% for current_action in get_note_actions(note) %} {{ form_start(current_action) }} {% if current_action.submit_fav is defined %} - + {{ form_widget(current_action.submit_fav) }} {% endif %} @@ -29,8 +30,9 @@ {% endfor %} {% endif %}
+ {% endif %}
-
+
{% block markdown %} {% apply markdown_to_html %} {{ note.getContent() }} diff --git a/templates/sidepanel/left/left.html.twig b/templates/sidepanel/left/left.html.twig index f46d5b2b60..8e5408951a 100644 --- a/templates/sidepanel/left/left.html.twig +++ b/templates/sidepanel/left/left.html.twig @@ -1,4 +1,4 @@ -