diff --git a/index.html b/index.html index bd2ee30..b988fde 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/public/favicon.ico b/public/favicon.ico index 342cf7c..bc7821d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/components/apps/logic-sim/CircuitView.module.css b/src/components/apps/logic-sim/CircuitView.module.css index 7881858..baa06ef 100644 --- a/src/components/apps/logic-sim/CircuitView.module.css +++ b/src/components/apps/logic-sim/CircuitView.module.css @@ -1,4 +1,9 @@ -.Canvas { +.Container { + display: flex; width: 100%; - height: 100%; + flex-grow: 1; +} + +.Canvas { + flex: 1; } \ No newline at end of file diff --git a/src/components/apps/logic-sim/CircuitView.tsx b/src/components/apps/logic-sim/CircuitView.tsx index 226b5d2..8a4cb56 100644 --- a/src/components/apps/logic-sim/CircuitView.tsx +++ b/src/components/apps/logic-sim/CircuitView.tsx @@ -28,6 +28,8 @@ export function CircuitView() { { circuit.addChip(ChipsManager.CHIPS.NOT); }}/> - +
+ +
; } \ No newline at end of file diff --git a/src/components/apps/logic-sim/LogicSim.module.css b/src/components/apps/logic-sim/LogicSim.module.css index 3b5120c..78096c5 100644 --- a/src/components/apps/logic-sim/LogicSim.module.css +++ b/src/components/apps/logic-sim/LogicSim.module.css @@ -1,4 +1,6 @@ .Container { + display: flex; + flex-direction: column; width: 100%; height: 100%; } \ No newline at end of file diff --git a/src/config/apps/logicSim.config.ts b/src/config/apps/logicSim.config.ts index 6507f14..1217de2 100644 --- a/src/config/apps/logicSim.config.ts +++ b/src/config/apps/logicSim.config.ts @@ -34,26 +34,26 @@ export const CHIP = { export const COLORS = { pin: { - fill: "dark-grey-b", - fillHover: "dark-grey-a" + fill: "black-4", + fillHover: "black-3" }, inputOutput: { - connector: "dark-grey-ca", - on: "red-b", - onHover: "red-a", - off: "dark-grey-d", - offHover: "dark-grey-ca", - stroke: "dark-grey-b" + stroke: "black-4", + connector: "black-3", + on: "red-0", + onHover: "red-0", + off: "red-2", + offHover: "red-1", }, background: { - outer: "dark-grey-e", - inner: "dark-grey-f", - border: "dark-grey-d", + border: "black-0", + inner: "black-1", + outer: "black-2", }, wire: { - placing: "dark-grey-ca", + placing: "black-1", }, chip: { - text: "dark-grey-f" + text: "black-4" } }; \ No newline at end of file diff --git a/src/features/apps/logic-sim/chip.ts b/src/features/apps/logic-sim/chip.ts index d4599b2..deb3b62 100644 --- a/src/features/apps/logic-sim/chip.ts +++ b/src/features/apps/logic-sim/chip.ts @@ -87,12 +87,12 @@ export class Chip { draw() { this.circuit.drawRect( - this.circuit.getColor(this.color + "-b"), + this.circuit.getColor(this.color + "-1"), this.position.x, this.position.y, this.size.x, this.size.y ); this.circuit.drawRect( - this.circuit.getColor(this.color + "-a"), + this.circuit.getColor(this.color + "-0"), this.position.x + CHIP.padding, this.position.y + CHIP.padding, this.size.x - CHIP.padding * 2, this.size.y - CHIP.padding * 2 ); diff --git a/src/features/apps/logic-sim/wire.ts b/src/features/apps/logic-sim/wire.ts index 4876205..fb0b4d0 100644 --- a/src/features/apps/logic-sim/wire.ts +++ b/src/features/apps/logic-sim/wire.ts @@ -42,11 +42,11 @@ export class Wire { let color: string; if (isPlacingWire) { - color = `${this.color}-b`; + color = `${this.color}-2`; } else if (this.state.value === 1) { - color = `${this.color}-a`; + color = `${this.color}-0`; } else { - color = `${this.color}-d`; + color = `${this.color}-2`; } this.circuit.drawLine(this.circuit.getColor(color), positions, WIRE.width); diff --git a/src/styles/global/variables.css b/src/styles/global/variables.css index 7f7f1f4..4c6851f 100644 --- a/src/styles/global/variables.css +++ b/src/styles/global/variables.css @@ -38,6 +38,8 @@ --white-0: #E5F2FF; --white-1: #A0A9B2; --white-2: #5C6166; + --white-3: #393C40; + --white-4: #222426; --black-0: #29343F; --black-1: #1E262E; @@ -84,3 +86,7 @@ --taskbar-button-hover-color: rgba(255, 255, 255, 5%); --taskbar-filter: blur(1rem); } + +@media screen and (max-width: 450px) { + /* Change --taskbar-height to 2.5rem using TS */ +} \ No newline at end of file