final updates

This commit is contained in:
John Bintz 2015-10-05 08:43:19 -04:00
parent 02d82501bd
commit c039e7bf40
16 changed files with 1050 additions and 907 deletions

View File

@ -1,2 +1,3 @@
Either run locally with `npm install && npm run dev` or use Either run locally with `npm install && npm run dev` or use
Docker and `bin/run`. Connect to `http://localhost:3500`. Docker and `bin/run`. Connect to `http://localhost:3500` or
`http://$(docker-machine ip default):3500`.

1890
dist/presentation.js vendored

File diff suppressed because one or more lines are too long

9
dist/style.css vendored
View File

@ -22,17 +22,17 @@
font-weight: 700; } font-weight: 700; }
.styles__small-text___thSOA { .styles__small-text___thSOA {
font-size: 2em; font-size: 2.75em;
font-weight: 400; } font-weight: 400; }
.styles__code___1WYoK, .styles__code-large___2KxFW { .styles__code___1WYoK, .styles__code-large___2KxFW {
text-align: left; } text-align: left; }
.styles__code___1WYoK { .styles__code___1WYoK {
font-size: 0.75em; } font-size: 1em; }
.styles__code-large___2KxFW { .styles__code-large___2KxFW {
font-size: 1.35em; } font-size: 1.4em; }
html, body, #app { html, body, #app {
width: 100%; width: 100%;
height: 100%; } height: 100%; }
@ -41,6 +41,9 @@ html, body {
padding: 0; padding: 0;
margin: 0; } margin: 0; }
body {
background: linear-gradient(10deg, #e2efff 0%, #fff 100%); }
* { * {
user-select: none; } user-select: none; }

View File

@ -8,6 +8,10 @@ html, body {
margin: 0; margin: 0;
} }
body {
background: linear-gradient(10deg, #e2efff 0%, #fff 100%);
}
* { * {
user-select: none; user-select: none;
} }

View File

@ -3,6 +3,7 @@ import WithCSS from 'react-css-modules';
import Slides from './slides'; import Slides from './slides';
import SlideList from './slide_list'; import SlideList from './slide_list';
import PresentationWrapper from './presentation_wrapper';
import styles from './styles.scss'; import styles from './styles.scss';
@ -62,10 +63,9 @@ export default class Presentation extends React.Component {
render () { render () {
return ( return (
<div styleName='presentation'> <PresentationWrapper>
<Slides slides={SlideList} <Slides slides={SlideList} {...this.state} />
{...this.state} /> </PresentationWrapper>
</div>
); );
} }
} }

View File

@ -0,0 +1,11 @@
import React from 'react';
import WithCSS from 'react-css-modules/dist/linkClass';
import styles from './styles.scss';
export default function PresentationWrapper(props) {
return WithCSS(
<div styleName='presentation'>{props.children}</div>,
styles
);
}

View File

@ -29,6 +29,7 @@ import BasicGuidelines from './slides/basic_guidelines';
import PushDOMNodesDown from './slides/push_dom_nodes_down'; import PushDOMNodesDown from './slides/push_dom_nodes_down';
import PushStateUp from './slides/push_state_up'; import PushStateUp from './slides/push_state_up';
import Thanks from './slides/thanks'; import Thanks from './slides/thanks';
import CSSIsGlobals from './slides/css_is_globals';
export default [ export default [
TitleSlide, TitleSlide,
@ -45,6 +46,7 @@ export default [
React014ContainerBreakout, React014ContainerBreakout,
MoveStylesOutOfGlobalCSS, MoveStylesOutOfGlobalCSS,
GlobalStyles, GlobalStyles,
CSSIsGlobals,
ReactCSSModules, ReactCSSModules,
SCSSLocalStyles, SCSSLocalStyles,
RenderedLocalStyles, RenderedLocalStyles,

View File

@ -0,0 +1,11 @@
import React from 'react';
import Slide from '../slide';
import LargeText from '../large_text';
import SmallText from '../small_text';
export default (
<Slide title="CSS is Globals">
<LargeText>Globals!</LargeText>
<SmallText>and globals are usually bad</SmallText>
</Slide>
);

View File

@ -6,6 +6,5 @@ import SmallText from '../small_text';
export default ( export default (
<Slide title="ES6"> <Slide title="ES6">
<LargeText>ES6/ES7 decorators ahead!</LargeText> <LargeText>ES6/ES7 decorators ahead!</LargeText>
<SmallText>#babelmasterrace</SmallText>
</Slide> </Slide>
); );

View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import Slide from '../slide'; import Slide from '../slide';
import LargeText from '../large_text'; import LargeText from '../large_text';
import SmallText from '../large_text'; import SmallText from '../small_text';
export default ( export default (
<Slide title="Higher Order Components"> <Slide title="Higher Order Components">

View File

@ -2,11 +2,14 @@ import React from 'react';
import Slide from '../slide'; import Slide from '../slide';
import LargeText from '../large_text'; import LargeText from '../large_text';
import SmallText from '../small_text'; import SmallText from '../small_text';
import Spacer from '../spacer';
export default ( export default (
<Slide title="Push DOM Nodes Down"> <Slide title="Push DOM Nodes Down">
<LargeText>Push DOM Nodes Down</LargeText> <LargeText>Push DOM Nodes Down</LargeText>
<SmallText>...by making containers</SmallText> <SmallText>...by making containers</SmallText>
<SmallText>...by moving prop renderers deeper </SmallText> <SmallText>...by moving prop renderers deeper </SmallText>
<Spacer />
<SmallText>(this applies to React Native, too!)</SmallText>
</Slide> </Slide>
); );

View File

@ -5,7 +5,7 @@ import CodeLarge from '../code_large';
export default ( export default (
<Slide title="Break out the containers in React 0.14"> <Slide title="Break out the containers in React 0.14">
<SmallText>React 0.14</SmallText> <SmallText>React 0.14 Stateless Function Components</SmallText>
<CodeLarge>{` <CodeLarge>{`
export default function NavbarRight(props) { export default function NavbarRight(props) {
return ( return (

View File

@ -1,9 +1,11 @@
import React from 'react'; import React from 'react';
import Slide from '../slide'; import Slide from '../slide';
import CodeLarge from '../code_large'; import CodeLarge from '../code_large';
import SmallText from '../small_text';
export default ( export default (
<Slide title="react-css-modules"> <Slide title="react-css-modules">
<SmallText><code>react-css-modules</code></SmallText>
<CodeLarge>{` <CodeLarge>{`
import WithCSS from 'react-css-modules'; import WithCSS from 'react-css-modules';
import styles from './navbar_styling.scss'; import styles from './navbar_styling.scss';

View File

@ -3,6 +3,6 @@ import Slide from '../slide';
export default ( export default (
<Slide title="wow"> <Slide title="wow">
<img src="http://i.stack.imgur.com/aP2dv.gif" /> <img src="http://i.stack.imgur.com/aP2dv.gif" height="40%" />
</Slide> </Slide>
); );

View File

@ -32,7 +32,7 @@
.small-text { .small-text {
@extend %font; @extend %font;
font-size: 2em; font-size: 2.75em;
font-weight: 400; font-weight: 400;
} }
@ -43,11 +43,11 @@
.code { .code {
@extend %code; @extend %code;
font-size: 0.75em; font-size: 1em;
} }
.code-large { .code-large {
@extend %code; @extend %code;
font-size: 1.35em; font-size: 1.4em;
} }

View File

@ -14,6 +14,7 @@ module.exports = {
}, },
devtool: 'inline-source-map', devtool: 'inline-source-map',
watchOptions: { watchOptions: {
poll: true,
aggregateTimeout: 1000 aggregateTimeout: 1000
}, },
module: { module: {