From 08db55b26638c57e198a41a804719c8e49c12d3c Mon Sep 17 00:00:00 2001 From: DCoded <dicoded@email.com> Date: Fri, 20 Aug 2021 20:08:03 -0400 Subject: [PATCH] Combined controls and name --- css/general/layout.css | 8 ++++++++ src/interaction/siNavigation.js | 29 +++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/css/general/layout.css b/css/general/layout.css index 73a73efdb57..73ff3359168 100644 --- a/css/general/layout.css +++ b/css/general/layout.css @@ -75,3 +75,11 @@ div.grid-2columns-auto { margin-top: 1em; margin-bottom: 1em; } + +.space-evenly { + justify-content: space-evenly; +} + +.absolute { + position: absolute; +} diff --git a/src/interaction/siNavigation.js b/src/interaction/siNavigation.js index f36762e561f..c20b9097c6b 100644 --- a/src/interaction/siNavigation.js +++ b/src/interaction/siNavigation.js @@ -17,24 +17,33 @@ App.UI.SlaveInteract.navigation = function(slave) { } const placeInLine = App.UI.SlaveInteract.placeInLine(slave); - const controls = App.UI.DOM.appendNewElement("div", p); - const previous = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Prev ", "Slave Interact", - () => { V.AS = placeInLine[0]; }), ["adjacent-slave"]); - const next = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Next ", "Slave Interact", - () => { V.AS = placeInLine[1]; }), ["adjacent-slave"]); + const div = App.UI.DOM.appendNewElement("div", p, null); + const previous = App.UI.DOM.makeElement("span", null, ['adjacent-slave', 'margin-right']); + const next = App.UI.DOM.makeElement("span", null, ['adjacent-slave', 'margin-left']); + const name = App.UI.DOM.makeElement("h1", SlaveFullName(slave), ['slave-name']); + name.style.display = 'inline-block'; previous.id = "prev-slave"; next.id = "next-slave"; - controls.append( + previous.append( App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("prev-slave"), ['hotkey']), - previous, - App.UI.DOM.makeElement("span", App.UI.favoriteToggle(slave)), - next, + App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Prev ", "Slave Interact", + () => { V.AS = placeInLine[0]; }), + ), + ); + next.append( + App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Next ", "Slave Interact", + () => { V.AS = placeInLine[1]; }), ["adjacent-slave"]), App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("next-slave"), ['hotkey']), ); + name.append(` `, App.UI.DOM.makeElement("span", App.UI.favoriteToggle(slave))); - App.UI.DOM.appendNewElement("h1", p, SlaveFullName(slave), ['slave-name']); + div.append( + previous, + name, + next, + ); return p; }; -- GitLab