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.

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

Jump to bottom

Feat/define fine tune components colors #380

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Feat/define fine tune components colors #380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
577459e
🚀fix side nav color
21434809 Sep 26, 2024
4db60c8
📐Refactor side bar component HTML - merge issue
21434809 Sep 26, 2024
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
22 changes: 9 additions & 13 deletions Frontend/src/app/components/organisms/side-bar/side-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<div class="button-container">
<app-expandable-icon class="focus:outline-none max-w-[.5vw]" (click)="toggleSideBar()"></app-expandable-icon>
</div>
<div class="z-10" style="left: 1vw; top: 10.2vh;">
<div [ngClass]="{'w-[2.5vw] h-[2vw]': isSideBarHidden, 'w-[20vw] h-[75vh]': !isSideBarHidden}" class="container pl-5 rounded-md max-h-screen " >
<div class="bg-black opacity-70 rounded-lg overflow-auto h-full flex flex-col justify-between scrollbar-hidden">
<div class="z-10" style="left: 1vw; top: 10.2vh;">
<div [ngClass]="{'w-[2.5vw] h-[2vw]': isSideBarHidden, 'w-[20vw] h-[75vh]': !isSideBarHidden}" class="container pl-5 rounded-md max-h-screen">
<div *ngIf="!isSideBarHidden" class="bg-black opacity-70 rounded-lg overflow-auto h-full flex flex-col justify-between scrollbar-hidden">
<!-- SVG button always visible -->
<div class="flex justify-between items-center mb-2 mt-3">

<div class="flex justify-between items-center mb-2 mt-3">
<!-- Only show these buttons when the sidebar is expanded -->
<div class="button-container" [ngClass]="getButtonClasses('suggestions')">
<button class="px-10 text-sm font-bold text-white focus:outline-none truncate max-w-[19vh] flex-1" (click)="selectOption('suggestions')">Suggestions</button>
<div class="button-container w-full" [ngClass]="getButtonClasses('suggestions')">
<button class="w-full px-10 text-sm font-bold text-white focus:outline-none truncate flex-1" (click)="selectOption('suggestions')">Suggestions</button>
</div>
<div *ngIf="!isSideBarHidden" class="button-container" [ngClass]="getButtonClasses('recentListening')">
<button class="px-10 text-sm text-white focus:outline-none truncate max-w-[19vh] flex-1" (click)="selectOption('recentListening')">Recent listening</button>
<div *ngIf="!isSideBarHidden" class="button-container w-full" [ngClass]="getButtonClasses('recentListening')">
<button class="w-full px-10 text-sm text-white focus:outline-none truncate flex-1" (click)="selectOption('recentListening')">Recent listening</button>
</div>
</div>

Expand All @@ -30,12 +29,9 @@
<app-toast></app-toast>
</div>
</div>

</div>
</div>
</div>


<div *ngIf="isEchoModalVisible" id="echo-songs" tabindex="-1" aria-hidden="true" class="fixed top-0 right-0 left-0 z-50 flex justify-center items-center w-full h-full bg-black bg-opacity-50">
<div class="relative p-4 w-full max-w-2xl max-h-full">
<!-- Modal content -->
Expand Down Expand Up @@ -66,4 +62,4 @@ <h3 class="text-xl font-semibold text-gray-900 dark:text-white">
</div>
</div>
</div>
</div>
</div>
Loading