Skip to content
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 deploy/docker-swarm/docker-compose.ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ services:
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
signoz:
!!merge <<: *db-depend
image: signoz/signoz:v0.126.0
image: signoz/signoz:v0.126.1
ports:
- "8080:8080" # signoz port
# - "6060:6060" # pprof port
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker-swarm/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ services:
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
signoz:
!!merge <<: *db-depend
image: signoz/signoz:v0.126.0
image: signoz/signoz:v0.126.1
ports:
- "8080:8080" # signoz port
volumes:
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/docker-compose.ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ services:
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
signoz:
!!merge <<: *db-depend
image: signoz/signoz:${VERSION:-v0.126.0}
image: signoz/signoz:${VERSION:-v0.126.1}
container_name: signoz
ports:
- "8080:8080" # signoz port
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ services:
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
signoz:
!!merge <<: *db-depend
image: signoz/signoz:${VERSION:-v0.126.0}
image: signoz/signoz:${VERSION:-v0.126.1}
container_name: signoz
ports:
- "8080:8080" # signoz port
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
}

.divider {
border-color: var(--l1-border);
margin: 16px 0;
margin-top: 10px;
--divider-color: var(--l1-border);
--divider-margin: 10px 0 16px 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
}
}
}

&__divider {
--divider-vertical-margin: 0;
}
}

.hide-update {
Expand Down Expand Up @@ -55,12 +59,6 @@
.hidden {
display: none;
}

.ant-divider {
margin: 0;
height: 28px;
border: 1px solid var(--l1-border);
}
}

.explorer-options {
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/container/ExplorerOptions/ExplorerOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,9 @@ function ExplorerOptions({
<>
<Divider
type="vertical"
className={isEditDeleteSupported ? '' : 'hidden'}
className={cx('explorer-options-container__divider', {
hidden: !isEditDeleteSupported,
})}
/>
<Tooltip title="Update this view" placement="top">
<Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,8 @@
margin-bottom: 24px;
width: 100%;

.ant-divider::before,
.ant-divider::after {
border-bottom: 2px dotted var(--l1-border);
border-top: 2px dotted var(--l1-border);
height: 8px;
&__divider {
--divider-border-width: 1px;
}

.ant-typography {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export function AlertsEmptyState(): JSX.Element {
</div>
</section>
<div className="get-started-text">
<Divider>
<Divider className="get-started-text__divider">
<Typography.Text className="get-started-text">
Or get started with these sample alerts
</Typography.Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
letter-spacing: 0.5px;
}

.ant-divider {
margin: 8px 0 !important;
border: 0.5px solid var(--l1-border);
&__divider {
--divider-color: var(--l1-border);
--divider-margin: 8px 0;
}

.explorer-columns-contents {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ function ExplorerColumnsRenderer({
</Tooltip>
)}
</div>
<Divider />
<Divider className="explorer-columns-renderer__divider" />
{!isError && (
<div className="explorer-columns-contents">
<DragDropContext onDragEnd={onDragEnd}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
}
}

.ant-modal-body {
.ant-divider {
margin: 16px 0;
border: 0.5px solid var(--l1-border);
}
}
.downtime-schedule-btn {
display: flex;
}
Expand Down
7 changes: 0 additions & 7 deletions frontend/src/container/RoutingPolicies/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,6 @@
line-height: 20px;
}
}

.ant-modal-body {
.ant-divider {
margin: 16px 0;
border: 0.5px solid var(--l1-border);
}
}
}

.create-policy-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
}
}

.ant-divider {
margin-inline-start: 10px !important;
margin-inline-end: 16px !important;
height: 16px;
border-color: var(--l1-border);
&__divider {
--divider-vertical-margin: 10px;
}
.ant-drawer-close {
margin: 0 !important;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useMemo, useState } from 'react';
import { Color, Spacing } from '@signozhq/design-tokens';
import { Color } from '@signozhq/design-tokens';
import { Button, Drawer } from 'antd';
import { Divider } from '@signozhq/ui/divider';
import { Typography } from '@signozhq/ui/typography';
Expand Down Expand Up @@ -179,7 +179,10 @@ function SpanRelatedSignals({
width="50%"
title={
<>
<Divider type="vertical" />
<Divider
type="vertical"
className="span-related-signals-drawer__divider"
/>
<Typography.Text className="title">
Related Signals - {selectedSpan.name}
</Typography.Text>
Expand All @@ -194,7 +197,7 @@ function SpanRelatedSignals({
}}
className="span-related-signals-drawer"
destroyOnClose
closeIcon={<X size={16} style={{ marginTop: Spacing.MARGIN_1 }} />}
closeIcon={<X size={16} />}
>
{selectedSpan && (
<div className="span-related-signals-drawer__content">
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/AlertDetails/AlertDetails.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
}

.alert-details {
.divider {
border-color: var(--l1-border);
margin: 16px 0;
&__divider {
--divider-color: var(--l1-border);
--divider-margin: 16px 0;
}
.breadcrumb-divider {
margin-top: 10px;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/AlertDetails/AlertDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function AlertDetails(): JSX.Element {
/>

{alertRuleDetails && <AlertHeader alertDetails={alertRuleDetails} />}
<Divider className="divider" />
<Divider className="alert-details__divider" />
<div className="tabs-and-filters">
<RouteTab
routes={routes}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
align-items: center;
gap: 12px;
color: var(--l1-border);
.ant-divider-vertical {
height: 16px;
border-color: var(--l1-border);
margin: 0;
&__divider {
--divider-color: var(--l1-border);
--divider-vertical-margin: 0;
}
.dropdown-trigger-wrapper {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function AlertActionButtons({
</Tooltip>
<CopyToClipboard textToCopy={window.location.href} />

<Divider type="vertical" />
<Divider type="vertical" className="alert-action-buttons__divider" />

<DropdownMenuSimple menu={{ items: menuItems }}>
<span className="dropdown-trigger-wrapper">
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/pages/TracesExplorer/Filter/Filter.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
}
}

.divider {
background-color: var(--l1-border);
margin: 0;
border-color: var(--l1-border);
.section-body__divider {
--divider-color: var(--l1-border);
--divider-margin: 0;
}

.filter-header {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/TracesExplorer/Filter/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function Section(props: SectionProps): JSX.Element {

return (
<div>
<Divider plain className="divider" />
<Divider plain className="section-body__divider" />
<div className="section-body-header" data-testid={`collapse-${panelName}`}>
<Collapse
bordered={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
align-items: center;
}
gap: 12px;
.ant-divider-vertical {
margin: 0;
}
.funnel-configuration__rename-btn {
padding: 4px;
width: 24px;
Expand Down Expand Up @@ -74,4 +71,7 @@
gap: 12px;
padding: 16px;
}
&__divider {
--divider-margin: 0px;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function FunnelConfiguration({
/>
</Tooltip>
<CopyToClipboard textToCopy={window.location.href} />
<Divider type="vertical" />
<Divider type="vertical" className="funnel-configuration__divider" />
<FunnelItemPopover
isPopoverOpen={isPopoverOpen}
setIsPopoverOpen={setIsPopoverOpen}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@
display: flex;
align-items: center;
}
.ant-divider-vertical {
margin: 0 12px;
}
.funnel-item__action-btn {
border: none;
padding: 4px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
}
&__divider {
width: 100%;
.ant-divider {
margin: 0;
border-color: var(--l1-border);
}
--divider-margin: 0;
}
&__latency-options {
flex-shrink: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
flex-shrink: 0;
}

&__divider {
width: 100%;
.ant-divider {
margin: 0;
border-color: var(--l1-border);
}
}

&__time-range {
width: 100%;
height: 32px;
Expand Down
Loading