Skip to content

fix: TT-370 logout button not visible #764

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
merged 3 commits into from
Oct 26, 2021
Merged

fix: TT-370 logout button not visible #764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c8879
fix: TT-370 logout button not visible
ararcos Oct 26, 2021
7b3ed11
style: TT-370 Change in the code format
ararcos Oct 26, 2021
39128d7
fix: TT-370 corrections css using tailwind
scastillo-jp Oct 26, 2021
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
Next Next commit
style: TT-370 Change in the code format
  • Loading branch information
@ararcos
ararcos committed Oct 26, 2021
commit 7b3ed11fb0b13711d71fcdb532ece8f8b9bd2f8b
74 changes: 40 additions & 34 deletions src/app/modules/shared/components/sidebar/sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,50 @@
<div id="wrapper" class="d-flex bg-grayTW-lightest dark:bg-grayTW-darker dark:text-whiteTW">
<div id="sidebar-wrapper" class="table-row border-r border-grayTW-lighter shadow-sm bg-whiteTW dark:bg-grayTW-dark dark:border-grayTW">
<div class="table-cell">
<div class="relative flex items-center border-b border-grayTW-lighter dark:border-grayTW sidebar-heading">
<img src="assets/img/ioet-logo-without-letters.png" alt="ioet-logo" width="50" height="auto" style="padding-top: 0.5rem; padding-left: 1rem;" />
<h1 class="pl-2 pt-2" style="font-family:spinnaker,sans-serif">ioet</h1>
</div>
<app-user></app-user>
<div class="list-group list-group-flush bg-whiteTW dark:bg-grayTW-darker">
<a *ngFor="let item of itemsSidebar" [routerLink]="item.route" routerLinkActive="" class="font-poppins relative pl-4 py-3 bg-whiteTW dark:bg-grayTW-dark dark:text-whiteTW" [ngClass]="{active: item.active}">
<em class="{{ item.icon }}"></em>
<h3 class="font-poppins text-base ml-4 pl-3 -mt-6 text-left">{{ item.text }}</h3>
</a>
<div id="btn-bottom" class="bg-whiteTW pt-2 pr-24 absolute bottom-1 dark:bg-grayTW-dark btn-dark-mode">
<a class="flex pl-4 text-blackTW hover:text-grayTW dark:text-whiteTW" href="#">
<em class="fas fa-sign-out-alt"></em>
<span class="font-poppins pl-3 font-medium -mt-1 dark:text-whiteTW" (click)="logout()">Sign out</span>
</a>
<app-dark-mode id="btn-dark-mode" class="relative left-40"></app-dark-mode>
</div>
</div>
</div>
<div class="table-cell relative">
<span class="absolute cursor-pointer inset-y-0 right-0 min-h-screen w-0.5 hover:z-0 hover:bg-primaryTW-light" (click)="toggleSideBar()"></span>
<span class="group cursor-pointer absolute w-5 top-28 -right-3">
<div id="sidebar-wrapper" class="table-row border-r border-grayTW-lighter shadow-sm bg-whiteTW dark:bg-grayTW-dark dark:border-grayTW">
<div class="table-cell">
<div class="relative flex items-center border-b border-grayTW-lighter dark:border-grayTW sidebar-heading">
<img src="assets/img/ioet-logo-without-letters.png" alt="ioet-logo" width="50" height="auto" style="padding-top: 0.5rem; padding-left: 1rem;"/>
<h1 class="pl-2 pt-2" style="font-family:spinnaker,sans-serif">ioet</h1>
</div>
<app-user></app-user>
<div class="list-group list-group-flush bg-whiteTW dark:bg-grayTW-darker">
<a
*ngFor="let item of itemsSidebar"
[routerLink]="item.route"
routerLinkActive=""
class="font-poppins relative pl-4 py-3 bg-whiteTW dark:bg-grayTW-dark dark:text-whiteTW"
[ngClass]="{active: item.active}"
>
<em class="{{ item.icon }}"></em>
<h3 class="font-poppins text-base ml-4 pl-3 -mt-6 text-left" >{{ item.text }}</h3>
</a>
<div id="btn-bottom" class="bg-whiteTW pt-2 pr-24 absolute bottom-1 dark:bg-grayTW-dark">
<a class="flex pl-4 text-blackTW hover:text-grayTW dark:text-whiteTW" href="#">
<em class="fas fa-sign-out-alt"></em>
<span class="font-poppins pl-3 font-medium -mt-1 dark:text-whiteTW" (click)="logout()">Sign out</span>
</a>
<app-dark-mode id="btn-dark-mode" class="relative left-40"></app-dark-mode>
</div>
</div>
</div>
<div class="table-cell relative">
<span class="absolute cursor-pointer inset-y-0 right-0 min-h-screen w-0.5 hover:z-0 hover:bg-primaryTW-light" (click)="toggleSideBar()"></span>
<span class="group cursor-pointer absolute w-5 top-28 -right-3">
<img src="assets/icons/left-chevron.svg" alt="left-chevron" id="hide-sidebar" (click)="toggleSideBar()" width="20" height="20" class="bg-whiteTW rounded-full hover:bg-opacity-50 hover:bg-primaryTW-light sm:hidden md:block lg:block"/>
<div class="opacity-0 w-12 bg-blackTW text-whiteTW text-center text-xs rounded-lg py-2 absolute z-10 group-hover:opacity-100 bottom-full left-1/4 ml-4 -mb-6 px-1 pointer-events-none">Hide</div>
</span>
<span class="group cursor-pointer absolute top-28 -right-5">
<span class="group cursor-pointer absolute top-28 -right-5">
<img src="assets/icons/right-chevron.svg" alt="right-chevron" id="show-sidebar" (click)="toggleSideBar()" width="20" height="20" class="bg-whiteTW rounded-full hover:bg-opacity-50 hover:bg-primaryTW-light sm:block md:hidden lg:hidden"/>
<div class="opacity-0 w-12 bg-blackTW text-whiteTW text-center text-xs rounded-lg py-2 absolute z-10 group-hover:opacity-100 bottom-full left-1/4 ml-4 -mb-6 px-1 pointer-events-none">Show</div>
</span>
</div>
</div>
<div id="page-content-wrapper">
<div class="container-fluid px-0 full-height">
<div class="content_app h-100">
<div class="m-1 p-5 rounded-md bg-whiteTW dark:bg-grayTW-dark">
<router-outlet></router-outlet>
</div>
</div>
</div>
<div id="page-content-wrapper">
<div class="container-fluid px-0 full-height">
<div class="content_app h-100">
<div class="m-1 p-5 rounded-md bg-whiteTW dark:bg-grayTW-dark">
<router-outlet></router-outlet>
</div>
</div>
</div>
</div>
</div>
</div>
109 changes: 55 additions & 54 deletions src/app/modules/shared/components/sidebar/sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,87 @@
@import '../../../../../styles/colors.scss';

body {
overflow-x: hidden;
overflow-x: hidden;
}

#sidebar-wrapper {
min-height: 100vh;
margin-left: -15rem;
-webkit-transition: margin 0.25s ease-out;
-moz-transition: margin 0.25s ease-out;
-o-transition: margin 0.25s ease-out;
transition: margin 0.25s ease-out;
min-height: 100vh;
margin-left: -15rem;
-webkit-transition: margin 0.25s ease-out;
-moz-transition: margin 0.25s ease-out;
-o-transition: margin 0.25s ease-out;
transition: margin 0.25s ease-out;
}

#sidebar-wrapper .sidebar-heading {
padding: 0.875rem 1.25rem;
font-size: 1.2rem;
padding: 0.875rem 1.25rem;
font-size: 1.2rem;
}

#sidebar-wrapper .list-group {
width: 15rem;
width: 15rem;
}

#page-content-wrapper {
min-width: 100vw;
min-width: 100vw;
}

#wrapper.toggled #sidebar-wrapper {
margin-left: 0;
}

#btn-dark-mode {
top: -2rem;
}

#btn-bottom {
height: 4%;
margin-left: 0;
}

@media (min-width: 769px) {
#sidebar-wrapper {
margin-left: 0;
}
#page-content-wrapper {
min-width: 0;
width: 100%;
}
#wrapper.toggled #sidebar-wrapper {
margin-left: -15rem;
}
#hide-sidebar {
display: block;
}
#show-sidebar {
display: none;
}
#sidebar-wrapper {
margin-left: 0;
}
#page-content-wrapper {
min-width: 0;
width: 100%;
}
#wrapper.toggled #sidebar-wrapper {
margin-left: -15rem;
}
#hide-sidebar {
display: block;
}
#show-sidebar {
display: none;
}
}

@media (max-width: 768px) {
#hide-sidebar {
display: none;
}
#show-sidebar {
display: block;
}
#hide-sidebar {
display: none;
}
#show-sidebar {
display: block;
}
}

.content_app {
padding: 2rem 3rem 5rem 3rem;
overflow-y: scroll;
padding: 2rem 3rem 5rem 3rem;
overflow-y: scroll;
}

.active {
color: $primary;
font-weight: bold;
border-color: $primary;
background-color: transparent;
color: $primary;
font-weight: bold;
border-color: $primary;
background-color: transparent;
}

.full-height {
height: 100%;
height: -moz-calc(100vh - 1vh);
height: -webkit-calc(100vh - 1vh);
height: -o-calc(100vh - 1vh);
height: calc(100vh - 1vh);
}
height: 100%;
height: -moz-calc(100vh - 1vh);
height: -webkit-calc(100vh - 1vh);
height: -o-calc(100vh - 1vh);
height: calc(100vh - 1vh);
}

#btn-dark-mode {
top: -2rem;
}

#btn-bottom {
height: 4%;
}