From fa420b38e52f7abf4fbdd86ce26fbb23b8e5c2dc Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sat, 13 Jun 2020 12:47:50 +0200
Subject: [PATCH] dividers are not italic
---
src/js/main.js | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/src/js/main.js b/src/js/main.js
index 2dea7157fec..4fb77bb5a05 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -217,35 +217,46 @@ App.MainView.full = function() {
const div = document.createElement("div");
div.append(App.UI.DOM.makeElement("span", "MAIN MENU", "name"));
- const span = document.createElement("span");
- span.classList.add("tab", "note");
- span.append(App.UI.DOM.passageLink("Summary Options", "Summary Options"));
+
+ App.UI.DOM.appendNewElement("span", div, App.UI.DOM.passageLink("Summary Options", "Summary Options"),
+ ["tab", "note"]);
if (V.rulesAssistantMain !== 0) {
+ div.append(" | ");
const raLink = document.createElement("span");
+ raLink.classList.add("note");
raLink.id = "RAButton";
- raLink.append(" | ", App.UI.DOM.passageLink("Rules Assistant Options", "Rules Assistant"),
- " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Rules Assistant"), ["clear-formatting", "hotkey"]));
- span.append(raLink);
+ raLink.append(App.UI.DOM.passageLink("Rules Assistant Options", "Rules Assistant"));
+ div.append(raLink, " ",
+ App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Rules Assistant"), "hotkey"));
+ div.append(" | ");
if (V.rulesAssistantAuto !== 1) {
- span.append(" | ", App.UI.DOM.passageLink("Apply Rules Assistant at week end", "Main", () => { V.rulesAssistantAuto = 1; }));
+ App.UI.DOM.appendNewElement("span", div,
+ App.UI.DOM.passageLink("Apply Rules Assistant at week end", "Main", () => {
+ V.rulesAssistantAuto = 1;
+ }), "note");
} else {
- span.append(" | ", App.UI.DOM.passageLink("Stop applying Rules Assistant at week end", "Main", () => { V.rulesAssistantAuto = 0; }));
+ App.UI.DOM.appendNewElement("span", div,
+ App.UI.DOM.passageLink("Stop applying Rules Assistant at week end", "Main", () => {
+ V.rulesAssistantAuto = 0;
+ }), "note");
}
- span.append(" | ");
+ div.append(" | ");
if (DefaultRulesError()) {
- span.append(App.UI.DOM.makeElement("span", "WARNING: One or more rules' custom conditions has errors!", "warning"));
+ App.UI.DOM.appendNewElement("span", div, "WARNING: One or more rules' custom conditions has errors!",
+ ["note", "warning"]);
}
- span.append(App.UI.DOM.passageLink("Re-apply Rules Assistant now (this will only check slaves in the Penthouse)", "Main", () => {
- for (const slave of V.slaves) {
- if (assignmentVisible(slave) && slave.useRulesAssistant === 1) {
- DefaultRules(slave);
- }
- }
- }));
+ App.UI.DOM.appendNewElement("span", div,
+ App.UI.DOM.passageLink("Re-apply Rules Assistant now (this will only check slaves in the Penthouse)",
+ "Main", () => {
+ for (const slave of V.slaves) {
+ if (assignmentVisible(slave) && slave.useRulesAssistant === 1) {
+ DefaultRules(slave);
+ }
+ }
+ }), "note");
}
- div.append(" ", span);
return div;
}
--
GitLab