Merge pull request #3438 from ita-social-projects/bugfix/#7409-pagina…

…tion [Bugfix] #7409 Pagination styles
ita-social-projects · Nov 4, 2024 · f279cc8 · f279cc8
2 parents ae7b30a + 6a311e6
commit f279cc8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...p/main/component/comments/components/comment-pagination/comment-pagination.component.scss b/...p/main/component/comments/components/comment-pagination/comment-pagination.component.scss
@@ -12,28 +12,26 @@
     align-items: center;
 
     .page-number {
-      margin: 0 40px 0 0;
+      margin: 0 24px 0 0;
     }
 
     .page-number.current {
-      height: 28px;
-      min-width: 32px;
       background: var(--primary-green) !important;
       border-radius: 4px;
     }
 
     .page-number a {
       display: block;
-      height: 28px;
       font-family: var(--primary-font);
-      font-size: 21px;
-      line-height: 28px;
-      color: var(--primary-dark-grey);
+      font-size: 16px;
+      color: var(--quaternary-dark-grey);
       cursor: pointer;
+      padding: 4px 8px;
+      line-height: 24px;
+      text-align: center;
     }
 
     .page-number.current a {
-      padding: 0 9px;
       color: #fff;
     }
 

diff --git a/...n/component/user/components/profile/profile-dashboard/profile-dashboard.component.spec.ts b/...n/component/user/components/profile/profile-dashboard/profile-dashboard.component.spec.ts
@@ -23,9 +23,15 @@ describe('ProfileDashboardComponent', () => {
   const HabitAssignServiceMock = jasmine.createSpyObj('habitAssignService', ['getAssignedHabits']);
   HabitAssignServiceMock.getAssignedHabits = () => of([{ id: 1 }]);
 
-  const LocalStorageServiceMock = jasmine.createSpyObj('localStorageService', ['getUserId', 'languageBehaviourSubject', 'setCurentPage']);
+  const LocalStorageServiceMock = jasmine.createSpyObj('localStorageService', [
+    'getUserId',
+    'languageBehaviourSubject',
+    'setCurentPage',
+    'getCurrentLanguage'
+  ]);
   LocalStorageServiceMock.languageBehaviourSubject = new BehaviorSubject('ua');
   LocalStorageServiceMock.setCurrentPage = () => of('previousPage', '/profile');
+  LocalStorageServiceMock.getCurrentLanguage = () => of('ua');
 
   const storeMock = jasmine.createSpyObj('store', ['select', 'dispatch']);
   storeMock.select = () =>