Skip to content
This repository has been archived by the owner on May 12, 2019. It is now read-only.

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Sep 26, 2016
1 parent aff71df commit 5b0f396
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 19 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
],
"dependencies": {
"react": "~15.3.1",
"react-dom": "~15.3.1"
"react-dom": "~15.3.1",
"tachyons": "~4.5.3"
},
"devDependencies": {
"autoprefixer": "~6.4.1",
Expand Down
11 changes: 7 additions & 4 deletions src/app/Layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ import React from 'react'

export default function Layout ({ children }) {
return (
<div>
<h1>Hello, world!</h1>
{children}
</div>
<section class='mw5 mw7-ns mt6 center bg-light-gray pa3 ph5-ns'>
<h1 class='mt0 f3 tc'>Tachyons</h1>
<p class='f5 tc lh-copy'>
<h1>Hello, world!</h1>
{children}
</p>
</section>
)
}
11 changes: 1 addition & 10 deletions src/app/index.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
html {
-webkit-text-size-adjust: 100%;
}

body {
font-family: -apple-system, BlinkMacSystemFont, sans-serif;
line-height: 1.5;
margin: 0;
background:white url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NzY3MkJEN0U2N0M1MTFFNkIyQkNFMjQwODEwMDIxNzEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NzY3MkJEN0Y2N0M1MTFFNkIyQkNFMjQwODEwMDIxNzEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3NjcyQkQ3QzY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3NjcyQkQ3RDY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pve6J3kAAAAzSURBVHjaYvz//z8D0UDsMwMjSRoYP5Gq4SPNbRjVMEQ1fCRDg+in/6+J1AJUxsgAEGAA31BAJMS0GYEAAAAASUVORK5CYII=) repeat top left;
}
@import '~tachyons/src/tachyons';
2 changes: 1 addition & 1 deletion src/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@



<script type="text/javascript" src="assets/js/bundle.js"></script></body>
</body>
</html>
6 changes: 3 additions & 3 deletions webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ module.exports = {
plugins: [
new HtmlWebpackPlugin(Object.assign({}, config, {
template: require('html-webpack-template'),
alwaysWriteToDisk: true
alwaysWriteToDisk: true,
inject: false
})),
new HtmlWebpackHarddiskPlugin(),
new webpack.HotModuleReplacementPlugin(),
Expand All @@ -42,8 +43,7 @@ module.exports = {
// (which should be serving on http://localhost:3100/)
// through BrowserSync
proxy: 'http://localhost:3000',
open: false,
plugins: ['bs-fullscreen-message']
open: false
},
// plugin options
{
Expand Down

0 comments on commit 5b0f396

Please sign in to comment.