Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit 70a4cce

Browse files
Merge pull request #333 from cjdev/CJPM-17455
DataTable, TopNav, and Modal CSS changes
2 parents efe3ca3 + 29f753a commit 70a4cce

16 files changed

Lines changed: 416 additions & 331 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ For components from visual-stack that require state management, this library pro
2626
This is a microsite providing documentation and live examples of components. This package depends on the other two.
2727

2828
### Running locally
29+
Install lerna: `npm install -g lerna`
30+
31+
Make sure you are using node 14 or below (`npm install -g n` can be helpful here)
2932

3033
From a fresh clone of the repo, start by bootstrapping the project from the root with `npm run bootstrap`. This will install all external dependencies, create links between local dependent packages and build all three packages.
3134

packages/visual-stack/src/components/BlankSlate/index.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { Button } from '../Button';
44
import './BlankSlate.css';
5-
import IconExample from 'mdi-react/BlurIcon';
6-
import { Panel } from '../../../lib/components/Panel';
75

86
export const BlankSlate = ({
97
children,
108
alignment = '',
119
title = 'You do not have any content.',
12-
headerGraphic = <IconExample />,
10+
headerGraphic = '',
1311
className = '',
1412
...restProps
1513
}) => {
1614
return (
17-
<Panel>
18-
<div
19-
{...restProps}
20-
className={`vs-bs-container ${alignment === 'left-side' &&
21-
'vs-bs-leftalign'} ${className}`}
22-
>
23-
<div className="vs-bs-img">{headerGraphic}</div>
24-
<div className="vs-bs-content">
25-
<h1 className="vs-bs-title">{title}</h1>
26-
{children}
27-
</div>
15+
<div
16+
{...restProps}
17+
className={`vs-bs-container ${alignment === 'left-side' &&
18+
'vs-bs-leftalign'} ${className}`}
19+
>
20+
<div className="vs-bs-img">{headerGraphic}</div>
21+
<div className="vs-bs-content">
22+
<h1 className="vs-bs-title">{title}</h1>
23+
{children}
2824
</div>
29-
</Panel>
25+
</div>
3026
);
3127
};
3228

packages/visual-stack/src/components/Form/Form.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ fieldset.group ul.checkbox li.focus {
147147
margin-top: -4px;
148148
}
149149

150-
.vs-field {
151-
margin-bottom: 24px;
152-
}
153-
154150
.vs-field-optional {
155151
color: #777;
156152
font-size: 1.3rem;

packages/visual-stack/src/components/Modal.css

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
.modal-content {
4545
position: relative;
46+
top: 80px;
4647
background-color: #fff;
4748
-webkit-background-clip: padding-box;
4849
background-clip: padding-box;
@@ -79,7 +80,14 @@
7980

8081
.modal-header {
8182
padding: 15px;
82-
border-bottom: 1px solid #e5e5e5;
83+
padding-left: 25px;
84+
padding-right: 25px;
85+
}
86+
87+
.modal-header-grid {
88+
display: grid;
89+
grid-template-columns: 1fr 36px;
90+
align-items: center;
8391
}
8492

8593
.modal-header h1 {
@@ -99,12 +107,13 @@
99107
.modal-body {
100108
position: relative;
101109
padding: 15px;
110+
padding-left: 25px;
111+
padding-right: 25px;
102112
}
103113

104114
.modal-footer {
105115
padding: 15px;
106116
text-align: right;
107-
border-top: 1px solid #e5e5e5;
108117
}
109118

110119
.modal-footer .btn + .btn {
@@ -153,6 +162,9 @@
153162
.modal-sm {
154163
width: 300px;
155164
}
165+
.modal-md {
166+
width: 400px;
167+
}
156168
}
157169
@media (min-width: 992px) {
158170
.modal-lg {

packages/visual-stack/src/components/Table/DataTable/DataTable.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
min-height: 32px;
2929
padding: 4px 8px;
3030
vertical-align: bottom;
31+
border-bottom: 2px solid #d8dcdf;
32+
color: #757575;
3133
}
3234

3335
.vs-data-table-container .vs-tbody .vs-cell {

0 commit comments

Comments
 (0)