style fixes

ShMcK · ShMcK · commit c557e98fb33c · 2016-05-03T07:26:18.000-07:00
diff --git a/lib/atom/subscriptions.js b/lib/atom/subscriptions.js
@@ -15,11 +15,11 @@ function onActivate() {
         }));
     });
     subscriptions.add(atom.commands.add('atom-workspace', {
-        'cr-viewer:testRun': (function () {
+        'cr-viewer:testRun': function () {
             if (store_1.default.getState().route === 'page') {
                 store_1.default.dispatch(actions_1.testRun());
             }
-        }),
+        },
     }));
     return subscriptions;
 }
diff --git a/lib/components/App.js b/lib/components/App.js
@@ -37,7 +37,7 @@ var App = (function (_super) {
     }
     App.prototype.render = function () {
         var store = this.props.store;
-        return (React.createElement("section", {style: { height: height }}, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.open}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))))));
+        return (React.createElement("section", {style: { height: height }, className: 'cr-bg'}, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.open}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))))));
     };
     App = __decorate([
         react_redux_1.connect(function (store) {
diff --git a/lib/components/AppMenu/menuIconLeft.js b/lib/components/AppMenu/menuIconLeft.js
diff --git a/lib/components/Hold.js b/lib/components/Hold.js
diff --git a/lib/components/Hold/index.js b/lib/components/Hold/index.js
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -13,5 +13,5 @@ exports.Page = function (_a) {
     var page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, testRun = _a.testRun;
     var task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
     var completed = page.completed;
-    return (React.createElement("section", {style: styles}, React.createElement(PageContent_1.PageContent, {page: page}), React.createElement(Tasks_1.Tasks, {tasks: tasks, taskPosition: taskPosition, testRun: testRun, completed: completed, page: page}), React.createElement(PageToolbar_1.PageToolbar, {tasks: tasks, taskPosition: taskPosition}, React.createElement(Hints_1.Hints, {task: task, hintPosition: hintPosition}), React.createElement(ProgressBar_1.ProgressBar, {taskLength: tasks.length, taskPosition: taskPosition, completed: completed}))));
+    return (React.createElement("section", {style: styles, className: 'cr-page'}, React.createElement(PageContent_1.PageContent, {page: page}), React.createElement(Tasks_1.Tasks, {tasks: tasks, taskPosition: taskPosition, testRun: testRun, completed: completed, page: page}), React.createElement(PageToolbar_1.PageToolbar, {tasks: tasks, taskPosition: taskPosition}, React.createElement(Hints_1.Hints, {task: task, hintPosition: hintPosition}), React.createElement(ProgressBar_1.ProgressBar, {taskLength: tasks.length, taskPosition: taskPosition, completed: completed}))));
 };
diff --git a/lib/components/Start/index.js b/lib/components/Start/index.js
@@ -11,12 +11,6 @@ var _this = this;
 var React = require('react');
 var Checks_1 = require('./Checks');
 var Welcome_1 = require('./Welcome');
-var styles = {
-    position: 'relative',
-    height: '100%',
-    textAlign: 'center',
-    color: 'white',
-};
 var headerStyles = {
     display: 'block',
     height: '300px',
@@ -25,7 +19,7 @@ var headerStyles = {
 };
 exports.Start = function (_a) {
     var checks = _a.checks;
-    return (React.createElement("section", {style: styles}, React.createElement("div", {style: headerStyles}, checks.passed
+    return (React.createElement("section", {className: 'cr-start'}, React.createElement("div", {style: headerStyles}, checks.passed
         ? React.createElement(Welcome_1.Welcome, null)
         : React.createElement(Checks_1.Checks, __assign({}, _this.props)))));
 };
diff --git a/lib/components/render.js b/lib/components/render.js
@@ -4,7 +4,7 @@ var ReactDOM = require('react-dom');
 var react_redux_1 = require('react-redux');
 var store_1 = require('../store');
 var App_1 = require('./App');
-var theme_1 = require('./theme');
+var theme_1 = require('./styles/theme');
 var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
 require('./remove-later');
 function render(target) {
diff --git a/lib/components/styles/theme.js b/lib/components/styles/theme.js
diff --git a/lib/reducers/page-position/index.js b/lib/reducers/page-position/index.js
@@ -7,7 +7,7 @@ function pagePositionReducer(pagePosition, action) {
         case _types_1.PAGE_POSITION_LOAD:
             var pages = store_1.default.getState().progress.pages;
             var firstFail = pages.indexOf(function (x) { return !x; });
-            return firstFail >= 0 ? firstFail : pages.length - 1;
+            return firstFail < 0 ? pages.length - 1 : firstFail;
         case _types_1.PAGE_SET:
         case _types_1.PAGE_POSITION_SET:
             return action.payload.pagePosition;
diff --git a/src/atom/subscriptions.ts b/src/atom/subscriptions.ts
@@ -28,19 +28,18 @@ export function onActivate(): AtomCore.Disposable {
   subscriptions.add(
     // run tests on hot key. See keymaps
     atom.commands.add('atom-workspace', {
-      'cr-viewer:testRun': (() => {
+      'cr-viewer:testRun': () => {
         if (store.getState().route === 'page') {
           store.dispatch(testRun());
         }
-      }),
+      },
     })
   );
   return subscriptions;
 }
 
 export function onDeactivate(): void {
   // unmount React
-  // TODO: animate close first
   window.onresize = null;
   Root.unmount();
   // cleanup subscriptions
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -20,6 +20,7 @@ export class App extends React.Component<{store?: CR.State}, {}> {
     return (
       <section
         style={{height}}
+        className='cr-bg'
       >
       <Drawer
         width={400}
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
@@ -19,7 +19,7 @@ export const Page: React.StatelessComponent<{
   const task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
   const completed = page.completed;
   return (
-    <section style={styles}>
+    <section style={styles} className='cr-page'>
       <PageContent page={page} />
 
       <Tasks
diff --git a/src/components/Start/index.tsx b/src/components/Start/index.tsx
@@ -2,13 +2,6 @@ import * as React from 'react';
 import {Checks} from './Checks';
 import {Welcome} from './Welcome';
 
-const styles = {
-  position: 'relative',
-  height: '100%',
-  textAlign: 'center',
-  color: 'white',
-};
-
 const headerStyles = {
   display: 'block',
   height: '300px',
@@ -19,7 +12,7 @@ const headerStyles = {
 export const Start: React.StatelessComponent<{
   checks: CR.Checks
 }> = ({checks}) => (
-  <section style={styles}>
+  <section className='cr-start'>
     <div style={headerStyles}>
     {checks.passed
       ? <Welcome  />
diff --git a/src/components/render.tsx b/src/components/render.tsx
@@ -3,7 +3,7 @@ import * as ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 import store from '../store';
 import {App} from './App';
-import {muiTheme} from './theme';
+import {muiTheme} from './styles/theme';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import './remove-later';
 
diff --git a/src/components/styles/index.less b/src/components/styles/index.less
@@ -1,7 +1,6 @@
 @import 'ui-variables';
-@import './AppMenu/_app-menu';
-@import './Alert/_alert';
-
+@import '../AppMenu/_app-menu';
+@import '../Alert/_alert';
 #crv {
   position: relative;
   overflow-y: scroll;
@@ -23,4 +22,15 @@
     height: 100%;
     background-color: @syntax-background-color;
   }
+  .cr-start {
+    height: calc(100% - 300px);
+    background-color: @syntax-background-color;
+    position: relative;
+    text-align: center;
+    color: white;
+  }
+  .cr-page {
+    height: calc(100% - 200px);
+    background-color: @syntax-background-color;
+  }
 }
diff --git a/src/components/styles/theme.ts b/src/components/styles/theme.ts
diff --git a/styles/styles.less b/styles/styles.less
@@ -1 +1 @@
-@import '../src/components/index';
+@import '../src/components/styles/index';
diff --git a/tsconfig.json b/tsconfig.json
@@ -74,7 +74,7 @@
         "src/components/index.ts",
         "src/components/remove-later.ts",
         "src/components/root.ts",
-        "src/components/theme.ts",
+        "src/components/styles/theme.ts",
         "src/reducers/alert/index.ts",
         "src/reducers/checks/action-setup.ts",
         "src/reducers/checks/action-system.ts",
@@ -144,7 +144,7 @@
         "src/components/Page/Tasks/index.tsx",
         "src/components/Page/TasksComplete/index.tsx",
         "src/components/Progress/index.tsx",
-        "src/components/Progress/ProgressIcon.tsx",
+        "src/components/Progress/progressIcon.tsx",
         "src/components/Progress/ProgressPage/index.tsx",
         "src/components/render.tsx",
         "src/components/Routes/index.tsx",

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ function onActivate() {`
`15`	`15`	`}));`
`16`	`16`	`});`
`17`	`17`	`subscriptions.add(atom.commands.add('atom-workspace', {`
`18`		`- 'cr-viewer:testRun': (function () {`
	`18`	`+ 'cr-viewer:testRun': function () {`
`19`	`19`	`if (store_1.default.getState().route === 'page') {`
`20`	`20`	`store_1.default.dispatch(actions_1.testRun());`
`21`	`21`	`}`
`22`		`- }),`
	`22`	`+ },`
`23`	`23`	`}));`
`24`	`24`	`return subscriptions;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ var App = (function (_super) {`
`37`	`37`	`}`
`38`	`38`	`App.prototype.render = function () {`
`39`	`39`	`var store = this.props.store;`
`40`		`- return (React.createElement("section", {style: { height: height }}, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.open}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))))));`
	`40`	`+ return (React.createElement("section", {style: { height: height }, className: 'cr-bg'}, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.open}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))))));`
`41`	`41`	`};`
`42`	`42`	`App = __decorate([`
`43`	`43`	`react_redux_1.connect(function (store) {`