fix rebase error, clean up css organization and use @less vars

apache · Mar 6, 2018 · 2c6d610 · 2c6d610
1 parent 73ee37e
commit 2c6d610
Show file tree

Hide file tree

Showing 31 changed files with 480 additions and 505 deletions.
diff --git a/superset/assets/images/favicon.png b/superset/assets/images/favicon.png
diff --git a/superset/assets/images/superset-logo@2x.png b/superset/assets/images/superset-logo@2x.png
diff --git a/superset/assets/javascripts/dashboard/components/DashboardContainer.jsx b/superset/assets/javascripts/dashboard/components/DashboardContainer.jsx
@@ -5,19 +5,19 @@ import * as dashboardActions from '../actions';
 import * as chartActions from '../../chart/chartAction';
 import Dashboard from '../v2/components/Dashboard';
 
-function mapStateToProps({ charts, dashboard, impressionId }) {
+function mapStateToProps(/* { charts, dashboard, impressionId } */) {
   return {
-    initMessages: dashboard.common.flash_messages,
-    timeout: dashboard.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
-    dashboard: dashboard.dashboard,
-    slices: charts,
-    datasources: dashboard.datasources,
-    filters: dashboard.filters,
-    refresh: !!dashboard.refresh,
-    userId: dashboard.userId,
-    isStarred: !!dashboard.isStarred,
-    editMode: dashboard.editMode,
-    impressionId,
+    // initMessages: dashboard.common.flash_messages,
+    // timeout: dashboard.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
+    // dashboard: dashboard.dashboard,
+    // slices: charts,
+    // datasources: dashboard.datasources,
+    // filters: dashboard.filters,
+    // refresh: !!dashboard.refresh,
+    // userId: dashboard.userId,
+    // isStarred: !!dashboard.isStarred,
+    // editMode: dashboard.editMode,
+    // impressionId,
   };
 }
 

diff --git a/superset/assets/javascripts/dashboard/v2/components/Dashboard.jsx b/superset/assets/javascripts/dashboard/v2/components/Dashboard.jsx
@@ -6,6 +6,7 @@ import StaticDashboard from './StaticDashboard';
 import DashboardHeader from './DashboardHeader';
 
 import '../../../../stylesheets/dashboard-v2.css';
+import '../stylesheets/index.less';
 
 const propTypes = {
   actions: PropTypes.shape({

diff --git a/superset/assets/javascripts/dashboard/v2/components/DashboardBuilder.jsx b/superset/assets/javascripts/dashboard/v2/components/DashboardBuilder.jsx
@@ -7,8 +7,6 @@ import cx from 'classnames';
 import BuilderComponentPane from './BuilderComponentPane';
 import DashboardGrid from '../containers/DashboardGrid';
 
-import './dnd/dnd.css';
-
 const propTypes = {
   editMode: PropTypes.bool,
 };

diff --git a/superset/assets/javascripts/dashboard/v2/components/DashboardGrid.jsx b/superset/assets/javascripts/dashboard/v2/components/DashboardGrid.jsx
@@ -12,8 +12,6 @@ import {
   GRID_COLUMN_COUNT,
 } from '../util/constants';
 
-import './gridComponents/grid.css';
-
 const propTypes = {
   dashboard: PropTypes.object.isRequired,
   updateComponents: PropTypes.func.isRequired,

diff --git a/superset/assets/javascripts/dashboard/v2/components/gridComponents/Row.jsx b/superset/assets/javascripts/dashboard/v2/components/gridComponents/Row.jsx
@@ -97,7 +97,6 @@ class Row extends React.PureComponent {
     } = this.props;
 
     const rowItems = [];
-    console.log('render row', rowComponent);
 
     // this adds a gutter between each child in the row.
     (rowComponent.children || []).forEach((id, childIndex) => {

diff --git a/superset/assets/javascripts/dashboard/v2/components/gridComponents/Spacer.jsx b/superset/assets/javascripts/dashboard/v2/components/gridComponents/Spacer.jsx
@@ -3,16 +3,10 @@ import PropTypes from 'prop-types';
 
 import DeleteComponentButton from '../DeleteComponentButton';
 import DragDroppable from '../dnd/DragDroppable';
-// import DragHandle from '../dnd/DragHandle';
 import HoverMenu from '../menu/HoverMenu';
 import ResizableContainer from '../resizable/ResizableContainer';
 import { componentShape } from '../../util/propShapes';
 
-import {
-//   GRID_MIN_COLUMN_COUNT,
-  // GRID_MIN_ROW_UNITS,
-} from '../../util/constants';
-
 const propTypes = {
   id: PropTypes.string.isRequired,
   parentId: PropTypes.string.isRequired,