From d4e8708046332bf71111c0e2f7ce7c5746a5b75e Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Fri, 3 Jul 2020 20:17:36 -0700 Subject: [PATCH] Remove message about BLM --- packages/webamp/demo/css/page.css | 2 +- packages/webamp/demo/index.html | 126 ++++++++++-------------------- packages/webamp/demo/js/config.ts | 5 +- packages/webamp/demo/js/index.js | 10 +-- 4 files changed, 45 insertions(+), 98 deletions(-) diff --git a/packages/webamp/demo/css/page.css b/packages/webamp/demo/css/page.css index 895bffa3..55dc701b 100644 --- a/packages/webamp/demo/css/page.css +++ b/packages/webamp/demo/css/page.css @@ -1,6 +1,6 @@ /* Rules for the page layout */ body { - background-color: black; + background-color: rgb(58, 110, 165); font-family: arial; font-size: 15px; } diff --git a/packages/webamp/demo/index.html b/packages/webamp/demo/index.html index d332e7ba..00a4071c 100755 --- a/packages/webamp/demo/index.html +++ b/packages/webamp/demo/index.html @@ -1,115 +1,69 @@ - + + Webamp · Winamp 2 in your browser - + - + - - - + + + - + - + - + - -
- + +
+
-
-

Your browser does not support the features we need.

-

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

+
+

Your browser does not support the features we need.

+

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

-
-

Black Lives Matter

-

- Donate to organizations fighting against racism and police - brutality -

-
-

- - - - - - - - - +

+ + + + + + + + +

- + + diff --git a/packages/webamp/demo/js/config.ts b/packages/webamp/demo/js/config.ts index ae37da99..3592ebec 100644 --- a/packages/webamp/demo/js/config.ts +++ b/packages/webamp/demo/js/config.ts @@ -33,10 +33,7 @@ if ("URLSearchParams" in window) { SHOW_DESKTOP_ICONS = Boolean(params.get("icons")); } -export const skinUrl = - config.skinUrl === undefined - ? "https://s3.amazonaws.com/webamp-uploaded-skins/skins/e56349b6cedc3ddad73dcfba9405aba7.wsz" - : config.skinUrl; +export const skinUrl = config.skinUrl === undefined ? null : config.skinUrl; // https://freemusicarchive.org/music/netBloc_Artists/netBloc_Vol_24_tiuqottigeloot/ const album = "netBloc Vol. 24: tiuqottigeloot"; diff --git a/packages/webamp/demo/js/index.js b/packages/webamp/demo/js/index.js index 2a8878a9..43461184 100644 --- a/packages/webamp/demo/js/index.js +++ b/packages/webamp/demo/js/index.js @@ -112,14 +112,10 @@ async function main() { let __butterchurnOptions = null; let __initialWindowLayout = null; if (isButterchurnSupported()) { - const params = new URLSearchParams(location.search); - const butterchurnPresetUrlParam = params.get("butterchurnPresetUrl"); - const startWithMilkdropHidden = - butterchurnPresetUrlParam == null && - (document.body.clientWidth < MIN_MILKDROP_WIDTH || - skinUrl != null || - screenshot); + document.body.clientWidth < MIN_MILKDROP_WIDTH || + skinUrl != null || + screenshot; __butterchurnOptions = getButterchurnOptions(startWithMilkdropHidden);