diff --git a/src/pages/base/containers/AdminOverview/components/ResourceOverview.jsx b/src/pages/base/containers/AdminOverview/components/ResourceOverview.jsx index 6bbbc50e..88ff583e 100644 --- a/src/pages/base/containers/AdminOverview/components/ResourceOverview.jsx +++ b/src/pages/base/containers/AdminOverview/components/ResourceOverview.jsx @@ -14,7 +14,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { Badge, Row, Col, Card, Descriptions } from 'antd'; +import { Badge, Row, Col, Card } from 'antd'; import { inject, observer } from 'mobx-react'; import adminInstance from 'asset/image/admin-instance.svg'; import adminVolume from 'asset/image/admin-volume.svg'; @@ -119,10 +119,11 @@ export class virtualResourceInfo extends Component { renderCard() { const { virtualResource } = this.props.store; + const span = this.card.length === 1 ? 24 : 12; return ( - + {this.card.map((item) => ( - + @@ -194,12 +195,7 @@ export class virtualResourceInfo extends Component { title={t('Virtual Resource Overview')} bordered={false} > - -
- {this.renderCard()} - {/* {this.renderSmallCard()} */} -
-
+
{this.renderCard()}
); } diff --git a/src/pages/base/containers/AdminOverview/style.less b/src/pages/base/containers/AdminOverview/style.less index 9efb29dd..5c26ae44 100644 --- a/src/pages/base/containers/AdminOverview/style.less +++ b/src/pages/base/containers/AdminOverview/style.less @@ -45,7 +45,6 @@ .resource-overview { .card { height: 100%; - margin-right: 20px; .label { display: block; diff --git a/src/pages/base/containers/Overview/index.jsx b/src/pages/base/containers/Overview/index.jsx index 47548cb4..2d6b0e9c 100644 --- a/src/pages/base/containers/Overview/index.jsx +++ b/src/pages/base/containers/Overview/index.jsx @@ -60,8 +60,15 @@ export class Overview extends Component { return actions; } + get span() { + if (!globalRootStore.checkEndpoint('cinder')) { + return 8; + } + return 6; + } + renderAction = (item) => ( - + avatar @@ -73,7 +80,7 @@ export class Overview extends Component { renderActions() { return this.filterActions.map((item) => ( - + {this.renderAction(item)} )); @@ -96,8 +103,8 @@ export class Overview extends Component {
{this.renderActions()} diff --git a/src/pages/base/containers/Overview/style.less b/src/pages/base/containers/Overview/style.less index 94ebfe34..0fc09ec9 100644 --- a/src/pages/base/containers/Overview/style.less +++ b/src/pages/base/containers/Overview/style.less @@ -1,4 +1,5 @@ @import '~antd/lib/style/themes/default.less'; +@import '~styles/variables'; .container { height: 100%; @@ -16,8 +17,8 @@ font-size: 18px; line-height: 88px; background: #fff; - border-radius: 9px; - box-shadow: 0 0 4px 1px rgba(175, 175, 175, 50%); + border-radius: @border-radius; + box-shadow: 0 2px 20px 0 rgba(0, 0, 0, 9%); opacity: 0.9; } @@ -109,6 +110,8 @@ } .bottom { + border-radius: @border-radius; + :global { .ant-card { box-shadow: unset;