Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
f42a4afa8a
4 files changed
+13
-1
No files matched your search
@@ -9,6 +9,10 @@
|
|||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ui:ThemesDictionary Theme="Dark" />
|
<ui:ThemesDictionary Theme="Dark" />
|
||||||
<ui:ControlsDictionary />
|
<ui:ControlsDictionary />
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"/>
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml"/>
|
||||||
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Indigo.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
|
|||||||
+5
-1
@@ -13,7 +13,11 @@
|
|||||||
Title="SUNLIGHT SCCM b0.0.1 (2024/08/10)"
|
Title="SUNLIGHT SCCM b0.0.1 (2024/08/10)"
|
||||||
Height="1080" Width="1920" Background="#FF003640" >
|
Height="1080" Width="1920" Background="#FF003640" >
|
||||||
<Grid>
|
<Grid>
|
||||||
<ContentControl x:Name="container" Margin="10,0,0,0"/>
|
<Image Height="200" Width="200" HorizontalAlignment="Left" VerticalAlignment="Top" Source="/sunlightlogo.jpg" Margin="5,0,5,0" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<ContentControl x:Name="container" Margin="200,0,0,0"/>
|
||||||
|
|
||||||
<StatusBar VerticalAlignment="Bottom" Height="30" Padding="5,0,5,0">
|
<StatusBar VerticalAlignment="Bottom" Height="30" Padding="5,0,5,0">
|
||||||
<StatusBarItem>
|
<StatusBarItem>
|
||||||
|
|||||||
@@ -175,6 +175,9 @@
|
|||||||
<PackageReference Include="LiveChartsCore">
|
<PackageReference Include="LiveChartsCore">
|
||||||
<Version>2.0.0-rc4.5</Version>
|
<Version>2.0.0-rc4.5</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="MaterialDesignThemes">
|
||||||
|
<Version>5.1.1-ci795</Version>
|
||||||
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.Web.WebView2">
|
<PackageReference Include="Microsoft.Web.WebView2">
|
||||||
<Version>1.0.2895-prerelease</Version>
|
<Version>1.0.2895-prerelease</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
@@ -204,6 +207,7 @@
|
|||||||
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
|
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
|
||||||
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
|
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
|
||||||
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
|
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
|
||||||
|
<Resource Include="sunlightlogo.jpg" />
|
||||||
<Resource Include="sunlightlogo.ico" />
|
<Resource Include="sunlightlogo.ico" />
|
||||||
<Resource Include="LOGO\sunlightlogo.ico" />
|
<Resource Include="LOGO\sunlightlogo.ico" />
|
||||||
<Resource Include="LOGO\sunlightlogo.jpg" />
|
<Resource Include="LOGO\sunlightlogo.jpg" />
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
Reference in new issue
Block a user