Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add padding #159

Merged
merged 1 commit into from
Nov 2, 2022
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 src/components/DashboardCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class DashboardCard extends React.PureComponent<IProps> {
{onConfigPanel && (
<Icon
className="icon-setup blue"
icon="#iconSetup"
icon="#iconSet_up"
onClick={onConfigPanel}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/MachineDashboard/Detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function Detail(props: IProps) {
className="btn-icon-with-desc blue base-line"
onClick={handleBaseLineEdit(metricChart)}
>
<Icon icon="#iconSetup" />
<Icon icon="#iconSet_up" />
<span>{intl.get('common.baseLine')}</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/MetricDetail/index.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
flex-direction: row;
flex-wrap: wrap;
width: 100%;

:global {
.chart-item {
height: calc(100vh - 290px);
Expand All @@ -31,6 +30,7 @@
align-items: center;
justify-content: center;
background: #fff;
padding: 0 40px;
margin-right: 15px;
position: sticky;
top: -15px;
Expand Down
5 changes: 2 additions & 3 deletions src/pages/MetricDetail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useParams } from 'react-router-dom';
import { calcTimeRange, getBaseLineByUnit, getDataByType, getDiskData, getMetricsUniqName, getProperTickInterval } from '@/utils/dashboard';
import { MetricScene, ServiceName } from '@/utils/interface';
import { SUPPORT_METRICS } from '@/utils/promQL';
import { Chart } from '@antv/g2';
import { shouldCheckCluster } from '@/utils';
import { Popover, Spin } from 'antd';
import Icon from '@/components/Icon';
Expand Down Expand Up @@ -335,7 +334,7 @@ function MetricDetail(props: Props) {
</div>
<div className={styles.chartContent}>
<LineChart
options={{ padding: [10, 70, 70, 70] }}
// options={{ padding: [10, 70, 70, 70] }}
ref={ref => metricChart.chartRef = ref}
renderChart={renderChart}
/>
Expand All @@ -345,7 +344,7 @@ function MetricDetail(props: Props) {
className="btn-icon-with-desc blue base-line"
onClick={handleBaseLineEdit}
>
<Icon icon="#iconSetup" />
<Icon icon="#iconSet_up" />
<span>{intl.get('common.baseLine')}</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ServiceDashboard/Detail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function ServiceDetail(props: IProps) {
className="btn-icon-with-desc blue base-line"
onClick={handleBaseLineEdit(metricChart)}
>
<Icon icon="#iconSetup" />
<Icon icon="#iconSet_up" />
<span>{intl.get('common.baseLine')}</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function CustomServiceQueryPanel(props: IProps) {
})}
onClick={onConfigPanel}
>
<Icon icon="#iconSetup" />
<Icon icon="#iconSet_up" />
<span>{intl.get('common.set')}</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/static/iconfont/iconfont.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/iconfont/iconfont.js

Large diffs are not rendered by default.