Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
20c1469
CJPM-17497: Changed Modal and Form styles per UX
joshhidley Mar 24, 2021
5474c90
CJPM-17497: Merge in TopNav changes.
joshhidley Mar 29, 2021
87ce98c
CJPM-17497: Added mid-size modal width class selector.
joshhidley Mar 29, 2021
d52ad48
CJPM-17497: Style changes per UX team.
joshhidley Mar 30, 2021
c0abedd
CJPM-17497: Removed white Panel around Blank Slate and fixed TopNav m…
joshhidley Mar 31, 2021
7510a28
CJPM-17497: added alignment to DataTable Column.
joshhidley Apr 1, 2021
3207a3a
CJPM-17497: Changed Modal and Form styles per UX
joshhidley Mar 24, 2021
b4970a9
CJPM-17497: Added mid-size modal width class selector.
joshhidley Mar 29, 2021
8382320
CJPM-17497: Style changes per UX team.
joshhidley Mar 30, 2021
8475316
CJPM-17497: Removed white Panel around Blank Slate and fixed TopNav m…
joshhidley Mar 31, 2021
fa0ef28
CJPM-17497: added alignment to DataTable Column.
joshhidley Apr 1, 2021
1aede96
Merge branch 'CJPM-17497' of github.com:cjdev/visual-stack into CJPM-…
joshhidley Apr 1, 2021
3dfb307
apply classnames to panel component
Kadinvanvalin Mar 30, 2021
dd4ec1f
CJPM-17455: Mouse should be a pointer when hovering over TopNav’s Bac…
lennongrinta Apr 5, 2021
7eac1b8
CJPM-17455: fix package-lock.json
lennongrinta Apr 6, 2021
efe3ca3
Merge pull request #331 from Kadinvanvalin/master
joshhidley Apr 7, 2021
58212f2
CJPM-17497: Changed Modal and Form styles per UX
joshhidley Mar 24, 2021
72ec4e0
CJPM-17497: Added mid-size modal width class selector.
joshhidley Mar 29, 2021
33eed2b
CJPM-17497: Style changes per UX team.
joshhidley Mar 30, 2021
6e79c4e
CJPM-17497: Removed white Panel around Blank Slate and fixed TopNav m…
joshhidley Mar 31, 2021
905a57c
CJPM-17497: added alignment to DataTable Column.
joshhidley Apr 1, 2021
405c5b1
CJPM-17497: Changed Modal and Form styles per UX
joshhidley Mar 24, 2021
5750ed5
CJPM-17497: Added mid-size modal width class selector.
joshhidley Mar 29, 2021
e58f7c0
CJPM-17455: Mouse should be a pointer when hovering over TopNav’s Bac…
lennongrinta Apr 5, 2021
6af6901
CJPM-17455: fix package-lock.json
lennongrinta Apr 6, 2021
b500e10
CJPM-17455: Linted changed files.
joshhidley Apr 8, 2021
9a09cab
CJPM-17455: Ran format on changed files.
joshhidley Apr 8, 2021
29f753a
CJPM-17455: merge.
joshhidley Apr 8, 2021
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
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ For components from visual-stack that require state management, this library pro
This is a microsite providing documentation and live examples of components. This package depends on the other two.

### Running locally
Install lerna: `npm install -g lerna`

Make sure you are using node 14 or below (`npm install -g n` can be helpful here)

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.

Expand Down
26 changes: 11 additions & 15 deletions packages/visual-stack/src/components/BlankSlate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,27 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Button } from '../Button';
import './BlankSlate.css';
import IconExample from 'mdi-react/BlurIcon';
import { Panel } from '../../../lib/components/Panel';

export const BlankSlate = ({
children,
alignment = '',
title = 'You do not have any content.',
headerGraphic = <IconExample />,
headerGraphic = '',
className = '',
...restProps
}) => {
return (
<Panel>
<div
{...restProps}
className={`vs-bs-container ${alignment === 'left-side' &&
'vs-bs-leftalign'} ${className}`}
>
<div className="vs-bs-img">{headerGraphic}</div>
<div className="vs-bs-content">
<h1 className="vs-bs-title">{title}</h1>
{children}
</div>
<div
{...restProps}
className={`vs-bs-container ${alignment === 'left-side' &&
'vs-bs-leftalign'} ${className}`}
>
<div className="vs-bs-img">{headerGraphic}</div>
<div className="vs-bs-content">
<h1 className="vs-bs-title">{title}</h1>
{children}
</div>
</Panel>
</div>
);
};

Expand Down
4 changes: 0 additions & 4 deletions packages/visual-stack/src/components/Form/Form.css
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@ fieldset.group ul.checkbox li.focus {
margin-top: -4px;
}

.vs-field {
margin-bottom: 24px;
}

.vs-field-optional {
color: #777;
font-size: 1.3rem;
Expand Down
16 changes: 14 additions & 2 deletions packages/visual-stack/src/components/Modal.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

.modal-content {
position: relative;
top: 80px;
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
Expand Down Expand Up @@ -79,7 +80,14 @@

.modal-header {
padding: 15px;
border-bottom: 1px solid #e5e5e5;
padding-left: 25px;
padding-right: 25px;
}

.modal-header-grid {
display: grid;
grid-template-columns: 1fr 36px;
align-items: center;
}

.modal-header h1 {
Expand All @@ -99,12 +107,13 @@
.modal-body {
position: relative;
padding: 15px;
padding-left: 25px;
padding-right: 25px;
}

.modal-footer {
padding: 15px;
text-align: right;
border-top: 1px solid #e5e5e5;
}

.modal-footer .btn + .btn {
Expand Down Expand Up @@ -153,6 +162,9 @@
.modal-sm {
width: 300px;
}
.modal-md {
width: 400px;
}
}
@media (min-width: 992px) {
.modal-lg {
Expand Down
33 changes: 24 additions & 9 deletions packages/visual-stack/src/components/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ import React from 'react';
import PropTypes from 'prop-types';
import './Panel.css';
import { deprecated } from 'prop-types-extra';

export const Panel = ({ children, ...restProps }) => (
<div {...restProps} className="cj-panel panel vs-panel-default">
import cn from 'classnames';
export const Panel = ({ children, className, ...restProps }) => (
<div
{...restProps}
className={cn(className, 'cj-panel', 'panel', 'vs-panel-default')}
>
{children}
</div>
);

export const Footer = ({ children, ...restProps }) => (
<div {...restProps} className="cj-panel panel-footer">
export const Footer = ({ children, className, ...restProps }) => (
<div {...restProps} className={cn(className, 'cj-panel', 'panel-footer')}>
{children}
</div>
);
Expand All @@ -20,7 +23,13 @@ const paddingMapping = {
large: 'wide',
};

export const Body = ({ children, paddingSize, padding, ...restProps }) => {
export const Body = ({
children,
paddingSize,
padding,
className,
...restProps
}) => {
const paddingSizeClass = paddingSize
? `cj-panel-body-padding-${paddingSize}`
: '';
Expand All @@ -30,15 +39,21 @@ export const Body = ({ children, paddingSize, padding, ...restProps }) => {
return (
<div
{...restProps}
className={`cj-panel panel-body ${paddingSizeClass} ${paddingClass}`}
className={cn(
className,
'cj-panel',
'panel-body',
paddingSizeClass,
paddingClass
)}
>
{children}
</div>
);
};

export const Header = ({ title, children, ...restProps }) => (
<div {...restProps} className="cj-panel panel-heading">
export const Header = ({ title, children, className, ...restProps }) => (
<div {...restProps} className={cn(className, 'cj-panel', 'panel-heading')}>
{title && <legend>{title}</legend>}
{children}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
min-height: 32px;
padding: 4px 8px;
vertical-align: bottom;
border-bottom: 2px solid #d8dcdf;
color: #757575;
}

.vs-data-table-container .vs-tbody .vs-cell {
Expand Down
Loading