Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
more updates
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewcarleton committed Apr 14, 2019
2 parents c9b8232 + ff3d7b9 commit c06e87a
Show file tree
Hide file tree
Showing 30 changed files with 129 additions and 120 deletions.
9 changes: 6 additions & 3 deletions sass/components/ClusterOverview/health.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
/* stylelint-disable plugin/selector-bem-pattern */
.kubevirt-cluster-overview__health-grid {
display: flex;
margin-bottom: 1rem;

> * {
flex:1;
flex: 1;
}
}

.kubevirt-health__body, .kubevirt-compliance__body {
.kubevirt-health__body,
.kubevirt-compliance__body {
display: flex;
flex-wrap: wrap;
align-items: center;
}

.kubevirt-health__text {
font-size: 0.875rem;
}

.kubevirt-health__icon--error {
color: #c9190b;

}

.kubevirt-health__icon--ok {
Expand Down
9 changes: 3 additions & 6 deletions sass/components/Dashboard/dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.kubevirt-dashboard__body {
background-color:#ededed;
background-color: #ededed;
padding: 1rem;

.pf-l-grid {
Expand All @@ -11,11 +11,8 @@
}
}

.kubevirt-dashboard__card {

.card-pf-title {
font-size: 1rem;
}
.kubevirt-dashboard__card-title {
font-size: 1rem;
}

.kubevirt-dashboard__card-heading {
Expand Down
2 changes: 1 addition & 1 deletion sass/components/Dashboard/detail.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.kubevirt-detail__item-title {
float: left;
clear: left;
width: 150px;
// width: 150px;
margin-bottom: 5px;
font-size: 14px;
text-transform: capitalize;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ exports[`<Alerts /> renders correctly 1`] = `
<DashboardCardHeader
className={null}
>
<DashboardCardTitle>
<DashboardCardTitle
className={null}
>
Alerts
</DashboardCardTitle>
</DashboardCardHeader>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Capacity /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Capacity
</h2>
Expand Down Expand Up @@ -100,7 +100,7 @@ exports[`<Capacity /> renders correctly in Loading state 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Capacity
</h2>
Expand Down
38 changes: 9 additions & 29 deletions src/components/ClusterOverview/ClusterOverview.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,20 @@ import { AlertsConnected } from './Alerts/Alerts';

const MainCards = () => (
<GridItem lg={6} md={12} sm={12}>
<Grid>
<GridItem span={12}>
<Grid className="kubevirt-cluster-overview__health-grid">
<GridItem span={6}>
<HealthConnected />
</GridItem>
<GridItem span={6}>
<ComplianceConnected />
</GridItem>
<GridItem span={12}>
<AlertsConnected className="kubevirt-cluster-overview__card--top-border" />
</GridItem>
</Grid>
</GridItem>
<GridItem span={12}>
<CapacityConnected />
</GridItem>
<GridItem span={12}>
<UtilizationConnected />
</GridItem>
</Grid>
<div className="kubevirt-cluster-overview__health-grid">
<HealthConnected />
<ComplianceConnected />
<AlertsConnected className="kubevirt-cluster-overview__card--top-border" />
</div>
<CapacityConnected />
<UtilizationConnected />
</GridItem>
);

const LeftCards = () => (
<GridItem key="left" lg={3} md={12} sm={12}>
<Grid>
<GridItem lg={12} md={6} sm={12}>
<DetailsConnected />
</GridItem>
<GridItem lg={12} md={6} sm={12}>
<InventoryConnected />
</GridItem>
</Grid>
<DetailsConnected className="kubevirt-cluster-overview__card--details" />
<InventoryConnected />
</GridItem>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Compliance /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Compliance
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Details /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Details
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Events /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Events
</h2>
Expand All @@ -18,7 +18,7 @@ exports[`<Events /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Health
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Health /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Health
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Inventory /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster inventory
</h2>
Expand All @@ -18,7 +18,7 @@ exports[`<Inventory /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand All @@ -42,7 +42,7 @@ exports[`<Inventory /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down Expand Up @@ -84,7 +84,7 @@ exports[`<Inventory /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand All @@ -111,7 +111,7 @@ exports[`<Inventory /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down Expand Up @@ -151,7 +151,7 @@ exports[`<Inventory /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<TopConsumers /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Top Consumers
</h2>
Expand All @@ -18,7 +18,7 @@ exports[`<TopConsumers /> renders correctly 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`<Utilization /> renders correctly 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Utilization
</h2>
Expand Down Expand Up @@ -119,7 +119,7 @@ exports[`<Utilization /> renders correctly in Loading state 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Utilization
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Details
</h2>
Expand Down Expand Up @@ -83,7 +83,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster inventory
</h2>
Expand All @@ -93,7 +93,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand All @@ -117,7 +117,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down Expand Up @@ -159,7 +159,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand All @@ -186,7 +186,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down Expand Up @@ -226,7 +226,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-check-circle fa-2x kubevirt-inventory__row-status-item-icon--ok"
class="fa fa-check-circle kubevirt-inventory__row-status-item-icon--ok kubevirt-dashboard__icon-sm"
/>
<span
class="kubevirt-inventory__row-status-item-text"
Expand Down Expand Up @@ -257,7 +257,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading kubevirt-events__card-header"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Cluster Events
</h2>
Expand All @@ -267,7 +267,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand Down Expand Up @@ -295,7 +295,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
class="card-pf-heading kubevirt-dashboard__card-heading"
>
<h2
class="card-pf-title"
class="card-pf-title kubevirt-dashboard__card-title"
>
Top Consumers
</h2>
Expand All @@ -305,7 +305,7 @@ exports[`<ClusterOverview /> renders correctly with Provider 1`] = `
>
<span
aria-hidden="true"
class="fa fa-info-circle fa-2x"
class="fa fa-info-circle kubevirt-dashboard__icon-sm"
/>
</button>
</div>
Expand Down
Loading

0 comments on commit c06e87a

Please sign in to comment.