Skip to content

Commit c557e98

Browse files
ShMcKShMcK
committed
style fixes
1 parent 3b8ac42 commit c557e98

File tree

19 files changed

+29
-126
lines changed

19 files changed

+29
-126
lines changed

‎lib/atom/subscriptions.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ function onActivate() {
1515
}));
1616
});
1717
subscriptions.add(atom.commands.add('atom-workspace', {
18-
'cr-viewer:testRun': (function () {
18+
'cr-viewer:testRun': function () {
1919
if (store_1.default.getState().route === 'page') {
2020
store_1.default.dispatch(actions_1.testRun());
2121
}
22-
}),
22+
},
2323
}));
2424
return subscriptions;
2525
}

‎lib/components/App.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var App = (function (_super) {
3737
}
3838
App.prototype.render = function () {
3939
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))))));
4141
};
4242
App = __decorate([
4343
react_redux_1.connect(function (store) {

‎lib/components/AppMenu/menuIconLeft.js

-9
This file was deleted.

‎lib/components/Hold.js

-43
This file was deleted.

‎lib/components/Hold/index.js

-42
This file was deleted.

‎lib/components/Page/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ exports.Page = function (_a) {
1313
var page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, testRun = _a.testRun;
1414
var task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
1515
var completed = page.completed;
16-
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}))));
16+
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}))));
1717
};

‎lib/components/Start/index.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ var _this = this;
1111
var React = require('react');
1212
var Checks_1 = require('./Checks');
1313
var Welcome_1 = require('./Welcome');
14-
var styles = {
15-
position: 'relative',
16-
height: '100%',
17-
textAlign: 'center',
18-
color: 'white',
19-
};
2014
var headerStyles = {
2115
display: 'block',
2216
height: '300px',
@@ -25,7 +19,7 @@ var headerStyles = {
2519
};
2620
exports.Start = function (_a) {
2721
var checks = _a.checks;
28-
return (React.createElement("section", {style: styles}, React.createElement("div", {style: headerStyles}, checks.passed
22+
return (React.createElement("section", {className: 'cr-start'}, React.createElement("div", {style: headerStyles}, checks.passed
2923
? React.createElement(Welcome_1.Welcome, null)
3024
: React.createElement(Checks_1.Checks, __assign({}, _this.props)))));
3125
};

‎lib/components/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var ReactDOM = require('react-dom');
44
var react_redux_1 = require('react-redux');
55
var store_1 = require('../store');
66
var App_1 = require('./App');
7-
var theme_1 = require('./theme');
7+
var theme_1 = require('./styles/theme');
88
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
99
require('./remove-later');
1010
function render(target) {

‎lib/components/theme.js renamed to ‎lib/components/styles/theme.js

File renamed without changes.

‎lib/reducers/page-position/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function pagePositionReducer(pagePosition, action) {
77
case _types_1.PAGE_POSITION_LOAD:
88
var pages = store_1.default.getState().progress.pages;
99
var firstFail = pages.indexOf(function (x) { return !x; });
10-
return firstFail >= 0 ? firstFail : pages.length - 1;
10+
return firstFail < 0 ? pages.length - 1 : firstFail;
1111
case _types_1.PAGE_SET:
1212
case _types_1.PAGE_POSITION_SET:
1313
return action.payload.pagePosition;

‎src/atom/subscriptions.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@ export function onActivate(): AtomCore.Disposable {
2828
subscriptions.add(
2929
// run tests on hot key. See keymaps
3030
atom.commands.add('atom-workspace', {
31-
'cr-viewer:testRun': (() => {
31+
'cr-viewer:testRun': () => {
3232
if (store.getState().route === 'page') {
3333
store.dispatch(testRun());
3434
}
35-
}),
35+
},
3636
})
3737
);
3838
return subscriptions;
3939
}
4040

4141
export function onDeactivate(): void {
4242
// unmount React
43-
// TODO: animate close first
4443
window.onresize = null;
4544
Root.unmount();
4645
// cleanup subscriptions

‎src/components/App.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export class App extends React.Component<{store?: CR.State}, {}> {
2020
return (
2121
<section
2222
style={{height}}
23+
className='cr-bg'
2324
>
2425
<Drawer
2526
width={400}

‎src/components/Page/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const Page: React.StatelessComponent<{
1919
const task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
2020
const completed = page.completed;
2121
return (
22-
<section style={styles}>
22+
<section style={styles} className='cr-page'>
2323
<PageContent page={page} />
2424

2525
<Tasks

‎src/components/Start/index.tsx

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ import * as React from 'react';
22
import {Checks} from './Checks';
33
import {Welcome} from './Welcome';
44

5-
const styles = {
6-
position: 'relative',
7-
height: '100%',
8-
textAlign: 'center',
9-
color: 'white',
10-
};
11-
125
const headerStyles = {
136
display: 'block',
147
height: '300px',
@@ -19,7 +12,7 @@ const headerStyles = {
1912
export const Start: React.StatelessComponent<{
2013
checks: CR.Checks
2114
}> = ({checks}) => (
22-
<section style={styles}>
15+
<section className='cr-start'>
2316
<div style={headerStyles}>
2417
{checks.passed
2518
? <Welcome />

‎src/components/render.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as ReactDOM from 'react-dom';
33
import {Provider} from 'react-redux';
44
import store from '../store';
55
import {App} from './App';
6-
import {muiTheme} from './theme';
6+
import {muiTheme} from './styles/theme';
77
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
88
import './remove-later';
99

‎src/components/index.less renamed to ‎src/components/styles/index.less

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'ui-variables';
2-
@import './AppMenu/_app-menu';
3-
@import './Alert/_alert';
4-
2+
@import '../AppMenu/_app-menu';
3+
@import '../Alert/_alert';
54
#crv {
65
position: relative;
76
overflow-y: scroll;
@@ -23,4 +22,15 @@
2322
height: 100%;
2423
background-color: @syntax-background-color;
2524
}
25+
.cr-start {
26+
height: calc(100% - 300px);
27+
background-color: @syntax-background-color;
28+
position: relative;
29+
text-align: center;
30+
color: white;
31+
}
32+
.cr-page {
33+
height: calc(100% - 200px);
34+
background-color: @syntax-background-color;
35+
}
2636
}

‎src/components/theme.ts renamed to ‎src/components/styles/theme.ts

File renamed without changes.

‎styles/styles.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import '../src/components/index';
1+
@import '../src/components/styles/index';

‎tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"src/components/index.ts",
7575
"src/components/remove-later.ts",
7676
"src/components/root.ts",
77-
"src/components/theme.ts",
77+
"src/components/styles/theme.ts",
7878
"src/reducers/alert/index.ts",
7979
"src/reducers/checks/action-setup.ts",
8080
"src/reducers/checks/action-system.ts",
@@ -144,7 +144,7 @@
144144
"src/components/Page/Tasks/index.tsx",
145145
"src/components/Page/TasksComplete/index.tsx",
146146
"src/components/Progress/index.tsx",
147-
"src/components/Progress/ProgressIcon.tsx",
147+
"src/components/Progress/progressIcon.tsx",
148148
"src/components/Progress/ProgressPage/index.tsx",
149149
"src/components/render.tsx",
150150
"src/components/Routes/index.tsx",

0 commit comments

Comments
 (0)