From b36b12e4c752b5db5b0d7343d005a8994d4a7459 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Wed, 30 May 2018 14:39:20 -0700 Subject: [PATCH] Add butterchurn share link --- css/page.css | 22 +++++++++++----------- images/share/butterchurn-bg.png | Bin 0 -> 7289 bytes index.html | 13 +++++++++---- js/index.js | 2 ++ package.json | 4 ++-- yarn.lock | 13 ++++++------- 6 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 images/share/butterchurn-bg.png diff --git a/css/page.css b/css/page.css index 3785e6de..36800a5a 100644 --- a/css/page.css +++ b/css/page.css @@ -62,22 +62,22 @@ body { transform: scale(1.35); } -#twitter { - background-color: #1da1f2; +#twitter-share { + background-color: #1da1f2; } -#github { - background-color: #2d3238; +#github-share { + background-color: #2d3238; } -#mail { - background-color: #6a7788; +#mail-share { + background-color: #6a7788; } -#butterchurn { - /* - Some Butterchurn screenshot section - background-image: url(); - */ +#butterchurn-share { + display: none; /* Button is only shown if the window gets enabled */ + /* TODO: Figure out how to inline this */ + background-image: url(../images/share/butterchurn-bg.png); + background-size: 100%; /* Image is 2x size for retina displays */ } #app #loading { diff --git a/images/share/butterchurn-bg.png b/images/share/butterchurn-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..b47cef1b8ec7005c705ed0acfc066aad7c982e16 GIT binary patch literal 7289 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 Gh5SEZuQ|T} literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 742127de..469591f0 100755 --- a/index.html +++ b/index.html @@ -65,10 +65,15 @@

Try using the most recent version of Chrome, Firefox, Safari or Edge.

- - - - + + + + + + + + +

diff --git a/js/index.js b/js/index.js index da39fe4d..8689af2c 100644 --- a/js/index.js +++ b/js/index.js @@ -125,6 +125,8 @@ Raven.context(() => { playlist: { position: { x: 275, y: 0 }, size: [0, 8] }, milkdrop: { position: { x: 0, y: 232 } } }; + + document.getElementById("butterchurn-share").style.display = "flex"; } const initialSkin = !skinUrl ? null : { url: skinUrl }; diff --git a/package.json b/package.json index 0add4343..7fa498d9 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", "babel-runtime": "^6.26.0", - "butterchurn": "^2.3.2", - "butterchurn-presets": "^2.3.2", + "butterchurn": "^2.4.3", + "butterchurn-presets": "^2.4.1", "canvas-mock": "0.0.0", "cardinal-spline-js": "^2.3.6", "classnames": "^2.2.5", diff --git a/yarn.lock b/yarn.lock index 4f009ca2..e315b917 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1269,21 +1269,20 @@ builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" -butterchurn-presets@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.3.2.tgz#f04552913e7b499df113946fa8888c9f1661fa7e" +butterchurn-presets@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.4.1.tgz#cad3e94bf5665d65610bf336b57623616726bbe8" dependencies: babel-runtime "^6.26.0" ecma-proposal-math-extensions "0.0.2" lodash "^4.17.4" -butterchurn@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-2.3.2.tgz#78eb04e9ad805828e07792f2589a23efda04cb2d" +butterchurn@^2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-2.4.3.tgz#2dd90ba1bcbe8bd3908c3f053886d5f6bd92837a" dependencies: babel-runtime "^6.26.0" ecma-proposal-math-extensions "0.0.2" - lodash "^4.17.4" bytes@3.0.0: version "3.0.0"