diff --git a/web/css/main.css b/web/css/main.css index 9b9e8ebb..294a800e 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -31,20 +31,10 @@ body { margin-right: -50%; transform: translate(-50%, -50%); - background-image: url('/static/img/ui/bg.png'); - background-repeat: no-repeat; - background-size: 100% 100%; -} - -#ui-emulator-bg { - width: 100%; - height: 100%; - display: block; - position: absolute; - - background-image: url('/static/img/ui/bg.png'); + background-image: url('/static/img/ui/bg.jpg'); background-repeat: no-repeat; background-size: 100% 100%; + border-radius: 22px; } #help-overlay { diff --git a/web/css/ui.css b/web/css/ui.css index 227a6ec2..41f70879 100644 --- a/web/css/ui.css +++ b/web/css/ui.css @@ -139,8 +139,6 @@ z-index: 1; position: relative; - opacity: .95; - cursor: default; } diff --git a/web/img/background.jpg b/web/img/background.jpg index 68df6eec..1f726014 100644 Binary files a/web/img/background.jpg and b/web/img/background.jpg differ diff --git a/web/img/help_overlay.png b/web/img/help_overlay.png index 20c006d2..256d3237 100644 Binary files a/web/img/help_overlay.png and b/web/img/help_overlay.png differ diff --git a/web/img/screen_background5.png b/web/img/screen_background5.png index 6222bea8..f1017218 100644 Binary files a/web/img/screen_background5.png and b/web/img/screen_background5.png differ diff --git a/web/img/ui/FramePlayerIndex.png b/web/img/ui/FramePlayerIndex.png index c8a78a86..e94dac7b 100644 Binary files a/web/img/ui/FramePlayerIndex.png and b/web/img/ui/FramePlayerIndex.png differ diff --git a/web/img/ui/FrameTEXT.png b/web/img/ui/FrameTEXT.png index 185fe2e2..a08997da 100644 Binary files a/web/img/ui/FrameTEXT.png and b/web/img/ui/FrameTEXT.png differ diff --git a/web/img/ui/Help.png b/web/img/ui/Help.png index bb9d072a..d999f7c6 100644 Binary files a/web/img/ui/Help.png and b/web/img/ui/Help.png differ diff --git a/web/img/ui/bg.png b/web/img/ui/bg.png deleted file mode 100644 index c87100fe..00000000 Binary files a/web/img/ui/bg.png and /dev/null differ diff --git a/web/img/ui/bong full.png b/web/img/ui/bong full.png index 8304178e..d31d7afa 100644 Binary files a/web/img/ui/bong full.png and b/web/img/ui/bong full.png differ diff --git a/web/img/ui/bong.png b/web/img/ui/bong.png index b9e2d473..34894842 100644 Binary files a/web/img/ui/bong.png and b/web/img/ui/bong.png differ diff --git a/web/img/ui/bt A.png b/web/img/ui/bt A.png index 63c644c2..9b01b8d9 100644 Binary files a/web/img/ui/bt A.png and b/web/img/ui/bt A.png differ diff --git a/web/img/ui/bt B.png b/web/img/ui/bt B.png index 7458ebd1..4ec8a616 100644 Binary files a/web/img/ui/bt B.png and b/web/img/ui/bt B.png differ diff --git a/web/img/ui/bt LOAD.png b/web/img/ui/bt LOAD.png index 0e999820..074cdb5d 100644 Binary files a/web/img/ui/bt LOAD.png and b/web/img/ui/bt LOAD.png differ diff --git a/web/img/ui/bt MOVE EMPTY.png b/web/img/ui/bt MOVE EMPTY.png index 2a40d66f..533de364 100644 Binary files a/web/img/ui/bt MOVE EMPTY.png and b/web/img/ui/bt MOVE EMPTY.png differ diff --git a/web/img/ui/bt MOVE.png b/web/img/ui/bt MOVE.png index d05cd3b8..bf51d4df 100644 Binary files a/web/img/ui/bt MOVE.png and b/web/img/ui/bt MOVE.png differ diff --git a/web/img/ui/bt OPTIONS.png b/web/img/ui/bt OPTIONS.png index 15390f4b..24b4618d 100644 Binary files a/web/img/ui/bt OPTIONS.png and b/web/img/ui/bt OPTIONS.png differ diff --git a/web/img/ui/bt PlayerIndex.png b/web/img/ui/bt PlayerIndex.png index c4453680..f3973dc8 100644 Binary files a/web/img/ui/bt PlayerIndex.png and b/web/img/ui/bt PlayerIndex.png differ diff --git a/web/img/ui/bt QUIT.png b/web/img/ui/bt QUIT.png index 86f2d0e0..62878bc3 100644 Binary files a/web/img/ui/bt QUIT.png and b/web/img/ui/bt QUIT.png differ diff --git a/web/img/ui/bt REC.png b/web/img/ui/bt REC.png index 8d66855c..c4f0c69b 100644 Binary files a/web/img/ui/bt REC.png and b/web/img/ui/bt REC.png differ diff --git a/web/img/ui/bt SAVE.png b/web/img/ui/bt SAVE.png index 0e8bb08e..9db4f68a 100644 Binary files a/web/img/ui/bt SAVE.png and b/web/img/ui/bt SAVE.png differ diff --git a/web/img/ui/bt SELECT.png b/web/img/ui/bt SELECT.png index 12ced4c4..d9006eac 100644 Binary files a/web/img/ui/bt SELECT.png and b/web/img/ui/bt SELECT.png differ diff --git a/web/img/ui/bt SHARE.png b/web/img/ui/bt SHARE.png index 60691834..89db69de 100644 Binary files a/web/img/ui/bt SHARE.png and b/web/img/ui/bt SHARE.png differ diff --git a/web/img/ui/bt START.png b/web/img/ui/bt START.png index 88e2f850..896ab8b5 100644 Binary files a/web/img/ui/bt START.png and b/web/img/ui/bt START.png differ diff --git a/web/img/ui/bt X.png b/web/img/ui/bt X.png index f1631c12..d3fbf8f0 100644 Binary files a/web/img/ui/bt X.png and b/web/img/ui/bt X.png differ diff --git a/web/img/ui/bt Y.png b/web/img/ui/bt Y.png index 6da62c85..e0e7335d 100644 Binary files a/web/img/ui/bt Y.png and b/web/img/ui/bt Y.png differ diff --git a/web/img/ui/frame.png b/web/img/ui/frame.png index f48c5129..3cec1c88 100644 Binary files a/web/img/ui/frame.png and b/web/img/ui/frame.png differ diff --git a/web/js/gui/gui.js b/web/js/gui/gui.js index 361fe72b..0d14ebff 100644 --- a/web/js/gui/gui.js +++ b/web/js/gui/gui.js @@ -43,7 +43,7 @@ const gui = (() => { return el; } - const panel = (root, title = '', cc = '', content, buttons = []) => { + const panel = (root, title = '', cc = '', content, buttons = [], onToggle) => { const state = { shown: false, loading: false, @@ -99,6 +99,9 @@ const gui = (() => { function toggle(show) { state.shown = show; + if (onToggle) { + onToggle(state.shown, _root) + } if (state.shown) { gui.show(_root); } else { diff --git a/web/js/workerManager.js b/web/js/workerManager.js index 4601530e..d8fe4d18 100644 --- a/web/js/workerManager.js +++ b/web/js/workerManager.js @@ -7,13 +7,19 @@ const workerManager = (() => { _class = 'server-list', trigger = document.getElementById('w'), panel = gui.panel(document.getElementById(id), 'WORKERS', 'server-list', null, [ - { - caption: '⟳', - cl: ['bold'], - handler: utils.debounce(handleReload, 1000), - title: 'Reload server data', - } - ]), + { + caption: '⟳', + cl: ['bold'], + handler: utils.debounce(handleReload, 1000), + title: 'Reload server data', + } + ], + // hack not transparent jpeg corners :_; + ((br) => (state, el) => { + state ? el.parentElement.style.borderRadius = '0px' : + br ? el.parentElement.style.borderRadius = br : + br = window.getComputedStyle(el.parentElement).borderRadius + })()), index = ((i = 1) => ({v: () => i++, r: () => i = 1}))(), // caption -- the field caption // renderer -- an arbitrary DOM output for the field