Skip to content
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.

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

Merge dev to dev-lqmkim #43

Merged
merged 4 commits into from
Jan 13, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Merge branch 'dev-lqmkim' into dev
lqmkim authored Jan 13, 2024
commit 168a3b66f58fc230baaebb2303c6511055924753
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
<a routerLink="/" fragment="faqs" class="text-sm font-semibold leading-6 text-gray-700">FAQs</a>

<div class="relative">
<button (click)="toggleEventButton()" type="button"
<button (click)="changeDropdown('events')" type="button"
class="flex items-center text-sm font-semibold leading-6 text-gray-700 gap-x-1 z-index" aria-expanded="false">
Events
<svg class="flex-none w-5 h-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
@@ -45,7 +45,7 @@



<div [ngClass]="eventButtonOpen ? 'absolute' : 'hidden'"
<div [ngClass]="currentDropdown === 'events' ? 'absolute' : 'hidden'"
class="z-50 w-screen max-w-md mt-3 overflow-y-scroll bg-white shadow-lg top-full rounded-3xl ring-1 ring-gray-900/5 h-[70vh] right-0">
<div class="p-4">
<div *ngFor="let clientPage of clientPages"
@@ -78,9 +78,8 @@
</div>

<div class="relative">
<button (click)="toggleMoreButton()" type="button"
class="flex items-center text-sm font-semibold leading-6 text-gray-700 gap-x-1 z-index" aria-expanded="false"
[class.focused]="moreButtonOpen" (blur)="toggleEventNavbarDelay()">
<button (click)="changeDropdown('more')" type="button"
class="flex items-center text-sm font-semibold leading-6 text-gray-700 gap-x-1 z-index" aria-expanded="false">
More
<svg class="flex-none w-5 h-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd"
You are viewing a condensed version of this merge commit. You can view the full changes here.