Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP
This commit is contained in:
commit
2826b57de0
2 files changed
+6
-5
No files matched your search
@@ -1,12 +1,12 @@
|
|||||||
<Window x:Class="Audit.Windows.LogWindow"
|
<mah:MetroWindow xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="Audit.Windows.LogWindow"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:Audit.Windows"
|
xmlns:local="clr-namespace:Audit.Windows"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="LogWindow" Height="400" Width="300">
|
Title="审计系统登录" Height="400" Width="300">
|
||||||
<Grid>
|
<Grid>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</mah:MetroWindow>
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using MahApps.Metro.Controls;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -17,7 +18,7 @@ namespace Audit.Windows
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// LogWindow.xaml 的交互逻辑
|
/// LogWindow.xaml 的交互逻辑
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public partial class LogWindow : Window
|
public partial class LogWindow : MetroWindow
|
||||||
{
|
{
|
||||||
public LogWindow()
|
public LogWindow()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user