Skip to content

Commit

Permalink
Merge pull request #88 from alisman/fixTests
Browse files Browse the repository at this point in the history
remove duck file to fix tests for datasets page

Former-commit-id: a3c3a50
  • Loading branch information
alisman authored Nov 29, 2016
2 parents 8d78fda + ef6decf commit 60f5855
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 188 deletions.
1 change: 1 addition & 0 deletions src/appShell/App/Container.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, {PropTypes as T} from 'react';
import ReactDOM from 'react-dom';
import PageHeader from '../../pages/pageHeader/PageHeader.jsx';

import '../../globalStyles/global.scss';

export class Container extends React.Component {

Expand Down
89 changes: 13 additions & 76 deletions src/globalStyles/global.scss
Original file line number Diff line number Diff line change
@@ -1,81 +1,18 @@
// fretboard

//body {
// margin-top:0 !important;
//}
//
//#page_wrapper {
// padding:0px !important;
//}
//
//#header table:first-child {
// margin:0 10px 10px 10px;
// width:97%;
//}
th.reactable-header-sortable {

&:focus {outline:0;}

//.ui-widget {
// font-size:inherit !important;
//}
//
//.ui-widget-header {
// border:none !important;
// border-bottom:1px solid #ddd !important;
// border-radius:0;
// background:none !important;
// background-image:none !important;
//
// .ui-state-active {
// border-color:#ddd !important;
// }
//
//}
}

//#patient-table_wrapper {
// display:none !important;
//}
//
//#patient-tabs {
// border:none !important;
// padding:0px;
//
// .ui-tabs .ui-tabs-panel {
// padding:0px !important;
//
//
//
// }
//
//}
th.reactable-header-sort-desc:after {
content: '\25B2';
padding-left: 10px;
padding-bottom: 5px;
}

//#content {
// padding:20px;
//}

//.ui-tabs .ui-tabs-panel {
// padding:0px !important;
//}

//#content ul {
// margin-bottom:0px;
// margin-top:0px;
//}
//
//#clinical_div {
// padding:15px;
// background:#eee;
// border-radius:5px;
// margin-bottom:15px;
// position:relative;
// padding-left:60px;
//
// i.fa {
// color:#fff;
// position:absolute;
// font-size:50px;
// top:10px;
// left:15px;
// }
//
//
//}
th.reactable-header-sort-asc:after {
content: '\25BC';
padding-left: 10px;
padding-bottom: 5px;
}
2 changes: 1 addition & 1 deletion src/pages/datasetView/Connector.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {RootState} from "../../redux/rootReducer";
import {IDispatch, Connector} from "../../shared/lib/ConnectorAPI";
import { IDatasetPageUnconnectedProps } from './DataSetPage';
import { IDatasetPageUnconnectedProps } from './DatasetPage';
import getDatasetsInfo from './getDatasetsInfo';

export type DatasetDownloads = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from "react";
import { actionCreators, mapStateToProps } from './duck';
import { connect } from 'react-redux';
import { Table, unsafe } from 'reactableMSK';
import * as _ from 'underscore';
Expand Down Expand Up @@ -49,8 +48,6 @@ export default class DataSetPageUnconnected extends React.Component<IDatasetPage
}
;

//export default connect(mapStateToProps, actionCreators)(DataSetPageUnconnected);




Expand Down
74 changes: 0 additions & 74 deletions src/pages/datasetView/duck.js

This file was deleted.

34 changes: 0 additions & 34 deletions src/pages/datasetView/duck.spec.js

This file was deleted.

0 comments on commit 60f5855

Please sign in to comment.