Skip to content

Commit

Permalink
Remove MDL; /pages -> /routes; /public/index.ejs -> /index.ejs
Browse files Browse the repository at this point in the history
...refactor website layout, update core/router.js and utils/routes-loader.js (route.page -> route.component), replace package.json files with index.js; update copyright messages in source files; remove FastClick, babel-polyfill, classnames and react-mdl dependencies.

Closes #14, closes #4
  • Loading branch information
koistya committed Jul 28, 2016
1 parent 811a17d commit 3702547
Show file tree
Hide file tree
Showing 46 changed files with 316 additions and 422 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Node.js and NPM
node_modules
npm-debug.log
tools/node_modules
tools/npm-debug.log
*.tgz

# Misc
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-app",
"version": "1.0.2",
"version": "1.1.1",
"description": "Boilerplate and tooling for JavaScript application development with React",
"repository": "kriasoft/react-app",
"author": "Kriasoft <[email protected]> (https://www.kriasoft.com)",
Expand Down
3 changes: 0 additions & 3 deletions template/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ public/index.html
# Node.js and NPM
node_modules
npm-debug.log

# Firebase
firebase-debug.log
70 changes: 0 additions & 70 deletions template/components/Button/Button.js

This file was deleted.

27 changes: 0 additions & 27 deletions template/components/Button/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions template/components/Button/package.json

This file was deleted.

66 changes: 0 additions & 66 deletions template/components/Footer/Footer.js

This file was deleted.

6 changes: 0 additions & 6 deletions template/components/Footer/package.json

This file was deleted.

43 changes: 27 additions & 16 deletions template/components/Layout/Header.css
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
/**
* React Static Boilerplate
* https://github.com/kriasoft/react-static-boilerplate
*
* Copyright © 2015-present Kriasoft, LLC. All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE.txt file in the root directory of this source tree.
*/
* React App SDK (https://github.com/kriasoft/react-app)
*
* Copyright © 2015-present Kriasoft, LLC. All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE.txt file in the root directory of this source tree.
*/

.row {
padding: 40px;
.header {
background-color: #3f51b5;
background-image: linear-gradient(-225deg,#3db0ef,#5e5bb7);
}

.container {
margin: 0 auto;
max-width: 1000px;
}

.title {
display: block;
padding: 2em 0 1.75em;
color: #fff;
text-align: center;
text-decoration: none;
font-weight: 100;
font-size: 48px;
font-family: Roboto, sans-serif;
}

@media screen and (max-width: 1024px) {
.title strong {
font-weight: 300;
}

.header {
display: flex;
}
@media screen and (max-width: 1024px) {

.row {
padding: 0 16px;
.title {
font-size: 36px;
}

}
38 changes: 12 additions & 26 deletions template/components/Layout/Header.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/**
* React Static Boilerplate
* https://github.com/kriasoft/react-static-boilerplate
* React App SDK (https://github.com/kriasoft/react-app)
*
* Copyright © 2015-present Kriasoft, LLC. All rights reserved.
*
Expand All @@ -13,30 +12,17 @@ import Navigation from './Navigation';
import Link from '../Link';
import s from './Header.css';

class Header extends React.Component {

componentDidMount() {
window.componentHandler.upgradeElement(this.root);
}

componentWillUnmount() {
window.componentHandler.downgradeElements(this.root);
}

render() {
return (
<header className={`mdl-layout__header ${s.header}`} ref={node => (this.root = node)}>
<div className={`mdl-layout__header-row ${s.row}`}>
<Link className={`mdl-layout-title ${s.title}`} to="/">
React Static Boilerplate
</Link>
<div className="mdl-layout-spacer"></div>
<Navigation />
</div>
</header>
);
}

function Header() {
return (
<header className={s.header}>
<div className={s.container}>
<Link className={s.title} to="/">
React App <strong>Starter Kit</strong>
</Link>
<Navigation />
</div>
</header>
);
}

export default Header;
41 changes: 39 additions & 2 deletions template/components/Layout/Layout.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,50 @@
/**
* React Static Boilerplate
* https://github.com/kriasoft/react-static-boilerplate
* React App SDK (https://github.com/kriasoft/react-app)
*
* Copyright © 2015-present Kriasoft, LLC. All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE.txt file in the root directory of this source tree.
*/

html {
font-family: Roboto, Helvetica, Arial, sans-serif;

/* Prevent iOS and IE text size adjust after device orientation change,
* without disabling user zoom. */
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}

body {
margin: 0;
background-color: rgb(253, 253, 253);
color: #222;
font-size: 1em;
line-height: 1.4;
}

a {
/* Remove the gray background color from active links in IE 10. */
background-color: transparent;
}

a:active,
a:hover {
/* Improve readability of focused elements when they are also in an
* active/hover state. */
outline: 0;
}

h1 {
margin: 0.67em 0;
font-size: 2em;
}

.root {

}

.content {
margin: 0 auto;
max-width: 1000px;
Expand Down
Loading

0 comments on commit 3702547

Please sign in to comment.