Skip to content

Commit 9050223

Browse files
Merge pull request #126 from kylekim-oicr/master
Isotope Grid V2
2 parents 322a2a9 + e960497 commit 9050223

19 files changed

Lines changed: 163 additions & 777 deletions

File tree

.storybook/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function loadStories() {
1919
require('../stories/UserDrawer');
2020
require('../stories/FilteredList');
2121
require('../stories/FilteredTable');
22-
require('../stories/FilteredIsotope');
2322
require('../stories/TwitterFeed');
2423
require('../stories/Spinner');
2524
require('../stories/PasswordValidator');

dist/_wfui-react.scss

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,34 @@ html {
10871087
.widget .widget__body .widget__body__header {
10881088
margin-top: 8px;
10891089
margin-bottom: 8px; }
1090+
.form-box-container {
1091+
width: 100%;
1092+
margin-bottom: 20px;
1093+
border-top: 5px solid #000; }
1094+
.form-box-container .form-box {
1095+
border: 1px solid #dadada;
1096+
border-top: none; }
1097+
.form-box-container .form-box-body {
1098+
padding: 10px 15px;
1099+
background-color: #fff; }
1100+
.form-box-container .form-box-footer {
1101+
border-top: 1px solid #dadada; }
1102+
.form-box-container .form-box-footer ul.form-box-links {
1103+
display: flex;
1104+
flex-wrap: nowrap;
1105+
list-style: none;
1106+
margin: 0;
1107+
padding: 0; }
1108+
.form-box-container .form-box-footer ul.form-box-links > li {
1109+
border-right: 1px solid #dadada;
1110+
flex: 1;
1111+
font-size: 16px;
1112+
font-weight: 600;
1113+
background-color: #f7f9fa;
1114+
text-align: center;
1115+
padding: 5px 0; }
1116+
.form-box-container .form-box-footer ul.form-box-links > li:last-child {
1117+
border-right: none; }
10901118
html {
10911119
box-sizing: border-box;
10921120
font-size: 16px; }

lib/DashboardCard/DashboardCard.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ var DashboardCardFooter = function DashboardCardFooter(_ref2) {
7070
{ key: key },
7171
(0, _react.cloneElement)(child)
7272
);
73-
}) || (0, _react.cloneElement)(children, { key: 0 })
73+
}) || _react2.default.createElement(
74+
'li',
75+
null,
76+
(0, _react.cloneElement)(children)
77+
)
7478
)
7579
) : null;
7680
};
@@ -123,12 +127,13 @@ var DashboardCard = function (_React$Component) {
123127
var _props = this.props,
124128
className = _props.className,
125129
children = _props.children,
126-
data = _props.data;
130+
data = _props.data,
131+
style = _props.style;
127132

128133

129134
return _react2.default.createElement(
130135
_Card2.default,
131-
{ className: (0, _classnames2.default)(className, 'form-box-container') },
136+
{ className: (0, _classnames2.default)(className, 'form-box-container'), cardStyle: style },
132137
_react2.default.createElement(
133138
_Card2.default.Body,
134139
{ className: 'form-box' },
@@ -153,7 +158,8 @@ var DashboardCard = function (_React$Component) {
153158
DashboardCard.propTypes = {
154159
children: _propTypes2.default.node,
155160
className: _propTypes2.default.string,
156-
data: _propTypes2.default.object
161+
data: _propTypes2.default.object,
162+
style: _propTypes2.default.object
157163
};
158164

159165
DashboardCard.Body = DashboardCardBody;

lib/FilteredIsotope/Element.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

lib/FilteredIsotope/FilteredIsotope.js

Lines changed: 0 additions & 259 deletions
This file was deleted.

0 commit comments

Comments
 (0)