Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
7dc8fda7
Unverified
Commit
7dc8fda7
authored
9 months ago
by
Fredrik Jonsson
Committed by
GitHub
9 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Give the task bell the same hover state as the user menu (#3992)
Fixes #3987
parent
6c963333
No related branches found
No related tags found
1 merge request
!98
Merge 5.15.0 into ardc-main
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hypha/templates/base-apply.html
+3
-3
3 additions, 3 deletions
hypha/templates/base-apply.html
hypha/templates/includes/user_menu.html
+2
-2
2 additions, 2 deletions
hypha/templates/includes/user_menu.html
with
5 additions
and
5 deletions
hypha/templates/base-apply.html
+
3
−
3
View file @
7dc8fda7
...
...
@@ -108,7 +108,7 @@
x-init=
"$watch('open', value => { if (value) { document.getElementById('id-task-list').dispatchEvent(new Event('htmx:fetch')); } })"
>
<a
href=
"{% url "
todo:list
"
%}"
class=
"
p-2 flex items-center hover:opacity-70
transition-
opacity
"
class=
"
flex p-2 rounded-full text-black hover:bg-black hover:text-white
transition-
colors
"
aria-label=
"{% trans "
Task
List
"
%}"
aria-haspopup=
"task_list"
aria-expanded=
"false"
...
...
@@ -116,11 +116,11 @@
title=
"{% trans "
Click
to
open
your
task
list
"
%}"
@
click.prevent=
"open = ! open"
>
{% heroicon_outline "bell-alert" class="inline
me-1 text-black
" aria_hidden="true" %}
{% heroicon_outline "bell-alert" class="inline" aria_hidden="true" %}
</a>
<div
x-cloak
x-show=
"open"
x-transition
@
click.outside=
"open = false"
>
<div
class=
"relative z-999999"
>
<div
class=
"absolute end-
4
bg-white border border-gray-200 min-w-[400px] shadow-md max-h-[500px] overflow-y-scroll zeta"
role=
"task_list"
>
<div
class=
"absolute end-
0
bg-white border border-gray-200 min-w-[400px] shadow-md max-h-[500px] overflow-y-scroll zeta"
role=
"task_list"
>
<div
class=
"p-2 flex justify-between border-b border-gray-100 font-semibold bg-gray-100"
>
<span>
{% trans "Task List" %}
</span>
</div>
...
...
This diff is collapsed.
Click to expand it.
hypha/templates/includes/user_menu.html
+
2
−
2
View file @
7dc8fda7
...
...
@@ -2,11 +2,11 @@
{% if request.user.is_authenticated %}
<div
x-data=
"{ show: false }"
class=
"relative flex"
>
<button
x-on:click=
"show = ! show"
class=
"
button button--narrow font-bold text-center flex items-center justify-center px-2 hover:bg-black hover:text-white active:bg-black active:text-white focus:bg-black focus:text-white
"
type=
"button"
>
<button
x-on:click=
"show = ! show"
class=
"
font-bold flex items-center ps-1 pe-4 hover:bg-black hover:text-white transition-colors rounded-sm
"
type=
"button"
>
{% heroicon_micro "user-circle" class="inline align-text-bottom w-8 h-8 me-1" aria_hidden=true %}
<span>
{{ request.user }}
</span>
</button>
<div
x-show=
"show"
x-transition
@
click.outside=
"show = false"
class=
"min-w-
36
absolute block bg-white shadow-xl z-20 border-y rounded-sm end-0 top-10"
>
<div
x-show=
"show"
x-transition
@
click.outside=
"show = false"
class=
"min-w-
40
absolute block bg-white shadow-xl z-20 border-y rounded-sm end-0 top-10"
>
<a
href=
"{% url 'users:account' %}"
title=
"Goto your account"
class=
"pr-4 py-3 block text-black pl-3
focus-visible:outline-dashed outline-1 transition-colors border-r
hover:bg-slate-100 hover:text-dark-blue hover:font-semibold"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment