diff --git a/VECTO3GUI2020/App.xaml b/VECTO3GUI2020/App.xaml index 56139706be5acb5aeb5c30b9ae093a5ea401f81b..78e39ec2eca8f2f6b378208d9a6b868fc35004ca 100644 --- a/VECTO3GUI2020/App.xaml +++ b/VECTO3GUI2020/App.xaml @@ -15,7 +15,7 @@ <ResourceDictionary Source="Resources/Styles/GlobalStyles.xaml"/> <ResourceDictionary Source="Resources/Styles/Colors.xaml"/> <ResourceDictionary Source="Resources/Styles/ButtonStyles.xaml"/> - <ResourceDictionary Source="DataGridStyles.xaml"/> + <ResourceDictionary Source="Resources/Styles/DataGridStyles.xaml"/> <ResourceDictionary Source="Resources/Templates/ErrorTemplates.xaml"/> <ResourceDictionary Source="Resources/ObjectProvider.xaml"/> <ResourceDictionary Source="Resources/Icons/drawables.xaml"/> @@ -23,5 +23,4 @@ </ResourceDictionary.MergedDictionaries> </ResourceDictionary> </Application.Resources> - </Application> diff --git a/VECTO3GUI2020/DataGridStyles.xaml b/VECTO3GUI2020/Resources/Styles/DataGridStyles.xaml similarity index 100% rename from VECTO3GUI2020/DataGridStyles.xaml rename to VECTO3GUI2020/Resources/Styles/DataGridStyles.xaml diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj index f02e5ebaa9b82207055a89d7eac1b8d07c5aaca2..9cb9320a1e185812c5d279717e1dc6f47a30d62d 100644 --- a/VECTO3GUI2020/VECTO3GUI2020.csproj +++ b/VECTO3GUI2020/VECTO3GUI2020.csproj @@ -471,7 +471,7 @@ <Compile Include="Views\XMLViewer.xaml.cs"> <DependentUpon>XMLViewer.xaml</DependentUpon> </Compile> - <Page Include="DataGridStyles.xaml"> + <Page Include="Resources\Styles\DataGridStyles.xaml"> <Generator>MSBuild:Compile</Generator> </Page> <Page Include="Resources\DataTemplateSelectors.xaml"> diff --git a/VECTO3GUI2020/Views/JoblistView.xaml b/VECTO3GUI2020/Views/JoblistView.xaml index 92b8613f3786b30bbccc66eb4d8f2778f257781c..0ae1e63964ca23a3c37690e66c2a5b1fbd46c45d 100644 --- a/VECTO3GUI2020/Views/JoblistView.xaml +++ b/VECTO3GUI2020/Views/JoblistView.xaml @@ -18,7 +18,7 @@ <ColumnDefinition Width="1*"/> </Grid.ColumnDefinitions> <Grid.RowDefinitions> - <RowDefinition Height="1.5*"/> + <RowDefinition Height="1*"/> <RowDefinition Height="5"></RowDefinition> <RowDefinition Height="1*"/> </Grid.RowDefinitions>