From a2167f2c09c97def3ebd5ab7d47aa93c457a881d Mon Sep 17 00:00:00 2001 From: Joe Alterio Date: Wed, 17 Apr 2019 14:36:45 -0700 Subject: [PATCH 1/3] Logo updates --- src/static/svgs/logo_formidable_dark.svg | 74 +++++++++++++++-------- src/static/svgs/logo_formidable_white.svg | 56 ++++++++++++++++- 2 files changed, 103 insertions(+), 27 deletions(-) diff --git a/src/static/svgs/logo_formidable_dark.svg b/src/static/svgs/logo_formidable_dark.svg index 3c074ed53f..dbd1a79809 100644 --- a/src/static/svgs/logo_formidable_dark.svg +++ b/src/static/svgs/logo_formidable_dark.svg @@ -1,26 +1,48 @@ - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/static/svgs/logo_formidable_white.svg b/src/static/svgs/logo_formidable_white.svg index ecd148150c..9bd9f70d80 100644 --- a/src/static/svgs/logo_formidable_white.svg +++ b/src/static/svgs/logo_formidable_white.svg @@ -1 +1,55 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + From c6186dd95033c51205b7c2bfc2842200870d88fe Mon Sep 17 00:00:00 2001 From: boygirl Date: Wed, 17 Apr 2019 18:18:30 -0700 Subject: [PATCH 2/3] add inline width and height --- src/static/svgs/logo_formidable_dark.svg | 2 +- src/static/svgs/logo_formidable_white.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/svgs/logo_formidable_dark.svg b/src/static/svgs/logo_formidable_dark.svg index dbd1a79809..c638e42afb 100644 --- a/src/static/svgs/logo_formidable_dark.svg +++ b/src/static/svgs/logo_formidable_dark.svg @@ -1,7 +1,7 @@ + width="150px" height="32px" viewBox="0 0 150 32" style="enable-background:new 0 0 150 32;" xml:space="preserve"> diff --git a/src/static/svgs/logo_formidable_white.svg b/src/static/svgs/logo_formidable_white.svg index 9bd9f70d80..bc3d2da903 100644 --- a/src/static/svgs/logo_formidable_white.svg +++ b/src/static/svgs/logo_formidable_white.svg @@ -1,7 +1,7 @@ + width="150" height="32" viewBox="0 0 150 32" style="enable-background:new 0 0 150 32;" xml:space="preserve"> From b00a831d3e00d75403f64e8cd3fe648c570b6038 Mon Sep 17 00:00:00 2001 From: boygirl Date: Wed, 17 Apr 2019 18:20:05 -0700 Subject: [PATCH 3/3] remove unused formidable-landers dep --- package.json | 1 - yarn.lock | 28 +--------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/package.json b/package.json index 5836dae77e..f7a09bd010 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "chokidar": "2.0.3", "classnames": "^2.2.6", "exenv": "^1.2.2", - "formidable-landers": "^8.4.0", "gray-matter": "^3.1.1", "history": "^4.7.2", "htmr": "0.6.3", diff --git a/yarn.lock b/yarn.lock index 7401b26a11..3f6b394371 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2597,14 +2597,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.0: - version "15.6.3" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - create-react-context@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" @@ -3940,7 +3932,7 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" -fbjs@^0.8.0, fbjs@^0.8.9: +fbjs@^0.8.0: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" dependencies: @@ -4150,14 +4142,6 @@ format@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" -formidable-landers@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/formidable-landers/-/formidable-landers-8.4.0.tgz#ca6643881289d36a1a661af5935043dbf5927d68" - dependencies: - prop-types "^15.5.8" - react "^15.6.1" - react-side-effect "^1.1.5" - forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" @@ -7688,16 +7672,6 @@ react-universal-component@^2.8.1: hoist-non-react-statics "^2.2.1" prop-types "^15.5.10" -react@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" - dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" - loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" - react@^16, react@^16.7.0: version "16.8.6" resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"