From 1a4cda25d9ef9224242b34ff1ad84f20c27036f2 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Thu, 22 Dec 2022 21:03:22 -0600 Subject: [PATCH 1/2] Fix subtabs not scrolling --- src/features/tabs/TabFamily.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/features/tabs/TabFamily.vue b/src/features/tabs/TabFamily.vue index 1ae9007..e899549 100644 --- a/src/features/tabs/TabFamily.vue +++ b/src/features/tabs/TabFamily.vue @@ -135,10 +135,12 @@ export default defineComponent({ position: relative; border: solid 4px; border-color: var(--outline); + overflow-y: auto; } .layer-tab > .tab-family-container:first-child { margin: -4px -11px var(--feature-margin) -11px; + padding-bottom: 50px; } .layer-tab > .tab-family-container:first-child:nth-last-child(3) { From 9df82505fee9cc0c96952f25a94f4e9f541be037 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Thu, 22 Dec 2022 21:09:03 -0600 Subject: [PATCH 2/2] Implemented emanresu's images --- src/data/layers/factory.tsx | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index 60c9e53..b133888 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -38,18 +38,14 @@ import _metal from "../symbols/metal.png"; import _plastic from "../symbols/plastic.png"; import boxes from "./boxes"; import coal from "./coal"; -import { - default as _bear, - default as _circuitBoard, - default as _console, - default as _stuffing -} from "./factory-components/bear.svg"; -import { - default as _bearMaker, - default as _circuitBoardMaker, - default as _consoleMaker, - default as _stuffingMaker -} from "./factory-components/bearmaker.svg"; +import _bear from "./factory-components/bear.svg"; +import _bearMaker from "./factory-components/bearmaker.svg"; +import _stuffing from "./factory-components/stuffing.svg"; +import _console from "./factory-components/console.svg"; +import _circuitBoard from "./factory-components/circuit.svg"; +import _stuffingMaker from "./factory-components/stuffingmaker.svg"; +import _consoleMaker from "./factory-components/consolemaker.svg"; +import _circuitBoardMaker from "./factory-components/circuitmaker.svg"; import _block from "./factory-components/block.svg"; import _blockMaker from "./factory-components/blockmaker.svg"; import _bucket from "./factory-components/bucket.svg"; @@ -67,11 +63,10 @@ import _rotateLeft from "./factory-components/rotateLeft.svg"; import _rotateRight from "./factory-components/rotateRight.svg"; import _plankMaker from "./factory-components/sawmill.svg"; import _shed from "./factory-components/shed.svg"; -import { default as _button, default as _shovel } from "./factory-components/shovel.svg"; -import { - default as _buttonMaker, - default as _shovelMaker -} from "./factory-components/shovelmaker.svg"; +import _button from "./factory-components/button.svg"; +import _shovel from "./factory-components/shovel.svg"; +import _shovelMaker from "./factory-components/shovelmaker.svg"; +import _buttonMaker from "./factory-components/buttonmaker.svg"; import _thread from "./factory-components/thread.svg"; import _threadMaker from "./factory-components/threadmaker.svg"; import _truck from "./factory-components/truck.svg"; @@ -87,8 +82,8 @@ import trees from "./trees"; import workshop from "./workshop"; import paper from "./paper"; import metal from "./metal"; -import dyes from "./dyes" -import plastic from "./plastic" +import dyes from "./dyes"; +import plastic from "./plastic"; const id = "factory";