From 8d21149db76809db5906dff3773e80e80825d3f9 Mon Sep 17 00:00:00 2001 From: Dogma <103559271+ArtificialDogma@users.noreply.github.com> Date: Sun, 14 Apr 2024 20:39:02 +1000 Subject: [PATCH] Added Olympus Colours - Added Olympus Colours - First commit yay --- frontend/react/src/main.tsx | 2 +- frontend/react/src/ui/ui.tsx | 8 ++++---- frontend/react/tailwind.config.js | 12 ++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/frontend/react/src/main.tsx b/frontend/react/src/main.tsx index 5f3827cc..69f57f37 100644 --- a/frontend/react/src/main.tsx +++ b/frontend/react/src/main.tsx @@ -12,4 +12,4 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( , ) -window.onload = setupApp; +//window.onload = setupApp; diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx index 7a6692e2..2e437807 100644 --- a/frontend/react/src/ui/ui.tsx +++ b/frontend/react/src/ui/ui.tsx @@ -11,7 +11,7 @@ import { MainMenu } from './panels/mainmenu' import { SideBar } from './panels/sidebar'; import { MapHiddenTypes, MapOptions } from '../types/types' import { MAP_HIDDEN_TYPES_DEFAULTS, MAP_OPTIONS_DEFAULTS } from '../constants/constants' -import { getApp } from '../olympusapp' +import { getApp, setupApp } from '../olympusapp' export type OlympusState = { mainMenuVisible: boolean, @@ -33,11 +33,11 @@ export function UI() { var [mapOptions, setMapOptions] = useState(MAP_OPTIONS_DEFAULTS); document.addEventListener("hiddenTypesChanged", (ev) => { - setMapHiddenTypes({...getApp().getMap().getHiddenTypes()}); + setMapHiddenTypes({ ...getApp().getMap().getHiddenTypes() }); }) document.addEventListener("mapOptionsChanged", (ev) => { - setMapOptions({...getApp().getMap().getOptions()}); + setMapOptions({ ...getApp().getMap().getOptions() }); }) function hideAllMenus() { @@ -73,7 +73,7 @@ export function UI() { toggleDrawingMenuVisible: () => { hideAllMenus(); setDrawingMenuVisible(!drawingMenuVisible) }, } }> -
+
diff --git a/frontend/react/tailwind.config.js b/frontend/react/tailwind.config.js index a0ac3af0..241d5888 100644 --- a/frontend/react/tailwind.config.js +++ b/frontend/react/tailwind.config.js @@ -14,6 +14,18 @@ export default { }, interaction: { blue: "#5CA7FF" + }, + olympus:{ + 50: "#516176", + 100: "#4A5A6F", + 200: "#435367", + 300: "#38475A", + 400: "#303F51", + 500: "#2A3949", + 600: "#243141", + 700: "#1C2836", + 800: "#17212D", + 900: "#171C26" } } },