Skip to content

feat: usermenu styling #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeppekroghitk merged 4 commits into from
Jun 30, 2026
Merged

feat: usermenu styling #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
539ca8b
Add some spacing and styling to the user menu
jeppekroghitk Jun 29, 2026
7250350
Merge branch 'feature/7792-dashboard-improvements' into feature/7792-…
jeppekroghitk Jun 29, 2026
5bdb430
Updated changelog
jeppekroghitk Jun 29, 2026
fcf5509
Merge branch 'develop' into feature/7792-polish-usermenu
jeppekroghitk Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [PR-22](https://github.com/itk-dev/itk-project-database/pull/22)
Use the ITK logo in the nav and login, tidy the dashboard header, and refresh
the login screen.
* [PR-20](https://github.com/itk-dev/itk-project-database/pull/20)
Minor improvements to the user menu styling.
* [PR-19](https://github.com/itk-dev/itk-project-database/pull/19)
Auto-upload files with a progress bar and image preview, view images in an
in-page lightbox, and refresh the media field styling.
Expand Down
40 changes: 25 additions & 15 deletions assets/styles/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,7 @@ h3 {
}

.user-menu__header {
padding: var(--itk-space-3);
border-bottom: 1px solid var(--itk-slate-100);
margin-bottom: var(--itk-space-2);
padding: var(--itk-space-2) var(--itk-space-3);
}

.user-menu__eyebrow {
Expand All @@ -257,6 +255,22 @@ h3 {
color: var(--itk-slate-500);
}

.user-menu__divider {
height: 1px;
margin: var(--itk-space-2) 0;
background-color: var(--itk-slate-100);
}

.user-menu__group {
display: flex;
flex-direction: column;
gap: var(--itk-space-1);
}

.user-menu__group-label {
padding: var(--itk-space-1) var(--itk-space-3);
}

.user-menu__link,
.user-menu__logout,
.user-menu__button {
Expand Down Expand Up @@ -287,10 +301,14 @@ h3 {
cursor: pointer;
}

.user-menu__toggle {
.user-menu__pref {
display: flex;
align-items: center;
gap: var(--itk-space-2);
justify-content: space-between;
gap: var(--itk-space-3);
padding: var(--itk-space-2) var(--itk-space-3);
font-size: var(--itk-text-sm);
color: var(--itk-slate-700);
}

.toggle-switch {
Expand All @@ -315,22 +333,18 @@ h3 {
transition: transform 0.15s;
}

.user-menu__toggle[aria-checked="true"] .toggle-switch {
.user-menu__pref[aria-checked="true"] .toggle-switch {
background-color: var(--itk-blue);
}

.user-menu__toggle[aria-checked="true"] .toggle-switch__knob {
.user-menu__pref[aria-checked="true"] .toggle-switch__knob {
transform: translateX(14px);
}

.user-menu__logout {
color: var(--itk-danger);
}

.user-menu__section {
padding: var(--itk-space-2) var(--itk-space-3);
}

.lang-toggle {
display: inline-flex;
border: 1px solid var(--itk-slate-200);
Expand All @@ -355,10 +369,6 @@ h3 {
color: #fff;
}

.user-menu__section .lang-toggle {
margin-top: 6px;
}

.page {
max-width: var(--itk-container);
margin: 0 auto;
Expand Down
58 changes: 36 additions & 22 deletions templates/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,44 @@
<div class="user-menu__name">{{ app.user.name }}</div>
<div class="user-menu__email">{{ app.user.email }}</div>
</div>
<div class="user-menu__section">
<div class="user-menu__eyebrow">{{ 'nav.language'|trans }}</div>
<div class="lang-toggle">
<a href="{{ path('app_locale', {locale: 'da', return: app.request.requestUri}) }}" class="lang-toggle__option {{ app.request.locale == 'da' ? 'lang-toggle__option--active' }}">DA</a>
<a href="{{ path('app_locale', {locale: 'en', return: app.request.requestUri}) }}" class="lang-toggle__option {{ app.request.locale == 'en' ? 'lang-toggle__option--active' }}">EN</a>

<div class="user-menu__divider"></div>

<div class="user-menu__group">
<a href="{{ path(is_granted('ROLE_ADMIN') ? 'admin_users' : 'admin_contacts') }}" class="user-menu__link">{{ 'nav.admin'|trans }}</a>
</div>

<div class="user-menu__divider"></div>

<div class="user-menu__group">
<div class="user-menu__eyebrow user-menu__group-label">{{ 'nav.preferences'|trans }}</div>
<div class="user-menu__pref">
<span>{{ 'nav.language'|trans }}</span>
<div class="lang-toggle">
<a href="{{ path('app_locale', {locale: 'da', return: app.request.requestUri}) }}" class="lang-toggle__option {{ app.request.locale == 'da' ? 'lang-toggle__option--active' }}">DA</a>
<a href="{{ path('app_locale', {locale: 'en', return: app.request.requestUri}) }}" class="lang-toggle__option {{ app.request.locale == 'en' ? 'lang-toggle__option--active' }}">EN</a>
</div>
</div>
<form id="mascotToggleForm" method="post" action="{{ path('app_settings_mascot_toggle') }}" class="user-menu__form">
<input type="hidden" name="_token" value="{{ csrf_token('toggle-mascot') }}">
<input type="hidden" name="return" value="{{ app.request.requestUri }}">
<button type="submit" class="user-menu__button user-menu__pref" role="switch" aria-checked="{{ app.user.mascotEnabled ? 'true' : 'false' }}">
{{ 'nav.show_mascot'|trans }}
<span class="toggle-switch" aria-hidden="true"><span class="toggle-switch__knob"></span></span>
</button>
</form>
<form id="starsToggleForm" method="post" action="{{ path('app_settings_stars_toggle') }}" class="user-menu__form">
<input type="hidden" name="_token" value="{{ csrf_token('toggle-stars') }}">
<input type="hidden" name="return" value="{{ app.request.requestUri }}">
<button type="submit" class="user-menu__button user-menu__pref" role="switch" aria-checked="{{ app.user.starsEnabled ? 'true' : 'false' }}">
{{ 'nav.show_stars'|trans }}
<span class="toggle-switch" aria-hidden="true"><span class="toggle-switch__knob"></span></span>
</button>
</form>
</div>
<a href="{{ path(is_granted('ROLE_ADMIN') ? 'admin_users' : 'admin_contacts') }}" class="user-menu__link">{{ 'nav.admin'|trans }}</a>
<form id="mascotToggleForm" method="post" action="{{ path('app_settings_mascot_toggle') }}" class="user-menu__form">
<input type="hidden" name="_token" value="{{ csrf_token('toggle-mascot') }}">
<input type="hidden" name="return" value="{{ app.request.requestUri }}">
<button type="submit" class="user-menu__button user-menu__toggle" role="switch" aria-checked="{{ app.user.mascotEnabled ? 'true' : 'false' }}">
<span class="toggle-switch" aria-hidden="true"><span class="toggle-switch__knob"></span></span>
{{ 'nav.show_mascot'|trans }}
</button>
</form>
<form id="starsToggleForm" method="post" action="{{ path('app_settings_stars_toggle') }}" class="user-menu__form">
<input type="hidden" name="_token" value="{{ csrf_token('toggle-stars') }}">
<input type="hidden" name="return" value="{{ app.request.requestUri }}">
<button type="submit" class="user-menu__button user-menu__toggle" role="switch" aria-checked="{{ app.user.starsEnabled ? 'true' : 'false' }}">
<span class="toggle-switch" aria-hidden="true"><span class="toggle-switch__knob"></span></span>
{{ 'nav.show_stars'|trans }}
</button>
</form>

<div class="user-menu__divider"></div>

<a href="{{ path('app_logout') }}" class="user-menu__logout">{{ 'nav.logout'|trans }}</a>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions translations/messages.da.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ nav:
areas: Områder
users: Brugere
admin: Administration
preferences: Indstillinger
language: Sprog
signed_in_as: Logget ind som
logout: Log ud
show_mascot: Din ven Glimt
show_stars: Flyvende stjerner
show_mascot: Din ven Glimt ⭐
show_stars: Flyvende stjerner 💫

action:
new: Opret
Expand Down
5 changes: 3 additions & 2 deletions translations/messages.en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ nav:
areas: Areas
users: Users
admin: Administration
preferences: Preferences
language: Language
signed_in_as: Signed in as
logout: Sign out
show_mascot: Show mascot
show_stars: Show flying stars
show_mascot: Show Glimt ⭐
show_stars: Show flying stars 💫x

action:
new: New
Expand Down
Loading