Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
3 changed files with 3 additions and 6 deletions
Showing only changes of commit 7e739ef106 - Show all commits

View File

@@ -1,19 +1,14 @@
import {Link} from "react-router";
import VisProgUI from "./visualProgrammingUI/VisProgUI.tsx"; import VisProgUI from "./visualProgrammingUI/VisProgUI.tsx";
//this is your css file where you can style your buttons and such //this is your css file where you can style your buttons and such
//you can still use css parts from App.css, but also overwrite them //you can still use css parts from App.css, but also overwrite them
function VisProgPage() { function VisProgPage() {
return ( return (
<> <>
<VisProgUI/> <VisProgUI/>
<Link to={'/'}> {/* here you link to the homepage, in App.tsx you can link new pages */}
<button className="movePage left" onClick={(): void => {}}>
Page {'<'}-- Go Home
</button>
</Link>
</> </>
) )
} }

View File

@@ -21,6 +21,7 @@
margin-inline-start: auto; margin-inline-start: auto;
margin-inline-end: auto; margin-inline-end: auto;
background-color: canvas; background-color: canvas;
align-content: center;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
margin-top:auto; margin-top:auto;
width: 50%; width: 50%;

View File

@@ -148,6 +148,7 @@ export function DndToolbar() {
borderColor: 'dimgrey', borderColor: 'dimgrey',
backgroundColor: 'canvas', backgroundColor: 'canvas',
display: 'flex', display: 'flex',
alignItems: 'center',
flexDirection: 'column', flexDirection: 'column',
gap: '1rem' gap: '1rem'
}}> }}>