Skip to content

Commit f258491

Browse files
authored
Merge pull request #889 from pyrra-dev/ui-scale
ui: Improve the scale buttons on the detail page
2 parents 71ea46c + f0bb091 commit f258491

File tree

2 files changed

+53
-28
lines changed

2 files changed

+53
-28
lines changed

Diff for: ui/src/pages/Detail.scss

+16-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,21 @@
1616
display: flex;
1717
margin: 0 auto;
1818
background-color: $body-bg;
19+
row-gap: 20px;
1920
column-gap: 20px;
21+
flex-direction: column;
22+
23+
.time {
24+
display: flex;
25+
column-gap: 20px;
26+
justify-content: center;
27+
}
28+
29+
.scale {
30+
svg {
31+
margin-right: 8px;
32+
}
33+
}
2034

2135
@media (min-width: 576px) {
2236
width: 66%;
@@ -25,7 +39,8 @@
2539
width: 50%;
2640
}
2741
@media (min-width: 1440px) {
28-
width: 33%;
42+
justify-content: center;
43+
flex-direction: row;
2944
}
3045
}
3146
}

Diff for: ui/src/pages/Detail.tsx

+37-27
Original file line numberDiff line numberDiff line change
@@ -287,35 +287,41 @@ const Detail = () => {
287287
<Row>
288288
<Col className="text-center timerange">
289289
<div className="inner">
290-
<ButtonGroup aria-label="Time Range">
291-
{timeRanges.map((t: number) => (
292-
<Button
293-
key={t}
294-
variant="light"
295-
onClick={handleTimeRangeClick(t)}
296-
active={to - from === t}>
297-
{formatDuration(t)}
298-
</Button>
299-
))}
300-
</ButtonGroup>
301-
<OverlayTrigger
302-
key="auto-reload"
303-
overlay={
304-
<OverlayTooltip id={`tooltip-auto-reload`}>Automatically reload</OverlayTooltip>
305-
}>
306-
<span>
307-
<Toggle
308-
checked={autoReload}
309-
onChange={() => setAutoReload(!autoReload)}
310-
onText={formatDuration(interval)}
311-
/>
312-
</span>
313-
</OverlayTrigger>
314-
<ButtonGroup aria-label="Time Range">
290+
<div className="time">
291+
<ButtonGroup aria-label="Time Range">
292+
{timeRanges.map((t: number) => (
293+
<Button
294+
key={t}
295+
variant="light"
296+
onClick={handleTimeRangeClick(t)}
297+
active={to - from === t}>
298+
{formatDuration(t)}
299+
</Button>
300+
))}
301+
</ButtonGroup>
302+
<OverlayTrigger
303+
key="auto-reload"
304+
overlay={
305+
<OverlayTooltip id={`tooltip-auto-reload`}>
306+
Automatically reload
307+
</OverlayTooltip>
308+
}>
309+
<span>
310+
<Toggle
311+
checked={autoReload}
312+
onChange={() => setAutoReload(!autoReload)}
313+
onText={formatDuration(interval)}
314+
/>
315+
</span>
316+
</OverlayTrigger>
317+
</div>
318+
<ButtonGroup aria-label="Charts" className="scale">
315319
<OverlayTrigger
316320
key="auto-reload"
317321
overlay={
318-
<OverlayTooltip id={`tooltip-auto-reload`}>Absolute Chart</OverlayTooltip>
322+
<OverlayTooltip id={`tooltip-auto-reload`}>
323+
Absolute scale gives a good impression of the big picture.
324+
</OverlayTooltip>
319325
}>
320326
<Button
321327
variant="light"
@@ -324,12 +330,15 @@ const Detail = () => {
324330
}}
325331
active={absolute}>
326332
<IconChartArea width={16} height={16} fill={absolute ? 'white' : 'black'} />
333+
Absolute
327334
</Button>
328335
</OverlayTrigger>
329336
<OverlayTrigger
330337
key="auto-reload"
331338
overlay={
332-
<OverlayTooltip id={`tooltip-auto-reload`}>Relative Chart</OverlayTooltip>
339+
<OverlayTooltip id={`tooltip-auto-reload`}>
340+
Relative scale gives a good impression of every detail.
341+
</OverlayTooltip>
333342
}>
334343
<Button
335344
variant="light"
@@ -338,6 +347,7 @@ const Detail = () => {
338347
}}
339348
active={!absolute}>
340349
<IconChartLine width={16} height={16} fill={!absolute ? 'white' : 'black'} />
350+
Relative
341351
</Button>
342352
</OverlayTrigger>
343353
</ButtonGroup>

0 commit comments

Comments
 (0)