@ryan_roemer diff --git a/themes/formidable/html.js b/themes/formidable/html.js index 64e78b0..4efa430 100644 --- a/themes/formidable/html.js +++ b/themes/formidable/html.js @@ -1,22 +1,25 @@ /*eslint-disable max-len, indent*/ module.exports = function (data) { + + const html = [ + "", + "", + "", + "", + "", + "", + "", + ((data.css && /\.css$/.test(data.css)) ? "" : ""), + "", + "", + "

", + (data.main ? "" : ""), + "", + "" + ].join(""); + return { - "200.html": data.defaultTemplate(), - "index.html": [ - "", - "", - "", - "", - "", - "", - "", - ((data.css && /\.css$/.test(data.css)) ? "" : ""), - "", - "", - "

", - (data.main ? "" : ""), - "", - "" - ].join("") + "200.html": html, + "index.html": html }; }; diff --git a/webpack.config.js b/webpack.config.js index 1c46973..927412e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,10 +12,11 @@ var webpackConfig = module.exports = getConfig({ }); // Source maps mess up CSS in dev and the `data.css` thing is generally borked. +// // See: https://github.com/FormidableLabs/spectacle/issues/50 -webpackConfig.output.cssFilename = null; -webpackConfig.devtool = "eval-source-map"; +webpackConfig.devtool = "source-map"; +// Hack the JS loader at known zeroeth slot. webpackConfig.module.loaders[0] = { test: /\.jsx?$/, include: [ From c5e9ab8ad2e1eafd1a1b2be755ae03a821c45c3f Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 18 Aug 2015 22:13:04 -0700 Subject: [PATCH 4/5] Add favicon --- assets/img/favicon.ico | Bin 0 -> 1150 bytes index.jsx | 5 +++++ presentation/deck.jsx | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 assets/img/favicon.ico diff --git a/assets/img/favicon.ico b/assets/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..cca60a4f4a2d0c1afa66e4ed170b0baea0420f4e GIT binary patch literal 1150 zcmchXK?=e^3`M`-&P{P4-6;jZy6{{cuDjmFm6zxVV$$-5G>o(z(3U@8GQ6Km3I%rh zRuy!;;JF7*0B$NxX=ci60QBs5m^AKnX`8oro$Hq@seKHR6nOL6%HOZO@L6K*Jk_>7 zwBEn@Sq}yEf61?zqs=SLF!aBcPac5>Ix&6wj>dV#@5jDMc|Y5nhp#=}A@tAtTg>s6 f^B%E(&)Z#c9-gNk=jLOMWsV-)Z;j;nA1I9<2Ub&3 literal 0 HcmV?d00001 diff --git a/index.jsx b/index.jsx index c9b72a5..4e9806b 100644 --- a/index.jsx +++ b/index.jsx @@ -20,6 +20,11 @@ import "normalize.css"; import "./themes/formidable/index.css"; import "highlight.js/styles/monokai_sublime.css"; +// Hack the favicon into the build directory. +// This _places_ it in build output. +// See: https://github.com/HenrikJoreteg/hjs-webpack/issues/24 +import "file?name=favicon.ico!./assets/img/favicon.ico"; + // Flux const flux = new Flux(); diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 5e32aa6..9d898a6 100644 --- a/presentation/deck.jsx +++ b/presentation/deck.jsx @@ -25,7 +25,7 @@ preloader([images.city]); const styles = { textShadowBlackOutline: ((s, c) => { return `-${s} 0 ${c}, 0 ${s} ${c}, ${s} 0 ${c}, 0 -${s} ${c}`; - }("0.025em", "#777")) + }("0.025em", "#ccc")) }; // Presentation From a3a9aa20b83fbe546f73571e6ff30b9106467096 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 18 Aug 2015 22:31:22 -0700 Subject: [PATCH 5/5] More styling, etc. --- presentation/deck.jsx | 23 ++++++++++++++--------- themes/formidable/index.js | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 9d898a6..0897746 100644 --- a/presentation/deck.jsx +++ b/presentation/deck.jsx @@ -13,7 +13,8 @@ import { import preloader from "spectacle/src/utils/preloader"; const images = { - polygon: require("../assets/img/polygons.svg"), + polygons: require("../assets/img/polygons.svg"), + polygonsGray: require("../assets/img/polygons-gray.svg"), city: require("spectacle/presentation/city.jpg"), logo: require("spectacle/presentation/formidable-logo.svg") }; @@ -23,6 +24,9 @@ preloader([images.city]); // Styles // ------ const styles = { + title: { + secondary: "#dcb" + }, textShadowBlackOutline: ((s, c) => { return `-${s} 0 ${c}, 0 ${s} ${c}, ${s} 0 ${c}, 0 -${s} ${c}`; }("0.025em", "#ccc")) @@ -34,27 +38,28 @@ export default class extends React.Component { render() { return ( - + Wrangling - + Large Scale Frontend Web Applications -

- + @ryan_roemer - | + + | + - + surge2015.formidablelabs.com diff --git a/themes/formidable/index.js b/themes/formidable/index.js index 9699e70..7643da2 100644 --- a/themes/formidable/index.js +++ b/themes/formidable/index.js @@ -1,7 +1,7 @@ import theme from "spectacle/themes/default/index"; const colors = { - primary: "rgb(229, 44, 63)", + primary: "#d71920", // Lighter: "rgb(229, 44, 63)", secondary: "black", tertiary: "white" };