Skip to content

Commit 85f6f55

Browse files
authored
Merge pull request #30 from SyncfusionExamples/EJ2-1000021-IssueFix
1000021: Fixing issues in Employee Management
2 parents 9532f5b + ceca68c commit 85f6f55

File tree

4 files changed

+237
-111
lines changed

4 files changed

+237
-111
lines changed

Employee_Managment_App/src/components/Announcement.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
--annc-backdrop: rgba(2,6,23,0.35);
99
--annc-elev: 0 8px 20px rgba(2, 6, 23, 0.06);
1010
--annc-panel-width: 380px;
11-
}
11+
12+
--color-sf-icon-color: #6b7280;
13+
--color-sf-secondary-border-color-hover: #d1d5db;
14+
--color-sf-secondary-bg-color-hover: rgba(158, 158, 158, 0.2);
15+
--color-sf-content-text-color: #111827;
1216

1317
/* Backdrop area that starts below the top bar (top offset applied inline) */
1418
.annc-panel-backdrop {
@@ -157,8 +161,8 @@
157161
opacity: 0.75;
158162
}
159163
.annc-panel-item:hover {
160-
background: #f8fffb;
161-
border-color: #e8f7f1;
164+
background: var(--color-sf-secondary-bg-color-hover);
165+
color: var(--color-sf-content-text-color);
162166
}
163167
.annc-panel-item.is-unread:hover {
164168
background: #ecfdf5;

Employee_Managment_App/src/components/Policies.css

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
--text-muted: #667085;
1919
--text-soft: #475467;
2020

21+
2122
--surface: #ffffff;
2223
--surface-subtle: #fafbfc;
2324

@@ -27,6 +28,9 @@
2728
--shadow-xs: 0 1px 2px rgba(16, 24, 40, .06);
2829
--shadow-sm: 0 2px 8px rgba(16, 24, 40, .08);
2930
--shadow-md: 0 6px 18px rgba(16, 24, 40, .10);
31+
32+
--color-sf-primary-bg-color: #1ab394;
33+
--color-sf-primary-border-color: #1ab394;
3034
}
3135

3236
.policies-grid-wrapper {
@@ -147,9 +151,8 @@
147151
}
148152

149153
.filter-chip:hover {
150-
background: var(--primary-50);
151-
border-color: var(--primary-100);
152-
transform: translateY(-1px);
154+
border-color: var(--text-muted);
155+
153156
}
154157

155158
.filter-chip.is-active {
@@ -355,12 +358,25 @@
355358

356359
.policies-grid-wrapper .e-grid .e-pager .e-currentitem,
357360
.policies-grid-wrapper .e-grid .e-pager .e-currentitem:hover {
358-
background: #1ab394;
359-
border-color:#1ab394;
360-
color: #fff;
361+
background: var(--color-sf-primary-bg-color);
362+
border-color: var(--color-sf-primary-border-color);
363+
color: --surface;
364+
}
365+
366+
.policies-grid-wrapper .e-grid .e-pager .e-numericitem:active {
367+
background: var(--color-sf-primary-bg-color);
368+
border-color: var(--color-sf-primary-border-color);
369+
361370
}
362371

363-
.policies-grid-wrapper .e-grid .e-pager .e-numericitem:hover {
372+
/* Keep hover color for non-active pages only */
373+
.policies-grid-wrapper .e-grid .e-pager .e-numericitem:not(.e-currentitem):hover {
364374
background: var(--primary-50);
365375
color: var(--primary-900);
366-
}
376+
}
377+
/* When hovering the active page, keep the active green */
378+
.policies-grid-wrapper .e-grid .e-pager .e-numericitem.e-currentitem:hover {
379+
background: var(--color-sf-primary-bg-color);
380+
border-color: var(--color-sf-primary-border-color);
381+
color: --surface;
382+
}

Employee_Managment_App/src/components/TopNav.css

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
--shadow-rest: 0 1px 2px rgba(0,0,0,.06);
4141
--shadow-focus: 0 6px 18px rgba(16, 185, 129, 0.16);
4242
--focus-ring: 0 0 0 4px rgba(16, 185, 129, 0.14);
43+
44+
--color-sf-icon-color: #6b7280;
45+
--color-sf-secondary-border-color-hover: #d1d5db;
46+
--color-sf-secondary-bg-color-hover:rgba(158, 158, 158, 0.2);
47+
--color-sf-content-text-color: #111827;
4348
}
4449

4550
/* Parallel fixed header */
@@ -237,9 +242,9 @@
237242
}
238243

239244
.icon-btn:hover {
240-
border-color: var(--accent-100);
241-
background: var(--accent-50);
242-
color: var(--accent-700);
245+
border-color: var(--focus-ring);
246+
background: transparent;
247+
color: var(--color-sf-icon-color);
243248
}
244249

245250
.icon-btn:active { transform: translateY(1px); }
@@ -307,8 +312,9 @@
307312
}
308313

309314
.create-menu button:hover {
310-
background: var(--accent-50);
311-
color: var(--accent-700);
315+
background: var(--color-sf-secondary-bg-color-hover);
316+
border-color: var(--color-sf-content-text-color);
317+
color: var(--color-sf-content-text-color);
312318
}
313319

314320
/* Badge */
@@ -358,9 +364,9 @@
358364
}
359365

360366
.topnav-avatar:hover {
361-
border-color: var(--accent-100);
362-
background: var(--accent-50);
363-
color: var(--accent-700);
367+
border-color: var(--focus-ring);
368+
background: transparent;
369+
color: var(--color-sf-icon-color);
364370
}
365371

366372
.topnav-avatar-menu {

0 commit comments

Comments
 (0)