diff --git a/src/app/core/shell/sidenav/sidenav.component.scss b/src/app/core/shell/sidenav/sidenav.component.scss index d0f087a17..8fd1b775e 100644 --- a/src/app/core/shell/sidenav/sidenav.component.scss +++ b/src/app/core/shell/sidenav/sidenav.component.scss @@ -13,6 +13,7 @@ .app-brand { display: flex; + flex-direction: column; align-items: center; justify-content: center; text-align: center; diff --git a/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.scss b/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.scss index 1a7c79e55..a9b7eeda5 100644 --- a/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.scss +++ b/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.scss @@ -1,5 +1,5 @@ .card { - width: 27.5rem; + min-width: 18.5rem; padding: 0; .header { #office{ diff --git a/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.scss b/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.scss index 1a7c79e55..a9b7eeda5 100644 --- a/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.scss +++ b/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.scss @@ -1,5 +1,5 @@ .card { - width: 27.5rem; + min-width: 18.5rem; padding: 0; .header { #office{ diff --git a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.html b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.html index 9569c96e6..22b19d45f 100644 --- a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.html +++ b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.html @@ -20,7 +20,7 @@
- +
{{"labels.buttons.Day" | translate}} diff --git a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.scss b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.scss index 4b7f4704d..bb685d866 100644 --- a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.scss +++ b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.scss @@ -1,5 +1,5 @@ .card { - width: 41.25rem; + min-width: 18.5rem; padding: 0; .header { #office{ @@ -9,4 +9,9 @@ #timescale { margin: 2% 35%; } + .fallback { + overflow-x: auto; + max-width: 100%; + min-height: 16.5rem; + } } diff --git a/src/app/home/dashboard/dashboard.component.html b/src/app/home/dashboard/dashboard.component.html index 5e4893a58..e40922355 100644 --- a/src/app/home/dashboard/dashboard.component.html +++ b/src/app/home/dashboard/dashboard.component.html @@ -2,7 +2,7 @@ -
+
@@ -35,16 +35,22 @@ - +
+ +
-
+
- - - + +
+ +
+
diff --git a/src/app/home/dashboard/dashboard.component.scss b/src/app/home/dashboard/dashboard.component.scss index 25b6bc5a9..c71eab6cf 100644 --- a/src/app/home/dashboard/dashboard.component.scss +++ b/src/app/home/dashboard/dashboard.component.scss @@ -1,10 +1,56 @@ .card { + box-sizing: border-box; padding: 2%; - .recent-activities, .frequent-activities { - width: 20rem; - padding: 0; - .list { - padding-top: 0px; + display: flex; + flex-direction: column; + + .top-card { + display: flex; + flex-wrap: wrap; + flex-direction: row; + gap: 2px; + + .recent-activities, + .frequent-activities{ + min-width: 18.5rem; + } + .recent-activities, + .frequent-activities, + .amount-disbursed { + flex: 1 0 calc(26.33% - 10px); + padding: 0; + margin: 10px; + + .list { + padding-top: 0; + } + } + } + + .bottom-card{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + gap: 2px; + + .trends-bar, + .amount-collected { + flex: 1 0 calc(40% - 10px); + padding: 0; + margin: 10px; + } + } + + @media screen and (max-width: 768px) { + .recent-activities, + .frequent-activities, + .amount-disbursed, + .trends-bar, + .amount-collected { + box-sizing: border-box; + width: 100%; + flex: 1 0 calc(80% - 10px); + margin-bottom: 20px; } } }