diff --git a/index.jsx b/index.jsx index b1f9293..5542436 100644 --- a/index.jsx +++ b/index.jsx @@ -18,7 +18,7 @@ config.html = require("./themes/formidable/html"); // Styling import "normalize.css"; import "./themes/formidable/index.css"; -import "highlight.js/styles/monokai_sublime.css"; +import "spectacle/node_modules/highlight.js/styles/monokai_sublime.css"; // Hack the favicon into the build directory. // This _places_ it in build output. diff --git a/package.json b/package.json index 7287ed2..0cd62e2 100644 --- a/package.json +++ b/package.json @@ -15,25 +15,24 @@ "author": "", "license": "", "dependencies": { - "alt": "^0.17.1", + "alt": "0.16.10", "autoprefixer-core": "^5.2.1", "babel": "^5.8.21", "babel-core": "^5.8.22", "babel-loader": "^5.3.2", "css-loader": "^0.15.6", "file-loader": "^0.8.4", - "highlight.js": "^8.7.0", - "hjs-webpack": "^2.12.2", + "hjs-webpack": "2.8.1", "json-loader": "^0.5.2", "normalize.css": "^3.0.3", "postcss-loader": "^0.5.1", "raw-loader": "^0.5.1", - "react": "^0.13.3", + "react": "0.13.3", "react-hot-loader": "^1.2.8", - "react-router": "^1.0.0-beta2", - "spectacle": "0.0.5", - "style-loader": "^0.12.3", - "stylus-loader": "^1.2.1", + "react-router": "1.0.0-beta2", + "spectacle": "0.0.9", + "style-loader": "0.12.3", + "stylus-loader": "1.2.1", "url-loader": "^0.5.6", "webpack": "^1.11.0", "yeticss": "^7.0.3" diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 074234c..e5999f8 100644 --- a/presentation/deck.jsx +++ b/presentation/deck.jsx @@ -25,10 +25,6 @@ const images = { preloader([images.city]); -// Themes -// ------ -import theme from "../themes/formidable/index"; - // Components // ---------- // A meaningful "point" in text. @@ -115,26 +111,26 @@ export default class extends React.Component { * Title * --------------------------------------------------------------- */} - + Wrangling - + Large Scale - + Frontend Web Applications
- + @ryan_roemer + textColor="darkerGray"> | - + surge2015.formidablelabs.com @@ -202,13 +198,13 @@ export default class extends React.Component { */} - + Lots of JavaScript - + In the browser - + Written by large teams @@ -371,7 +367,7 @@ export default class extends React.Component { - + Wrangling Adventures diff --git a/themes/formidable/index.css b/themes/formidable/index.css index f1c28e9..f4a39f9 100644 --- a/themes/formidable/index.css +++ b/themes/formidable/index.css @@ -1,3 +1,15 @@ +* { + box-sizing: inherit; +} + +html, body { + box-sizing: border-box; + margin: 0; + padding: 0; + height: 100%; + width: 100%; +} + .spectacle-slide { border-top: 2px solid #c23b33; -webkit-transform-origin: center center; diff --git a/themes/formidable/index.js b/themes/formidable/index.js index fa28d13..e3d58ef 100644 --- a/themes/formidable/index.js +++ b/themes/formidable/index.js @@ -62,5 +62,6 @@ theme.components.heading.h6.lineHeight = "1.2"; theme.components.link.color = colors.darkGray; theme.components.list.listStylePosition = "outside"; theme.components.text.color = colors.darkestGray; +theme.components.text.fontFamily = fonts.secondary; export default theme; diff --git a/themes/formidable/print.js b/themes/formidable/print.js index afb69f2..3b4ce96 100644 --- a/themes/formidable/print.js +++ b/themes/formidable/print.js @@ -1 +1,32 @@ -module.exports = require("spectacle/themes/default/print"); +import print from "spectacle/themes/default/print"; + +const colors = { + primary: "#000000", + secondary: "#000000", + tertiary: "#000000", + darkestGray: "#000000", + darkerGray: "#000000", + darkGray: "#000000", + gray: "#000000", + lightGray: "#000000", + lighterGray: "#000000", + lightestGray: "#000000", + darkRed: "#c23b33", + red: "#ca5144", + lightRed: "#000000", + lighterRed: "#000000", + lightestRed: "#000000" +}; + +const fonts = { + primary: "'Poppins', 'Futura', 'Century Gothic', 'Trebuchet MS', Helvetica, sans-serif", + secondary: "'Open Sans', 'Helvetica Neue', Helvetica, sans-serif", + tertiary: "'Anonymous Pro', Inconsolata, monospace" +}; + +print.colors = colors; +print.fonts = fonts; +print.global.body.fontFamily = fonts.primary; +print.global.body.color = colors.primary; + +export default print;