Skip to content

Commit 6f2b333

Browse files
committed
Unify toggle buttons styling across all pages - match Day page design
1 parent 295bf5d commit 6f2b333

5 files changed

Lines changed: 55 additions & 15 deletions

File tree

www/css/datefilter.css

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,45 @@
1010

1111
.filter-buttons {
1212
display: flex;
13-
gap: 10px;
14-
flex-wrap: wrap;
13+
gap: 0;
14+
border-radius: var(--radius-md);
15+
overflow: hidden;
16+
box-shadow: var(--shadow);
17+
background: var(--card-bg);
1518
}
1619

1720
.filter-btn {
1821
background: var(--light-bg);
1922
border: 2px solid var(--border-color);
2023
color: var(--text-primary);
21-
padding: 10px 16px;
22-
border-radius: var(--radius);
24+
padding: 12px 16px;
25+
border-radius: 0;
2326
font-size: 14px;
2427
font-weight: 600;
2528
cursor: pointer;
2629
transition: all var(--transition);
2730
flex: 1;
2831
min-width: 80px;
32+
border-left: none;
33+
border-right: none;
34+
border-top: none;
35+
border-bottom: none;
36+
}
37+
38+
.filter-btn:first-child {
39+
border-radius: var(--radius-md) 0 0 var(--radius-md);
2940
}
3041

31-
.filter-btn:hover {
32-
border-color: var(--primary-color);
42+
.filter-btn:last-child {
43+
border-radius: 0 var(--radius-md) var(--radius-md) 0;
44+
}
45+
46+
.filter-btn:only-child {
47+
border-radius: var(--radius-md);
48+
}
49+
50+
.filter-btn:hover:not(.active) {
51+
background: var(--border-color);
3352
color: var(--primary-color);
3453
}
3554

@@ -56,4 +75,25 @@
5675
transform: scale(0.98);
5776
}
5877

78+
/* Secondary filter style (for period filters inside cards) */
79+
.filter-buttons-secondary {
80+
display: flex;
81+
gap: 8px;
82+
flex-wrap: wrap;
83+
}
84+
85+
.filter-buttons-secondary .filter-btn {
86+
flex: 0 1 auto;
87+
min-width: 60px;
88+
padding: 8px 12px;
89+
font-size: 13px;
90+
border-radius: var(--radius);
91+
border: 1px solid var(--border-color);
92+
}
93+
94+
.filter-buttons-secondary .filter-btn:first-child,
95+
.filter-buttons-secondary .filter-btn:last-child {
96+
border-radius: var(--radius);
97+
}
98+
5999

www/templates/analytics.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
<!-- Date Range Filter -->
1111
<div class="settings-card" style="margin-bottom: 20px;">
12-
<div style="display: flex; gap: 12px; align-items: center; flex-wrap: wrap;">
13-
<label style="font-weight: 500;">Period:</label>
14-
<button class="filter-btn" onclick="window.app.analytics.setPeriod('7days', event)">Last 7 Days</button>
15-
<button class="filter-btn active" onclick="window.app.analytics.setPeriod('30days', event)">Last 30 Days</button>
16-
<button class="filter-btn" onclick="window.app.analytics.setPeriod('90days', event)">Last 90 Days</button>
17-
<button class="filter-btn" onclick="window.app.analytics.setPeriod('all', event)">All Time</button>
12+
<label style="font-weight: 500; display: block; margin-bottom: 12px;">Period:</label>
13+
<div class="filter-buttons">
14+
<button class="filter-btn" onclick="window.app.analytics.setPeriod('7days', event)">7 Days</button>
15+
<button class="filter-btn active" onclick="window.app.analytics.setPeriod('30days', event)">30 Days</button>
16+
<button class="filter-btn" onclick="window.app.analytics.setPeriod('90days', event)">90 Days</button>
17+
<button class="filter-btn" onclick="window.app.analytics.setPeriod('all', event)">All</button>
1818
</div>
1919
</div>
2020

www/templates/due.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="due" class="tab">
22

3-
<div style="display: flex; gap: 12px; margin-bottom: 20px; flex-wrap: wrap;">
3+
<div class="filter-buttons" style="margin-bottom: 20px;">
44
<button class="filter-btn filter-purchase active" onclick="window.app.outstanding.filterDue('purchase', event)">Purchases</button>
55
<button class="filter-btn filter-sale" onclick="window.app.outstanding.filterDue('sale', event)">Sales</button>
66
</div>

www/templates/history.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="history" class="tab">
22

3-
<div style="display: flex; gap: 12px; margin-bottom: 16px; flex-wrap: wrap;">
3+
<div class="filter-buttons" style="margin-bottom: 16px;">
44
<button class="filter-btn filter-purchase active" onclick="window.app.history.filterHistory('purchase', event)">Purchase</button>
55
<button class="filter-btn filter-sale" onclick="window.app.history.filterHistory('sale', event)">Sale</button>
66
</div>

www/templates/reports.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h2 style="margin: 0;">Reports</h2>
88
</div>
99

1010
<div class="date-filter-card">
11-
<div class="date-filter-buttons">
11+
<div class="filter-buttons">
1212
<button class="filter-btn active" onclick="window.app.dateFilter.setFilter('today', event)">Today</button>
1313
<button class="filter-btn" onclick="window.app.dateFilter.setFilter('week', event)">This Week</button>
1414
<button class="filter-btn" onclick="window.app.dateFilter.setFilter('month', event)">This Month</button>

0 commit comments

Comments
 (0)