-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #99 from szymonpoltorak/DEV-183-overflow
DEV 183 - Fixed overflow
- Loading branch information
Showing
2 changed files
with
40 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,53 @@ | ||
| <app-toolbar (sidebarEvent)="sidebarShown = $event"> | ||
| </app-toolbar> | ||
| <div class="overflow-y-hidden h-full"> | ||
| <app-toolbar (sidebarEvent)="sidebarShown = $event"></app-toolbar> | ||
|
|
||
| <mat-drawer-container> | ||
| <mat-drawer [opened]="sidebarShown" mode="side"> | ||
| <div class="flex flex-col justify-between h-[93vh]"> | ||
| <div class="p-[6px] w-[224px] flex flex-col gap-[4px]"> | ||
| <mat-drawer-container class="overflow-y-hidden h-full"> | ||
| <mat-drawer [opened]="sidebarShown" mode="side"> | ||
| <div class="flex flex-col justify-between h-[93vh]"> | ||
| <div class="p-[6px] w-[224px] flex flex-col gap-[4px]"> | ||
|
|
||
| <span class="text-center text-[20px] m-[4px]">{{ projectName }}</span> | ||
| <span class="text-center text-[20px] m-[4px]">{{ projectName }}</span> | ||
|
|
||
| <div class="border-t border-gray-300 my-2"></div> | ||
| <div class="border-t border-gray-300 my-2"></div> | ||
|
|
||
| <sidebar-button (click)="navigateToTimeline()" [iconName]="'matViewTimeline'" | ||
| [label]="'Timeline'" [selected]="selected === 'timeline'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="navigateToTimeline()" [iconName]="'matViewTimeline'" | ||
| [label]="'Timeline'" [selected]="selected === 'timeline'"> | ||
| </sidebar-button> | ||
|
|
||
| <sidebar-button (click)="navigateToBacklog()" [iconName]="'bootstrapArchiveFill'" | ||
| [label]="'Backlog'" [selected]="selected === 'backlog'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="navigateToBacklog()" [iconName]="'bootstrapArchiveFill'" | ||
| [label]="'Backlog'" [selected]="selected === 'backlog'"> | ||
| </sidebar-button> | ||
|
|
||
| <sidebar-button (click)="navigateToBoard()" [selected]="selected === 'board'" | ||
| [iconName]="'akarClipboard'" [label]="'Board'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="navigateToBoard()" [selected]="selected === 'board'" | ||
| [iconName]="'akarClipboard'" [label]="'Board'"> | ||
| </sidebar-button> | ||
|
|
||
| <sidebar-button (click)="navigateToReports()" [iconName]="'octGraph'" [label]="'Reports'" | ||
| [selected]="selected === 'reports'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="navigateToReports()" [iconName]="'octGraph'" [label]="'Reports'" | ||
| [selected]="selected === 'reports'"> | ||
| </sidebar-button> | ||
|
|
||
| <sidebar-button (click)="{}" [iconName]="'octGoal'" [label]="'Goals'" | ||
| [selected]="selected === 'goals'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="{}" [iconName]="'octGoal'" [label]="'Goals'" | ||
| [selected]="selected === 'goals'"> | ||
| </sidebar-button> | ||
|
|
||
| <sidebar-button (click)="{}" [iconName]="'matError'" [label]="'Issues'" | ||
| [selected]="selected === 'issues'"> | ||
| </sidebar-button> | ||
| <sidebar-button (click)="{}" [iconName]="'matError'" [label]="'Issues'" | ||
| [selected]="selected === 'issues'"> | ||
| </sidebar-button> | ||
|
|
||
| </div> | ||
|
|
||
| <div class="p-[6px]"> | ||
| <sidebar-button [label]="'Settings'" [iconName]="'matSettings'" | ||
| [selected]="selected === 'settings'" (click)="navigateToProjectSettings()"> | ||
| </sidebar-button> | ||
| </div> | ||
| </div> | ||
| </mat-drawer> | ||
|
|
||
| <div class="p-[6px]"> | ||
| <sidebar-button [label]="'Settings'" [iconName]="'matSettings'" | ||
| [selected]="selected === 'settings'" (click)="navigateToProjectSettings()"> | ||
| </sidebar-button> | ||
| <mat-drawer-content> | ||
| <div class="overflow-y-scroll h-[89.5vh] m-3"> | ||
| <router-outlet></router-outlet> | ||
| </div> | ||
| </div> | ||
| </mat-drawer> | ||
|
|
||
| <mat-drawer-content> | ||
| <div class="overflow-y-scroll h-[89.5vh] m-4"> | ||
| <router-outlet></router-outlet> | ||
| </div> | ||
| </mat-drawer-content> | ||
| </mat-drawer-container> | ||
| </mat-drawer-content> | ||
| </mat-drawer-container> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +0,0 @@ | ||
| .hide { | ||
| @apply overflow-hidden; | ||
| } | ||