From 5829df7ecc90e9868fce148205dcb22d285aa44a Mon Sep 17 00:00:00 2001 From: Ambroise Maupate Date: Tue, 14 May 2024 15:10:29 +0200 Subject: [PATCH] style: Fixed User panel avatar icon when OpenId account --- .../less/panels/user_panel/user_panel.less | 6 ++++- .../app/less/responsive/less-768.less | 8 +++++-- .../views/panels/user_panel.html.twig | 24 +++++++++++++++---- .../views/partials/js-inject.html.twig | 4 ++-- .../views/partials/simple-js-inject.html.twig | 2 +- .../static/css/app.892de7354f4b82eed554.css | 2 +- .../css/app.892de7354f4b82eed554.css.map | 2 +- .../css/vendor.9b59501e29a05f532c3c.css.map | 2 +- ...d803a4f.js => app.7684c7e9756056051651.js} | 0 ...3a4f.js => simple.7684c7e9756056051651.js} | 0 ...3a4f.js => vendor.7684c7e9756056051651.js} | 0 11 files changed, 36 insertions(+), 14 deletions(-) rename lib/Rozier/src/static/js/{app.72bd4c36693d4d803a4f.js => app.7684c7e9756056051651.js} (100%) rename lib/Rozier/src/static/js/{simple.72bd4c36693d4d803a4f.js => simple.7684c7e9756056051651.js} (100%) rename lib/Rozier/src/static/js/{vendor.72bd4c36693d4d803a4f.js => vendor.7684c7e9756056051651.js} (100%) diff --git a/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less b/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less index 19253354..9b46f958 100644 --- a/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less +++ b/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less @@ -216,7 +216,7 @@ } #user-picture { - display: block; + display: flex; width: @user-picture-size; height: @user-picture-size; border-radius: 50%; @@ -239,7 +239,11 @@ padding: 0px; } } + .uk-icon { + color: rgba(255, 255, 255, 0.5); + } &:hover { + text-decoration: none; border: 3px solid #333; } } diff --git a/lib/Rozier/src/Resources/app/less/responsive/less-768.less b/lib/Rozier/src/Resources/app/less/responsive/less-768.less index 1ae98fe7..73c1fc53 100644 --- a/lib/Rozier/src/Resources/app/less/responsive/less-768.less +++ b/lib/Rozier/src/Resources/app/less/responsive/less-768.less @@ -88,7 +88,7 @@ top:0; right:0; width:60px; - height:@mobile-admin-menu-height; + height: @mobile-admin-menu-height; background: var(--user-panel-color); border-radius: 0; border:0; @@ -98,7 +98,7 @@ background: #3a3a3a; } - img{ + img { position: absolute; width:38px; height:38px; @@ -107,6 +107,10 @@ border-radius: (@user-picture-size / 2)+5px; border: 3px solid var(--user-panel-color); } + + .uk-icon { + color: rgba(255, 255, 255, 0.5); + } } .uk-icon-button{ diff --git a/lib/Rozier/src/Resources/views/panels/user_panel.html.twig b/lib/Rozier/src/Resources/views/panels/user_panel.html.twig index 897d1172..051a886a 100644 --- a/lib/Rozier/src/Resources/views/panels/user_panel.html.twig +++ b/lib/Rozier/src/Resources/views/panels/user_panel.html.twig @@ -12,20 +12,26 @@ {% if app.user and app.user.id %} - {{ app.user.identifier }} + {% if app.user.pictureUrl and app.user.pictureUrl != '#' %} + {{ app.user.identifier }} + {% else %} + + {% endif %} {% elseif app.user %} {% set displayName = app.user.nickname|default(app.user.givenName|default(app.user.name)) %} {% if app.user.picture %} @@ -35,6 +41,14 @@ src="{{ app.user.picture }}" alt="{{ displayName }}" /> + {% else %} + + + {% endif %} {% endif %}