From 3fdb2093e73e0cec394285f1feb4633b0862deed Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Thu, 4 Feb 2016 20:20:22 +0100
Subject: [PATCH] UI margin tweaks

---
 .../AudioVisualizer/AudioVisualizerView.xaml      |  2 +-
 .../Modules/Effects/Debug/DebugEffectView.xaml    |  4 +---
 .../Modules/Effects/TypeHole/TypeHoleView.xaml    |  3 +--
 .../Modules/Effects/TypeWave/TypeWaveView.xaml    | 15 +++++++--------
 .../Games/CounterStrike/CounterStrikeView.xaml    |  2 +-
 .../Games/RocketLeague/RocketLeagueView.xaml      |  6 +++---
 .../Modules/Games/Witcher3/Witcher3View.xaml      |  4 ++--
 .../Overlays/VolumeDisplay/VolumeDisplayView.xaml |  3 +--
 Artemis/Artemis/Views/ShellView.xaml              |  4 ++--
 9 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
index 0b2cc56fb..85737bc35 100644
--- a/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
+++ b/Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
@@ -27,7 +27,7 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="Visualizes the default audio device on the keyboard." />
diff --git a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
index 1f4083f27..f3e11d40d 100644
--- a/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
+++ b/Artemis/Artemis/Modules/Effects/Debug/DebugEffectView.xaml
@@ -5,7 +5,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:cal="http://www.caliburnproject.org"
              xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d"
              d:DesignHeight="476.986" d:DesignWidth="538.772">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
@@ -26,8 +25,7 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" MaxWidth="500" Style="{DynamicResource DescriptionHeaderStyle}"
-                       HorizontalAlignment="Left">
+                <Label FontSize="20" MaxWidth="500" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="A few debugging options, also lets you see what is being sent to the keyboard" />
diff --git a/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml b/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
index 4e78c6bfe..eca24eb53 100644
--- a/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
+++ b/Artemis/Artemis/Modules/Effects/TypeHole/TypeHoleView.xaml
@@ -22,8 +22,7 @@
                 <RowDefinition />
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
-                <Label FontSize="20"
-                       Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="Creates holes in the keyboard's lightning as you press keys." />
diff --git a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
index 11a99aae2..e724c58cf 100644
--- a/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
+++ b/Artemis/Artemis/Modules/Effects/TypeWave/TypeWaveView.xaml
@@ -28,17 +28,16 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
-                        <AccessText TextWrapping="Wrap"
-                                    Text="Creates waves on the keyboard as you press keys." />
+                        <AccessText TextWrapping="Wrap" Text="Creates waves on the keyboard as you press keys." />
                     </Label.Content>
                 </Label>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
                     <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
-                                  Style="{DynamicResource MetroCircleToggleButtonStyle}"
-                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
+                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" 
+                                  Style="{DynamicResource MetroCircleToggleButtonStyle}" />
                 </StackPanel>
             </StackPanel>
 
@@ -51,7 +50,7 @@
                               SelectedColor="{Binding Path=TypeWaveSettings.WaveColor, Mode=TwoWay}"
                               Grid.Row="1" Grid.Column="1" Width="110" HorizontalAlignment="Right"
                               VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
-            
+
             <!-- Random colors -->
             <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
                        Height="16" Margin="0,8">
@@ -61,7 +60,7 @@
                                    Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
                                    OffLabel="No"
                                    Margin="0,0,-5,0" Width="114" />
-            
+
             <!-- Shift color -->
             <TextBlock Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
                        Height="16" Margin="0,8">
@@ -81,7 +80,7 @@
                     HorizontalAlignment="Right" Width="110" TickPlacement="None" TickFrequency="1"
                     Value="{Binding Path=TypeWaveSettings.ShiftColorSpeed, Mode=TwoWay}" Minimum="1" Maximum="200"
                     SmallChange="45" IsSnapToTickEnabled="True" />
-            
+
             <!-- TTL -->
             <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
                        Height="16" Margin="0,8">
diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
index 948cc83c1..937022705 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeView.xaml
@@ -28,7 +28,7 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="Shows verious game states and events on the keyboard." />
diff --git a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
index f93341ca3..dea114a08 100644
--- a/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
+++ b/Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueView.xaml
@@ -22,7 +22,7 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="Shows your boost amount on the keyboard." />
@@ -57,13 +57,13 @@
 
             <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
                        TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
-                       Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
+                       Foreground="#535353" MaxWidth="510" TextAlignment="Justify">
                 Tip: To find a color combination you like, start an exhibition match, pickup 100 boost and play around with the colors.
                 They'll appear on your keyboard immediately! Once you're satisfied don't forget to click save changes.
             </TextBlock>
             <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
                        TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
-                       Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
+                       Foreground="#535353" MaxWidth="510" TextAlignment="Justify">
                 Note: Requires patch x.x. When a new patch is released Artemis downloads new pointers for the latest version (unless disabled in settings).
             </TextBlock>
 
diff --git a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3View.xaml b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3View.xaml
index 4d0601f9e..d0d6f53b7 100644
--- a/Artemis/Artemis/Modules/Games/Witcher3/Witcher3View.xaml
+++ b/Artemis/Artemis/Modules/Games/Witcher3/Witcher3View.xaml
@@ -16,7 +16,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
-                <Label FontSize="20" Style="{DynamicResource DescriptionHeaderStyle}" HorizontalAlignment="Left">
+                <Label FontSize="20" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap"
                                     Text="Colors the keyboard according to the sign Gerald is using." />
@@ -30,7 +30,7 @@
             </StackPanel>
             <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
                        TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
-                       Foreground="#535353" MaxWidth="520" TextAlignment="Justify">
+                       Foreground="#535353" MaxWidth="510" TextAlignment="Justify">
                 Note: Requires patch x.x. When a new patch is released Artemis downloads new pointers for the latest version (unless disabled in settings).
             </TextBlock>
 
diff --git a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
index ac8362e64..e5665ca12 100644
--- a/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
+++ b/Artemis/Artemis/Modules/Overlays/VolumeDisplay/VolumeDisplayView.xaml
@@ -22,8 +22,7 @@
 
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-                <Label FontSize="20" MaxWidth="500" Style="{DynamicResource DescriptionHeaderStyle}"
-                       HorizontalAlignment="Left">
+                <Label FontSize="20" MaxWidth="500" HorizontalAlignment="Left">
                     <Label.Content>
                         <AccessText TextWrapping="Wrap" Text="Shows the Windows volume on the keyboard" />
                     </Label.Content>
diff --git a/Artemis/Artemis/Views/ShellView.xaml b/Artemis/Artemis/Views/ShellView.xaml
index e59a53a7d..0a7fce3bb 100644
--- a/Artemis/Artemis/Views/ShellView.xaml
+++ b/Artemis/Artemis/Views/ShellView.xaml
@@ -7,7 +7,7 @@
                       xmlns:cal="http://www.caliburnproject.org"
                       mc:Ignorable="d"
                       cal:Message.Attach="[Event Closing] = [Action OnClose($eventArgs)]"
-                      Title="Artemis" Height="670" Width="675"
+                      Title="Artemis" Height="670" Width="690"
                       MinWidth="500" MinHeight="400"
                       GlowBrush="{DynamicResource AccentColorBrush}">
     <Controls:MetroWindow.RightWindowCommands>
@@ -50,7 +50,7 @@
             <ResourceDictionary
                 Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
         </Grid.Resources>
-        <TabControl Margin="0,10" TabStripPlacement="Left" x:Name="Items">
+        <TabControl Margin="0,10,10,10" TabStripPlacement="Left" x:Name="Items">
             <TabControl.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{Binding DisplayName}" />