diff --git a/changelog.md b/changelog.md index 6ed1bda..ffb3b60 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # The Modding Tree changelog: +### v2.2.3 - +- Button nodes now work as side "layers". + ### v2.2.2 - 11/22/20 - Fixed right half of the screen being unclickable in some circumstances. - Fixed tree branches being offset. diff --git a/demo.html b/demo.html index ea72517..8339bdd 100644 --- a/demo.html +++ b/demo.html @@ -60,7 +60,7 @@
-
+
diff --git a/index.html b/index.html index a7cfa30..0c5985a 100644 --- a/index.html +++ b/index.html @@ -60,7 +60,7 @@
-
+
diff --git a/js/Demo/demoTree.js b/js/Demo/demoTree.js index 7659b5c..088c35f 100644 --- a/js/Demo/demoTree.js +++ b/js/Demo/demoTree.js @@ -37,7 +37,7 @@ addNode("h", { layerShown: true, tooltip: "Restore your points to 10", tooltipLocked: "Restore your points to 10", - + row: "side", canClick() {return player.points.lt(10)}, onClick() {player.points = new Decimal(10)} }, diff --git a/js/components.js b/js/components.js index dbd4d80..760d612 100644 --- a/js/components.js +++ b/js/components.js @@ -372,9 +372,8 @@ function loadVue() { props: ['layer', 'data'], template: `
-
- - + +
@@ -399,8 +398,7 @@ function loadVue() { // SYSTEM COMPONENTS Vue.component('tab-buttons', systemComponents['tab-buttons']) - Vue.component('button-node', systemComponents['button-node']) - Vue.component('layer-node', systemComponents['layer-node']) + Vue.component('tree-node', systemComponents['tree-node']) Vue.component('layer-tab', systemComponents['layer-tab']) Vue.component('overlay-head', systemComponents['overlay-head']) Vue.component('info-tab', systemComponents['info-tab']) diff --git a/js/technical/systemComponents.js b/js/technical/systemComponents.js index ab71ec3..6604b26 100644 --- a/js/technical/systemComponents.js +++ b/js/technical/systemComponents.js @@ -10,64 +10,45 @@ var systemComponents = { ` }, - 'button-node': { + 'tree-node': { props: ['layer', 'abb', 'size'], template: ` - ` - }, - 'layer-node': { - props: ['layer', 'abb', 'size'], - template: ` - ` }, + 'layer-tab': { props: ['layer', 'back', 'spacing'], diff --git a/style.css b/style.css index bc74b1a..995a884 100644 --- a/style.css +++ b/style.css @@ -97,16 +97,7 @@ h1, h2, h3, b, input { .smallNode { height: 60px; width: 60px; - border: var(--hqProperty1); - border-color: rgba(0, 0, 0, 0.125); - border-radius: 50%; - box-shadow: var(--hqProperty2a), var(--hqProperty2b); font-size: 30px; - font-family: "Lucida Console", "Courier New", monospace; - color: rgba(0, 0, 0, 0.5); - text-shadow: var(--hqProperty3); - padding: 0; - }