Skip to content

932509: Need to change the attractive ui for employee management application #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Employee_Managment_App/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
rel="stylesheet"
/>
<link
href="https://cdn.syncfusion.com/ej2/25.1.35/material3.css"
href="https://cdn.syncfusion.com/ej2/28.1.33/tailwind3.css"
rel="stylesheet"
/>
<script src="https://cdn.syncfusion.com/ej2/syncfusion-helper.js"></script>
Expand Down
3 changes: 0 additions & 3 deletions Employee_Managment_App/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ function App() {

return (
<div className="xyz-management">
<div className="xyz-management-header">
<div className="header-content">XYZ Software PVT LTD</div>
</div>
<Router>
<div className="xyz-management-content" style={{ width: '100%' }}>
<div className="row">
Expand Down
3 changes: 0 additions & 3 deletions Employee_Managment_App/src/components/Achievements.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import * as React from 'react';
const Achievements = () => {
return (
<div className="achievementspage">
<div className="achievements-header">
<div>Achievements</div>
</div>
<div className="achievements-content">
<div className="col-lg-12 control-section card-control-section horizontal_card_layout">
<div className="e-card-resize-container">
Expand Down
3 changes: 0 additions & 3 deletions Employee_Managment_App/src/components/Announcement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import * as React from 'react';
const Announcement = () => {
return (
<div className="announcementpage">
<div className="announcement-header">
<div>Announcement</div>
</div>
<div className="announcement-content">
<div className="col-lg-12 card-control-section basic_card_layout">
<div className="e-card-resize-container">
Expand Down
4 changes: 0 additions & 4 deletions Employee_Managment_App/src/components/EmployeeInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
};
return (
<div className="employeeinfopage">
<div className="employeeinfo-header">
{employeeData.Name === userInfo.Name ? 'My' : employeeData.Name + "'s"}{' '}
Profile
</div>
<div className="employeeinfo-content">
<TabComponent heightAdjustMode="Auto">
<TabItemsDirective>
Expand Down
3 changes: 0 additions & 3 deletions Employee_Managment_App/src/components/Organization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ const Organization = () => {
};
return (
<div className="employeespage">
<div className="employees-header">
<div>Organization</div>
</div>
<div className="employees-content">
<TabComponent heightAdjustMode="Auto">
<TabItemsDirective>
Expand Down
3 changes: 0 additions & 3 deletions Employee_Managment_App/src/components/Policies.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import * as React from 'react';
const Policies = () => {
return (
<div className="policiespage">
<div className="policies-header">
<div>Policies</div>
</div>
<div className="policies-content">
<div className="col-lg-12 card-control-section basic_card_layout">
<div className="e-card-resize-container">
Expand Down
91 changes: 77 additions & 14 deletions Employee_Managment_App/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@

.xyz-management-content {
position: absolute;
top: 75px;
height: 650px;
}

.xyz-management-content .col-md-2.sidebar {
height: 650px;
border-right: 1px solid rgb(0, 0, 0, 0.2);
box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.04);
background-color: #ecf2f9;
padding-right: 0px;
width: 240px;
background-color: #ffffff;
color: #3a3b3c;
position: fixed;
height: 100%;
padding-top: 20px;
border-right: 1px solid #e0e0e0;
box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
}

.xyz-management-content .col-md-10.main-content {
Expand All @@ -39,7 +40,20 @@
left: 170px;
}

@media (min-width: 400px) {
@media (max-width: 426px) {
.xyz-management-content .col-md-2.sidebar {
width: 155px;
float: left;
}
.xyz-management-content .col-md-10.main-content {
width: calc(100% - 170px);
float: left;
position: sticky;
left: 200px;
}
}

@media (min-width: 426px) and (max-width: 768px) {
.xyz-management-content .col-md-2.sidebar {
width: 185px;
float: left;
Expand All @@ -49,11 +63,44 @@
float: left;
}
}
@media (min-width:1024px) {
.xyz-management-content .col-md-2.sidebar {
width: 185px;
float: left;
}
.xyz-management-content .col-md-10.main-content {
width: calc(100% - 170px);
float: left;
}
}

@media (max-width:600px) {
.detail .information {
display: block;
padding-left: 0px;
}
.detail .sub-heading {
width: 130px;
padding-right: 10px;
}
}

.nav > li {
align-items: center;
/* padding: 15px 20px; */
color: #3a3b3c;
text-decoration: none;
transition: background-color 0.3s ease, color 0.3s ease;
font-weight: 500;
margin-left: 10px;
}

.nav > li > a:focus,
.nav > li > a.active,
.nav > li > a:hover {
text-decoration: none;
background-color: #eaddff;
background-color: #f0f2f5;
color: #007bff;
}
.policiespage a:focus,
.policiespage a.active,
Expand Down Expand Up @@ -106,21 +153,21 @@ a.employee-popover:hover {

/* Tooltip */

.e-tooltip-template-css.e-tooltip-wrap.e-popup {
.e-tooltip-wrap.e-popup {
background-color: #eaddff;
border: 1px solid #e0e0e0;
}
.e-tooltip-template-css.e-tooltip-wrap .e-arrow-tip-outer.e-tip-bottom {
.e-tooltip-wrap .e-arrow-tip-outer.e-tip-bottom {
border-top: 8px solid #e0e0e0;
}
.e-tooltip-template-css.e-tooltip-wrap .e-tip-content {
.e-tooltip-wrap .e-tip-content {
color: rgba(0, 0, 0, 0.87);
}
.e-tooltip-template-css.e-tooltip-wrap {
.e-tooltip-wrap {
opacity: 1;
}
.e-tooltip-template-css.e-tooltip-wrap .e-arrow-tip-inner.e-tip-bottom,
.e-tooltip-template-css.e-tooltip-wrap .e-arrow-tip-inner.e-tip-top {
.e-tooltip-wrap .e-arrow-tip-inner.e-tip-bottom,
.e-tooltip-wrap .e-arrow-tip-inner.e-tip-top {
color: #eaddff;
}

Expand Down Expand Up @@ -321,6 +368,22 @@ td.cardcell.separateline {
}
}

@media (max-width: 600px) {
.card-control-section.basic_card_layout .col-xs-6.col-sm-6.col-lg-6.col-md-6 {
width: 100%;
}

.achievements-content
.card-control-section.basic_card_layout
.col-xs-6.col-sm-6.col-lg-6.col-md-6 {
width: 100%;
}

.card-control-section.basic_card_layout .card-layout {
max-width: 600px;
}
}

/* Horizontal Card Layout Customization */

.card-control-section.horizontal_card_layout
Expand Down
Loading