Merge pull request #8231 from ever-co/fix/time-tracker-style

[Fix] Time tracker and login page styles
ever-co · Sep 18, 2024 · 73d633a · 73d633a
2 parents 98b8452 + 947c8a6
commit 73d633a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/desktop-ui-lib/src/lib/login/login.component.scss b/packages/desktop-ui-lib/src/lib/login/login.component.scss
@@ -444,7 +444,7 @@
 
 ::ng-deep {
 	nb-card-body {
-		padding: .5rem;
+		padding: 36px 0.5rem 0.5rem;
 	}
 
 	nb-card-header {

diff --git a/...sktop-ui-lib/src/lib/recap/shared/features/activity-report/activity-report.component.scss b/...sktop-ui-lib/src/lib/recap/shared/features/activity-report/activity-report.component.scss
@@ -6,7 +6,7 @@
 	padding-bottom: 10px;
 	background-color: var(--gauzy-card-1);
 	border-radius: var(--border-radius);
-	height: calc(100vh - 23.75rem);
+	height: calc(100vh - 22.625rem);
 	overflow-y: auto;
 
 	.table-row-custom {

diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.scss
@@ -17,7 +17,7 @@
 }
 
 .timer-window-container {
-  margin-top: 20px;
+  margin-top: 28px;
   display: flex;
   flex-direction: row;
   align-items: flex-start;
@@ -36,7 +36,7 @@
 .timer {
   min-width: 360px !important;
   width: auto;
-  height: calc(100vh - 2.5rem);
+  height: calc(100vh - 2.5rem - 23px);
   overflow: hidden;
 
   &.expanded {
@@ -633,14 +633,13 @@ img {
   flex-direction: column;
   padding: 8px 4px;
   border-radius: var(--border-radius);
-  height: calc(100vh - 15.75rem);
+  height: calc(100vh - 16.25rem);
   width: auto;
 
   .table-scroll-container {
     flex-grow: 10;
     max-height: unset;
     padding: 0 4px 0;
-    margin-bottom: 8px;
     overflow-x: hidden;
   }
 }