diff --git a/assets/img/bg/formidable/formidangles-dark.svg b/assets/img/bg/formidable/formidangles-dark.svg
new file mode 100644
index 0000000..1c99cc3
--- /dev/null
+++ b/assets/img/bg/formidable/formidangles-dark.svg
@@ -0,0 +1,1113 @@
+
+
+
+
diff --git a/assets/img/bg/formidable/polygons-gray.svg b/assets/img/bg/formidable/polygons-gray.svg
deleted file mode 100644
index f96ad5f..0000000
--- a/assets/img/bg/formidable/polygons-gray.svg
+++ /dev/null
@@ -1,563 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/img/bg/formidable/polygons.svg b/assets/img/bg/formidable/polygons.svg
deleted file mode 100644
index 5899873..0000000
--- a/assets/img/bg/formidable/polygons.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/assets/img/logo/formidable-black.svg b/assets/img/logo/formidable-black.svg
new file mode 100644
index 0000000..653d9ab
--- /dev/null
+++ b/assets/img/logo/formidable-black.svg
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/assets/img/logo/formidable-red.svg b/assets/img/logo/formidable-red.svg
new file mode 100644
index 0000000..5f0af4d
--- /dev/null
+++ b/assets/img/logo/formidable-red.svg
@@ -0,0 +1,37 @@
+
+
+
+
diff --git a/assets/img/logo/formidable-square.png b/assets/img/logo/formidable-square.png
deleted file mode 100644
index 19229ed..0000000
Binary files a/assets/img/logo/formidable-square.png and /dev/null differ
diff --git a/assets/img/logo/formidable-text.svg b/assets/img/logo/formidable-text.svg
deleted file mode 100644
index 93d292f..0000000
--- a/assets/img/logo/formidable-text.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/presentation/deck.jsx b/presentation/deck.jsx
index 1f06876..074234c 100644
--- a/presentation/deck.jsx
+++ b/presentation/deck.jsx
@@ -14,11 +14,9 @@ import {
import preloader from "spectacle/src/utils/preloader";
const images = {
- polygons: require("../assets/img/bg/formidable/polygons.svg"),
- polygonsGray: require("../assets/img/bg/formidable/polygons-gray.svg"),
- polygonsLight: require("../assets/img/bg/formidable/polygons-light.svg"),
- logoSquare: require("../assets/img/logo/formidable-square.png"),
- logoText: require("../assets/img/logo/formidable-text.svg"),
+ polygons: require("../assets/img/bg/formidable/formidangles-dark.svg"),
+ logoRed: require("../assets/img/logo/formidable-red.svg"),
+ logoBlack: require("../assets/img/logo/formidable-black.svg"),
wmHomepage: require("../assets/img/wml/screen-homepage.png"),
wmItem: require("../assets/img/wml/screen-item-ipad.png"),
wmReport: require("../assets/img/wml/report-homepage.png"),
@@ -116,31 +114,31 @@ export default class extends React.Component {
{/* ---------------------------------------------------------------
* Title
* --------------------------------------------------------------- */}
-
-
+
+
Wrangling
-
-
+
+
Large Scale
-
-
+
+
Frontend Web Applications
-
+
-
-
+
+
@ryan_roemer
-
-
+
+
+ textColor={theme.colors.darkerGray}>
|
-
-
+
+
surge2015.formidablelabs.com
-
-
+
+
@@ -183,7 +181,7 @@ export default class extends React.Component {
- Browser apps are now business critical.
+ Browser apps are now business critical
{/*
- The number of websites anywhere that you can turn off JS is decreasing rapidly.
@@ -204,13 +202,13 @@ export default class extends React.Component {
*/}
-
+
Lots of JavaScript
-
+
In the browser
-
+
Written by large teams
@@ -284,7 +282,7 @@ export default class extends React.Component {
50+ core frontend engineers
14 vertical teams / "tracks"
Multiple developing & integrating organizations
- Meta (JS,CSS,Java) teams
+ Meta (JS,CSS,Java) teams
@@ -369,16 +367,16 @@ export default class extends React.Component {
-
+
-
+
Wrangling Adventures
JavaScript lead for site / development teams
- Lead "Meta JS" team of 5-8 developers
+ Lead “Meta JS” team of 5-8 developers
Part of new core web team
{/*
@@ -666,7 +664,7 @@ export default class extends React.Component {
-
+
Challenges
@@ -704,7 +702,7 @@ export default class extends React.Component {
-
+
Wrangling
@@ -723,7 +721,7 @@ export default class extends React.Component {
-
+
Infrastructure
@@ -831,12 +829,13 @@ export default class extends React.Component {
{/* ---------------------------------------------------------------
* Thanks
* --------------------------------------------------------------- */}
-
-
+
+
Thanks!
-
+
diff --git a/themes/formidable/html.js b/themes/formidable/html.js
index 4efa430..b98848a 100644
--- a/themes/formidable/html.js
+++ b/themes/formidable/html.js
@@ -7,8 +7,8 @@ module.exports = function (data) {
"",
"",
"",
- "",
- "",
+ "",
+ "",
((data.css && /\.css$/.test(data.css)) ? "" : ""),
"",
"",
diff --git a/themes/formidable/index.css b/themes/formidable/index.css
index b0fc2aa..f1c28e9 100644
--- a/themes/formidable/index.css
+++ b/themes/formidable/index.css
@@ -1,4 +1,5 @@
.spectacle-slide {
+ border-top: 2px solid #c23b33;
-webkit-transform-origin: center center;
transform-origin: center center;
}
@@ -13,5 +14,10 @@ _:-moz-tree-row(hover), ul .appear {
}
.spectacle-slide em {
- color: #546A76; /* Dark Blue */
+ color: #898887;
+ font-style: normal;
+}
+
+a:hover {
+ color: #d36556 !important;
}
diff --git a/themes/formidable/index.js b/themes/formidable/index.js
index 8eb6d91..fa28d13 100644
--- a/themes/formidable/index.js
+++ b/themes/formidable/index.js
@@ -1,14 +1,28 @@
import theme from "spectacle/themes/default/index";
const colors = {
- primary: "white",
- secondary: "#333",
- tertiary: "#d71920", // Lighter: "rgb(229, 44, 63)",
- light: "#CEE0DC"
+ primary: "#FFFFFF",
+ secondary: "#232222",
+ tertiary: "#5e5c5c",
+ // brand colors:
+ darkestGray: "#232222",
+ darkerGray: "#363434",
+ darkGray: "#5e5c5c",
+ gray: "#898887",
+ lightGray: "#a09e9e",
+ lighterGray: "#cfcdcd",
+ lightestGray: "#e7e6e5",
+ darkRed: "#c23b33",
+ red: "#ca5144",
+ lightRed: "#d36556",
+ lighterRed: "#e89e90",
+ lightestRed: "#f3c4ba"
};
const fonts = {
- secondary: "Open Sans Condensed"
+ primary: "'Poppins', 'Futura', 'Century Gothic', 'Trebuchet MS', Helvetica, sans-serif",
+ secondary: "'Open Sans', 'Helvetica Neue', Helvetica, sans-serif",
+ tertiary: "'Anonymous Pro', Inconsolata, monospace"
};
// Light Blue: 88A0A8 (some headings)
@@ -18,8 +32,10 @@ const fonts = {
// TODO: Have overrides of `colors` and `fonts` to pass in to a function in
// spectacle itself.
theme.colors = colors;
+theme.fonts = fonts;
theme.global.body.background = colors.primary;
theme.global.body.color = colors.secondary;
+theme.global.body.fontFamily = fonts.secondary;
theme.progress.pacman.pacmanTop.background = colors.tertiary;
theme.progress.pacman.pacmanBottom.background = colors.tertiary;
theme.progress.pacman.point.borderColor = colors.tertiary;
@@ -28,9 +44,23 @@ theme.progress.number.container.color = colors.tertiary;
theme.components.quote.borderLeft = "1px solid " + colors.primary;
theme.components.quote.color = colors.primary;
theme.components.cite.color = colors.tertiary;
-theme.components.heading.h1.color = colors.tertiary;
+theme.components.code.color = colors.darkGray;
+theme.components.code.fontFamily = fonts.tertiary;
+theme.components.heading.h1.color = colors.secondary;
+theme.components.heading.h1.fontFamily = fonts.primary;
theme.components.heading.h2.color = colors.secondary;
-theme.components.heading.h3.fontFamily = fonts.secondary;
+theme.components.heading.h2.fontFamily = fonts.primary;
+theme.components.heading.h2.lineHeight = "1.2";
+theme.components.heading.h3.fontFamily = fonts.primary;
+theme.components.heading.h3.lineHeight = "1.2";
+theme.components.heading.h4.fontFamily = fonts.primary;
+theme.components.heading.h4.lineHeight = "1.2";
+theme.components.heading.h5.fontFamily = fonts.primary;
+theme.components.heading.h5.lineHeight = "1.2";
+theme.components.heading.h6.fontFamily = fonts.primary;
+theme.components.heading.h6.lineHeight = "1.2";
+theme.components.link.color = colors.darkGray;
+theme.components.list.listStylePosition = "outside";
+theme.components.text.color = colors.darkestGray;
export default theme;
-