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 00000000..b47cef1b Binary files /dev/null and b/images/share/butterchurn-bg.png differ 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"