From ae445245a7eee85053ddcc2131378ce624996a4f Mon Sep 17 00:00:00 2001 From: Nicole Rappe Date: Mon, 14 Apr 2025 23:19:24 -0600 Subject: [PATCH] Implemented Normalize.css --- Data/WebUI/src/App.jsx | 1 - Data/WebUI/src/Flow_Editor.jsx | 1 - Data/WebUI/src/index.js | 5 +++++ .../WebUI/src/nodes/Macro Automation/Node_Macro_KeyPress.jsx | 1 - Launch-Borealis.ps1 | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Data/WebUI/src/App.jsx b/Data/WebUI/src/App.jsx index 9c30cea..6cd4b11 100644 --- a/Data/WebUI/src/App.jsx +++ b/Data/WebUI/src/App.jsx @@ -42,7 +42,6 @@ import React, { // Styles import "reactflow/dist/style.css"; - import "./Borealis.css"; // Import our new components import FlowTabs from "./Flow_Tabs"; diff --git a/Data/WebUI/src/Flow_Editor.jsx b/Data/WebUI/src/Flow_Editor.jsx index 9ff5435..584f2bf 100644 --- a/Data/WebUI/src/Flow_Editor.jsx +++ b/Data/WebUI/src/Flow_Editor.jsx @@ -15,7 +15,6 @@ import { } from "@mui/icons-material"; import "reactflow/dist/style.css"; -import "./Borealis.css"; /** * Single flow editor component. diff --git a/Data/WebUI/src/index.js b/Data/WebUI/src/index.js index 11200c4..6037401 100644 --- a/Data/WebUI/src/index.js +++ b/Data/WebUI/src/index.js @@ -2,7 +2,12 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; + +// Global Styles import './index.css'; +import "normalize.css/normalize.css"; +import './Borealis.css'; // Global Theming for All of Borealis + import App from './App.jsx'; import reportWebVitals from './reportWebVitals'; diff --git a/Data/WebUI/src/nodes/Macro Automation/Node_Macro_KeyPress.jsx b/Data/WebUI/src/nodes/Macro Automation/Node_Macro_KeyPress.jsx index ca753d3..8fb7f3d 100644 --- a/Data/WebUI/src/nodes/Macro Automation/Node_Macro_KeyPress.jsx +++ b/Data/WebUI/src/nodes/Macro Automation/Node_Macro_KeyPress.jsx @@ -3,7 +3,6 @@ import React, { useState, useRef } from "react"; import { Handle, Position } from "reactflow"; import Keyboard from "react-simple-keyboard"; import "react-simple-keyboard/build/css/index.css"; -import "../../Borealis.css"; if (!window.BorealisValueBus) window.BorealisValueBus = {}; if (!window.BorealisUpdateRate) window.BorealisUpdateRate = 100; diff --git a/Launch-Borealis.ps1 b/Launch-Borealis.ps1 index 1894d6a..4883cda 100644 --- a/Launch-Borealis.ps1 +++ b/Launch-Borealis.ps1 @@ -141,6 +141,7 @@ switch ($choice) { npm install --silent @mui/material @mui/icons-material @emotion/react @emotion/styled --no-fund --audit=false 2>&1 | Out-Null npm install --silent socket.io-client --no-fund --audit=false | Out-Null npm install --silent react-simple-keyboard --no-fund --audit=false | Out-Null + npm install --silent normalize.css --no-fund --audit=false | Out-Null Pop-Location }