Skip to content

Commit

Permalink
avalonia update
Browse files Browse the repository at this point in the history
  • Loading branch information
HendrikMennen committed Feb 15, 2024
1 parent d250fd3 commit 69eb791
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 25 deletions.
2 changes: 1 addition & 1 deletion build/props/Avalonia.Browser.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Browser" Version="11.0.7" />
<PackageReference Include="Avalonia.Browser" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Controls.ColorPicker.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.7" />
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Controls.DataGrid.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.7" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Desktop.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Diagnostics.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.7" Condition="'$(Configuration)' == 'Debug'" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.9" Condition="'$(Configuration)' == 'Debug'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Fonts.Inter.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.7" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.Themes.Simple.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.7" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion build/props/Avalonia.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.7" />
<PackageReference Include="Avalonia" Version="11.0.9" />
</ItemGroup>
</Project>
15 changes: 15 additions & 0 deletions demo/OneWare.Demo.Browser/AppBundle/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
height: 100vh;
}

.flexRow{
display: flex;
flex-direction: column;
margin: 10px;
}

#avalonia-splash {
position: relative;
height: 100%;
Expand All @@ -35,6 +41,7 @@
width: 30vw;
min-width: 300px;
height: 50%;
margin: auto;
}

.splash-close {
Expand All @@ -55,6 +62,14 @@
animation: rotation 1s linear infinite;
}

.warningText{
color: red;
font-weight: bold;
font-size: 1.5rem;
font-family: Arial, Helvetica, sans-serif;
text-align: center;
}

@keyframes rotation {
0% {
transform: rotate(0deg);
Expand Down
35 changes: 18 additions & 17 deletions demo/OneWare.Demo.Browser/AppBundle/index.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<!DOCTYPE html>
<html>

<head>
<head>
<title>OneWare Web IDE</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<link rel="modulepreload" href="./main.js" />
<link rel="modulepreload" href="./dotnet.js" />
<link rel="modulepreload" href="./avalonia.js" />
<link rel="stylesheet" href="./app.css" />
</head>
</head>

<body style="margin: 0px; overflow: hidden">
<body style="margin: 0px; overflow: hidden">
<div id="out">
<div id="avalonia-splash">
<div class="center">
<div>
<img src="Logo_SVG-ONE-ware.svg" alt="OneWare Logo" class="logo"/>
<div class="loader" />
</div>
</div>
<div id="avalonia-splash">
<div class="center">
<div class="flexRow">
<img src="Logo_SVG-ONE-ware.svg" alt="OneWare Logo" class="logo" />
<div class="loader"></div>
<p class="warningText">
Warning! This version is a preview and has some breaking issues!
</p>
</div>
</div>
</div>
</div>
<script type='module' src="./main.js"></script>
</body>

</html>
<script type="module" src="./main.js"></script>
</body>
</html>

0 comments on commit 69eb791

Please sign in to comment.