Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f819bd0
Frontend: Changed label to 'Team Leader Name' and converted DisplayBo…
Neeraj-Kondaveeti Oct 28, 2025
9040835
Fix:yarn.lock after rebase to satisfy frozen-lockfile
Neeraj-Kondaveeti Feb 13, 2026
8a9925b
Resolve: yarn file conflict
Neeraj-Kondaveeti Feb 15, 2026
f45f80e
Venkataramanan fix: summary background in dashboard
Feb 17, 2026
08e6ed0
Merge pull request #4852 from OneCommunityGlobal/venkataramanan_fix_s…
one-community Feb 17, 2026
dd21df3
Venkataramanan fix: ready for review button modal behaviour
Feb 17, 2026
65fb7f4
Merge pull request #4853 from OneCommunityGlobal/venkataramanan_fix_r…
one-community Feb 17, 2026
d3f1e86
Venkataramanan fix: initial goal time formatting
Feb 17, 2026
1eadef2
Venkataramanan: remove grey shadow from initial goal
Feb 18, 2026
635f405
Merge pull request #4854 from OneCommunityGlobal/venkataramanan_fix_i…
one-community Feb 18, 2026
dab5781
Merge pull request #4286 from OneCommunityGlobal/Neeraj_Frontend_Team…
one-community Feb 18, 2026
2d06a08
Venkataramanan fix: User management page link button styles
Feb 18, 2026
8e67ec3
Fix: import module.css
Feb 18, 2026
83459ef
Merge pull request #4860 from OneCommunityGlobal/venkataramanan_fix_u…
one-community Feb 18, 2026
403671e
Venkataramanan: fix remove global css from user management
Feb 18, 2026
0ec3f34
Venkataramanan fix: user management formatting issues
Feb 18, 2026
48fe022
Venkataramanan fix: user management header icon gap
Feb 18, 2026
eaef703
Merge pull request #4861 from OneCommunityGlobal/venkataramanan_remov…
one-community Feb 19, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
background-color: #1b2a41;
}

.riGraphs {
display: flex;
justify-content: space-around;
}
/* Headings */
.reviewsInsightContainer h1 {
color: #000000;
Expand Down
2 changes: 1 addition & 1 deletion src/components/PRPromotions/DisplayBox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function DisplayBox({ onClose }) {
</th>
<th>PR Reviewer</th>
<th>Team Code</th>
<th>Team Reviewer Name</th>
<th>Team Leader Name</th>
<th>Weekly PR Counts</th>
</tr>
</thead>
Expand Down
34 changes: 7 additions & 27 deletions src/components/PRPromotions/DisplayBox.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,30 +94,10 @@
font-weight: bold;
}

.color-0 {
background-color: #9400d3;
}

.color-1 {
background-color: #4b0082;
}

.color-2 {
background-color: #0000ff;
}

.color-3 {
background-color: #00ff00;
}

.color-4 {
background-color: #ffff00;
}

.color-5 {
background-color: #ff7f00;
}

.color-6 {
background-color: #ff0000;
}
.color-0 { background-color: #9400d3; }
.color-1 { background-color: #4b0082; }
.color-2 { background-color: #0000ff; }
.color-3 { background-color: #00ff00; }
.color-4 { background-color: #ffff00; }
.color-5 { background-color: #ff7f00; }
.color-6 { background-color: #ff0000; }
32 changes: 24 additions & 8 deletions src/components/SummaryBar/SummaryBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -416,26 +416,31 @@ const SummaryBar = React.forwardRef((props, ref) => {
};

const renderSummary = () => {
// NOT SUBMITTED
if (!weeklySummary) {
// Weekly Summary Not Required
if (weeklySummaryNotReq) {
return (
<div
className={`${styles['border-black']} col-4 bg-super-awesome no-gutters d-flex justify-content-center align-items-center`}
className={`${styles['border-black']} col-4 ${styles['bg--summary-purple']} no-gutters d-flex justify-content-center align-items-center`}
style={{ textAlign: 'center' }}
>
<font className={`${styles['text-center']} text-light`} size="3">
<font className="text-light" size="3">
SUMMARY
</font>
</div>
);
}

// Summary Required but Not Submitted (!)
return (
<div
className={`border border-danger col-4 no-gutters ${
darkMode ? 'bg-yinmn-blue' : 'bg-white'
className={`border border-danger col-4 no-gutters d-flex flex-column justify-content-center ${
darkMode ? 'bg-yinmn-blue' : styles['bg--summary-purple']
}`}
>
<div className="py-1"> </div>

{isAuthUser || canEditData() ? (
<div className="d-flex justify-content-center">
<button
Expand All @@ -455,30 +460,41 @@ const SummaryBar = React.forwardRef((props, ref) => {
!
</p>
)}
<font className={`${styles['text-center']}`} size="3">

<font className={`${styles['text-center']} text-light`} size="3">
SUMMARY
</font>

<div className="py-2"> </div>
</div>
);
}

// SUBMITTED (✓)
return (
<div className={`${styles['border-green']} col-4 ${styles['bg--dark-green']}`}>
<div
className={`${styles['border-green']} col-4 ${
darkMode ? 'bg-yinmn-blue' : styles['bg--summary-purple']
}`}
>
<div className="py-1"> </div>

<div className="d-flex justify-content-center">
<button
onClick={props.toggleSubmitForm}
className={`${styles['text-center']} ${styles.large_text_summary} ${styles['summary-toggle']}`}
className={`${styles['text-center']} ${styles.large_text_summary} ${styles['summary-toggle']} text-light`}
style={{ background: 'none', border: 'none', padding: 0, cursor: 'pointer' }}
aria-label="Toggle submit form"
type="button"
>
</button>
</div>
<font className={`${styles['text-center']}`} size="3">

<font className={`${styles['text-center']} text-light`} size="3">
SUMMARY
</font>

<div className="py-2"> </div>
</div>
);
Expand Down
4 changes: 4 additions & 0 deletions src/components/SummaryBar/SummaryBar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@
}
}

.bg--summary-purple {
background-color: #5b2aa6;
}

.text-center {
display: flex;
justify-content: center;
Expand Down
8 changes: 6 additions & 2 deletions src/components/TeamMemberTasks/ReviewButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,9 @@ function ReviewButton({ user, task, updateTask }) {
</DropdownToggle>

<DropdownMenu
className={`${style['review-button-dropdown']} ${darkMode ? 'bg-space-cadet' : ''}`}
container="body"
strategy="fixed"
className={style['review-button-dropdown']}
>
{task.relatedWorkLinks &&
// eslint-disable-next-line no-shadow
Expand Down Expand Up @@ -532,7 +534,9 @@ function ReviewButton({ user, task, updateTask }) {
Ready for Review
</DropdownToggle>
<DropdownMenu
className={`${style['review-button-dropdown']} ${darkMode ? 'bg-space-cadet' : ''}`}
container="body"
strategy="fixed"
className={style['review-button-dropdown']}
>
{task.relatedWorkLinks &&
task.relatedWorkLinks.map(dropLink => (
Expand Down
7 changes: 3 additions & 4 deletions src/components/TeamMemberTasks/reviewButton.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
}

.review-button-dropdown {
overflow-y: auto; /* enable scrolling if the dropdown is too long*/
z-index: 1000;
position:fixed !important;
margin-top: -50px;
max-height: 240px;
overflow-y: auto;
z-index: 9999;
}

.reviewBtn-dropdown-wrapper{
Expand Down
2 changes: 1 addition & 1 deletion src/components/Timer/Countdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ export default function Countdown({
/>
)}
</div>
:
<span className={css.timeColon}>:</span>
<div className={css.numberWrapper}>
{editing && (
<FaAngleUp
Expand Down
56 changes: 42 additions & 14 deletions src/components/Timer/Countdown.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -146,37 +146,65 @@
position: relative;
display: flex;
align-items: center;
justify-content: flex-start;
width: 4.5rem;
max-height: 2.5rem;
justify-content: center;
width: fit-content;
max-height: none;

gap: 0.5rem;

background-color: transparent;
color: white;
background-color: rgba(82, 92, 102, 1);
border-radius: 0.5rem;

user-select: none;
transition: all 0.2s ease;
}

.bottom .goalEditing {
width: 4.5rem;
max-height: 3rem;
max-height: none;
}

.bottom .goal input {
position: relative;
z-index: 1;

width: 100%;
height: 100%;

margin: 0;
padding: 0;
border: none;
background-color: transparent;
height: 3rem;
width: 2rem;
color: white;
outline: none;
padding: 0;
border-radius: 0.5rem;
box-sizing: border-box;

background-color: #ffffff !important;
color: #111111 !important;
opacity: 1 !important;

text-align: center;
font-size: 2rem;
line-height: 1;
}

.bottom .timeColon {
display: flex;
align-items: center;
height: 3.25rem;
font-size: 2rem;
font-weight: bolder;
line-height: 1;
color: white;
}

.goal .numberWrapper {
position: relative;
line-height: 1rem;
width: 3.25rem;
height: 3.25rem;
display: flex;
align-items: center;
justify-content: center;
}


.up {
position: absolute;
top: 0.2rem;
Expand Down
3 changes: 2 additions & 1 deletion src/components/UserManagement/ResetPasswordButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { boxStyle } from '../../styles';
import { resetPassword } from '../../services/userProfileService';
import { cantUpdateDevAdminDetails } from '../../utils/permissions';
import ResetPasswordPopup from './ResetPasswordPopup';
import styles from './usermanagement.module.css'

class ResetPasswordButton extends React.PureComponent {
constructor(props) {
Expand Down Expand Up @@ -83,7 +84,7 @@ class ResetPasswordButton extends React.PureComponent {
<Button
outline={!this.props.darkMode}
color="primary"
className={`btn btn-outline-success mr-1${this.props.isSmallButton ? ' btn-sm' : ''}`}
className={`${styles.userManagementCellControl} btn btn-outline-success mr-1${this.props.isSmallButton ? ' btn-sm' : ''}`}
style={
this.props.darkMode
? { boxShadow: '0 0 0 0', minWidth: '115px', fontWeight: 'bold', backgroundColor: '#3a506b' }
Expand Down
3 changes: 2 additions & 1 deletion src/components/UserManagement/SetUpFinalDayButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { boxStyle } from '../../styles';
import SetUpFinalDayPopUp from './SetUpFinalDayPopUp';
import { SET_FINAL_DAY, CANCEL } from '../../languages/en/ui';
import { scheduleDeactivationAction, activateUserAction } from '../../actions/userLifecycleActions';
import styles from './usermanagement.module.css';

function SetUpFinalDayButton(props) {
const { darkMode, userProfile, loadUserProfile, hasFinalDay } = props;
Expand Down Expand Up @@ -42,7 +43,7 @@ function SetUpFinalDayButton(props) {
/>
<button
type="button"
className={`btn btn-outline-${hasFinalDay ? 'warning' : 'success'} btn-sm`}
className={`${styles.userManagementCellControl} btn btn-outline-${hasFinalDay ? 'warning' : 'success'} btn-sm`}
onClick={handleButtonClick}
style={{
...darkMode ? { boxShadow: '0 0 0 0', fontWeight: 'bold' } : boxStyle,
Expand Down
3 changes: 1 addition & 2 deletions src/components/UserManagement/UserManagement.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,7 @@ class UserManagement extends React.PureComponent {
handleSetupHistoryPopup={this.handleSetupHistoryPopup}
darkMode={darkMode}
/>

<div className="table-responsive" id="user-management-table">
<div className={`table-responsive ${styles.userManagementTable}`}>
<Table
className={`table table-bordered ${styles.noWrap} ${
darkMode ? 'text-light bg-yinmn-blue' : ''
Expand Down
3 changes: 2 additions & 1 deletion src/components/UserManagement/UserSearchPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Tooltip, OverlayTrigger } from 'react-bootstrap';
import { boxStyle, boxStyleDark } from '../../styles';
import hasPermission from '../../utils/permissions';
import { SEARCH, SHOW, CREATE_NEW_USER, SEND_SETUP_LINK } from '../../languages/en/ui';
import styles from './usermanagement.module.css';

const setupHistoryTooltip = <Tooltip id="tooltip">Setup History Modal</Tooltip>;

Expand All @@ -29,7 +30,7 @@ function UserSearchPanel({
const [tooltipCreateNewUserOpen, setTooltipCreateNewUserOpen] = useState(false);
const toggleCreateNewUserTooltip = () => setTooltipCreateNewUserOpen(!tooltipCreateNewUserOpen);
return (
<div className="input-group mt-3" id="new_usermanagement">
<div className={`input-group mt-3 ${styles.new_user_management}`}>
<button
type="button"
disabled={!canCreateUsers}
Expand Down
Loading