Artboard 1

From 15c78b83150e3441884ed98da4a9a4c84716701a Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Wed, 2 Sep 2015 14:23:20 -0700 Subject: [PATCH 1/6] Add rebranded assets and logos. --- .../img/bg/formidable/formidangles-dark.svg | 1113 +++++++++++++++++ assets/img/bg/formidable/polygons-gray.svg | 563 --------- assets/img/bg/formidable/polygons.svg | 1 - assets/img/logo/formidable-black.svg | 37 + assets/img/logo/formidable-red.svg | 37 + assets/img/logo/formidable-square.png | Bin 12937 -> 0 bytes assets/img/logo/formidable-text.svg | 1 - 7 files changed, 1187 insertions(+), 565 deletions(-) create mode 100644 assets/img/bg/formidable/formidangles-dark.svg delete mode 100644 assets/img/bg/formidable/polygons-gray.svg delete mode 100644 assets/img/bg/formidable/polygons.svg create mode 100644 assets/img/logo/formidable-black.svg create mode 100644 assets/img/logo/formidable-red.svg delete mode 100644 assets/img/logo/formidable-square.png delete mode 100644 assets/img/logo/formidable-text.svg 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 19229ede4d79509431c6ecb38818edf54e0d70cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12937 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 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 From c1e9ebe5217b59bbf67649437040d5341993e52c Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Wed, 2 Sep 2015 14:23:45 -0700 Subject: [PATCH 2/6] Add Open Sans and Poppins fonts. --- themes/formidable/html.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) ? "" : ""), "", "", From f5675e1b79a442ce3d401c5bbc8f1b3568cc7a27 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Wed, 2 Sep 2015 14:23:59 -0700 Subject: [PATCH 3/6] Add hover states, top border, and emphasis styles. --- themes/formidable/index.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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; } From 2f907fe0591064619f5a3acfc9737ffc1aeb5a33 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Wed, 2 Sep 2015 14:24:17 -0700 Subject: [PATCH 4/6] Use brand colors for theme. --- themes/formidable/index.js | 46 +++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 8 deletions(-) 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; - From 99b76356885b86044a143fad4accded1dca90745 Mon Sep 17 00:00:00 2001 From: Paula Lavalle Date: Wed, 2 Sep 2015 14:24:39 -0700 Subject: [PATCH 5/6] Tweak slides to new theme. --- presentation/deck.jsx | 66 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 1f06876..45f6d3f 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 - - + +
@@ -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,12 @@ export default class extends React.Component { {/* --------------------------------------------------------------- * Thanks * --------------------------------------------------------------- */} - - + + Thanks! - + From 23c07f1cf7e12f31609ea7c00192d27e672dee82 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Thu, 3 Sep 2015 20:29:32 +0200 Subject: [PATCH 6/6] Fix lint. --- presentation/deck.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/deck.jsx b/presentation/deck.jsx index 45f6d3f..074234c 100644 --- a/presentation/deck.jsx +++ b/presentation/deck.jsx @@ -181,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. @@ -830,7 +830,8 @@ export default class extends React.Component { * Thanks * --------------------------------------------------------------- */} - + Thanks!