Skip to content

Commit 580f04c

Browse files
committed
fix: conficts
1 parent 93eb043 commit 580f04c

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

src/components/BMDashboard/Issues/issueChart.module.css

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,15 @@
243243
}
244244

245245
/* Labels */
246-
.dateLabel {
246+
.dateLabelLight {
247247
font-size: 14px;
248248
font-weight: 500;
249249
color: #333;
250250
}
251251

252-
.dark .dateLabel {
252+
.dateLabelDark {
253+
font-size: 14px;
254+
font-weight: 500;
253255
color: #cfd7e3;
254256
}
255257

@@ -278,6 +280,12 @@
278280
width: 100%;
279281
}
280282

283+
:global(.react-datepicker__close-icon::after) {
284+
background: none;
285+
color: #b9b9b9;
286+
font-size: 18px;
287+
}
288+
281289
/* DARK MODE CONTROL */
282290
.controlDark {
283291
background: #22272e !important;
@@ -360,6 +368,13 @@
360368
font-size: 16px;
361369
}
362370

371+
.rowLabel {
372+
margin: 8px 0 8px;
373+
font-weight: 600;
374+
font-size: 16px;
375+
}
376+
377+
363378
/* Responsive */
364379
@media (max-width: 650px) {
365380
.dateRow {

src/components/BMDashboard/Issues/openIssueCharts.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,18 @@ function IssueCharts() {
128128
Date Range
129129
</label>
130130
<div className={styles.filterCenterWrapper}>
131+
{/* Label: Date */}
132+
<div className={styles.rowLabel}>Date</div>
133+
131134
{/* Row 1: Date picker */}
132135
<div className={styles.dateRow}>
133-
<span className={styles.dateLabel}>From</span>
136+
<span className={darkMode ? styles.dateLabelDark : styles.dateLabelLight}>From</span>
134137
<div className={styles.dateField}>
135138
<DatePicker
136139
selected={startDate}
137140
onChange={date => setStartDate(date)}
138141
placeholderText="Start Date"
142+
isClearable
139143
className={darkMode ? styles.dateDark : styles.dateLight}
140144
/>
141145
</div>
@@ -145,6 +149,7 @@ function IssueCharts() {
145149
selected={endDate}
146150
onChange={date => setEndDate(date)}
147151
placeholderText="End Date"
152+
isClearable
148153
className={darkMode ? styles.dateDark : styles.dateLight}
149154
/>
150155
</div>

0 commit comments

Comments
 (0)