From dffa8cedef102867e66960266dfcd43cca3a844f Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Thu, 10 Sep 2015 14:33:32 -0700 Subject: [PATCH 1/8] Do not import theme into deck. It will override the print theme. --- presentation/deck.jsx | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 074234c..73c56e7 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,13 +111,13 @@ export default class extends React.Component { * Title * --------------------------------------------------------------- */} - + Wrangling - + Large Scale - + Frontend Web Applications
@@ -131,7 +127,7 @@ export default class extends React.Component { + textColor="darkerGray"> | @@ -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 From 297ed35da10db1efe4fca8414de48483d22d7e76 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Thu, 10 Sep 2015 14:51:24 -0700 Subject: [PATCH 2/8] Overwrite colors and fonts from default print styles. --- themes/formidable/print.js | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) 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; From 8507068e23adecaf67c914d0eeba132fda612379 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Fri, 11 Sep 2015 09:53:14 -0700 Subject: [PATCH 3/8] Pull latest spectacle (& match its deps) to resolve text fitting. --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7287ed2..c3a88fb 100644 --- a/package.json +++ b/package.json @@ -15,25 +15,25 @@ "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", + "highlight.js": "8.6.0", + "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.8", + "style-loader": "0.12.3", + "stylus-loader": "1.2.1", "url-loader": "^0.5.6", "webpack": "^1.11.0", "yeticss": "^7.0.3" From 03b8ef84bbbf803a8f70f97493a3bb8f88ba6204 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Fri, 11 Sep 2015 11:02:31 -0700 Subject: [PATCH 4/8] Override default Text font. --- presentation/deck.jsx | 10 +++++----- themes/formidable/index.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 73c56e7..e5999f8 100644 --- a/presentation/deck.jsx +++ b/presentation/deck.jsx @@ -111,17 +111,17 @@ export default class extends React.Component { * Title * --------------------------------------------------------------- */} - + Wrangling - + Large Scale - + Frontend Web Applications
- + @ryan_roemer @@ -130,7 +130,7 @@ export default class extends React.Component { textColor="darkerGray"> | - + surge2015.formidablelabs.com 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; From 30c695d74905023a05b2d73300c599aec1e675eb Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Fri, 11 Sep 2015 12:42:52 -0700 Subject: [PATCH 5/8] Extract code snippet. Add css for slides. --- presentation/deck.example | 10 ++++++++++ presentation/deck.jsx | 11 +---------- themes/formidable/index.css | 12 ++++++++++++ 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 presentation/deck.example diff --git a/presentation/deck.example b/presentation/deck.example new file mode 100644 index 0000000..afb03c3 --- /dev/null +++ b/presentation/deck.example @@ -0,0 +1,10 @@ +return( +