Skip to content

Commit 9c2cc05

Browse files
scastillo-jpEdgar Guaman
authored andcommitted
fix: TT-331 css
resolving merge conflicts
1 parent ad49027 commit 9c2cc05

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

src/app/modules/shared/components/sidebar/sidebar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="table-cell relative">
1818
<span class="absolute cursor-pointer inset-y-0 right-0 min-h-screen w-0.5 hover:z-0 hover:bg-blue-400" (click)="toggleSideBar()"></span>
1919
<span class="group cursor-pointer absolute w-5 top-20 -right-3">
20-
<img src="assets/icons/left-chevron.svg" id="hide-sidebar" (click)="toggleSideBar()" width="20" height="20" class="bg-black-light rounded-full hover:bg-opacity-50 hover:bg-info-light sm:hidden md:block lg:block"/>
20+
<img src="assets/icons/left-chevron.svg" id="hide-sidebar" (click)="toggleSideBar()" width="20" height="20" class="bg-black-light rounded-full hover:bg-opacity-50 hover:bg-info-light sm:hidden md:block lg:block shadow-sm"/>
2121
<div class="opacity-0 w-12 bg-black text-white 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>
2222
</span>
2323
<span class="group cursor-pointer absolute top-20 -right-5">

src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h6 class="text-left"><strong>Summary</strong></h6>
2-
<hr />
2+
<hr class="mb-3" />
33
<div class ="container px-0">
44
<div class="row pb-4">
55
<div class="col-12 col-sm-3">

src/assets/icons/user.svg

Lines changed: 17 additions & 3 deletions
Loading

0 commit comments

Comments
 (0)