New Colors

MathewSachin · May 9, 2017 · 919db5e · 919db5e
1 parent c255f0f
commit 919db5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/MainWindow.xaml b/src/MainWindow.xaml
@@ -80,7 +80,7 @@
             </TaskbarItemInfo.ThumbButtonInfos>
         </TaskbarItemInfo>
     </Window.TaskbarItemInfo>
-    <Grid Background="#F2211B1B">
+    <Grid Background="#BDBDBD">
         <Expander Padding="5,0,0,0"
                   IsExpanded="True">
             <Expander.HeaderTemplate>
@@ -94,13 +94,15 @@
                 <DockPanel VerticalAlignment="Center">
                     <local:ModernButton ToolTip="{DynamicResource s_ScreenShot}"
                                         Command="{Binding ScreenShotCommand}"
+                                        Foreground="#333333"
                                         IconData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z"/>
                     <local:ModernButton ToolTip="{DynamicResource s_RecordStop}"
                                         Command="{Binding RecordCommand}"
                                         Foreground="#b71c1c"
                                         IconData="{Binding RecorderState, Converter={StaticResource StateToRecordButtonGeometryConverter}}"/>
                     <local:ModernButton ToolTip="{DynamicResource s_PauseResume}" 
                                         Command="{Binding PauseCommand}"
+                                        Foreground="#333333"
                                         IconData="M14,19H18V5H14M6,19H10V5H6V19Z">
                         <local:ModernButton.LayoutTransform>
                             <RotateTransform Angle="{Binding RecorderState, Converter={StaticResource StateToPauseButtonAngleConverter}}"/>
@@ -113,21 +115,22 @@
                                         DockPanel.Dock="Right"/>
                     <local:ModernButton ToolTip="{DynamicResource s_Minimize}"
                                         Click="MinButton_Click"
-                                        Foreground="#77FFFFFF"
+                                        Foreground="#77333333"
                                         IconData="M19,13H5V11H19V13Z"
                                         DockPanel.Dock="Right"/>
                     <Grid Background="#57222222"
                           Cursor="Hand"
-                          Margin="0,-1"
+                          Margin="0,-2"
                           PreviewMouseLeftButtonDown="Grid_PreviewMouseLeftButtonDown">
                         <Label Content="{Binding TimeSpan}"
                                Foreground="White"
+                               Margin="0,-1"
                                VerticalContentAlignment="Center"
                                HorizontalContentAlignment="Center"/>
                     </Grid>
                 </DockPanel>
             </Expander.Header>
-            <DockPanel Background="White"
+            <DockPanel Background="#F5F5F5"
                        Margin="-5,0,0,0"
                        Height="450">
                 <Label Margin="5"

diff --git a/src/Views/MainConfigView.xaml b/src/Views/MainConfigView.xaml
@@ -2,8 +2,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:Captura"
       DataContext="{StaticResource MainViewModel}">
-    <StackPanel Background="White"
-                Margin="-5,0,0,0">
+    <StackPanel Margin="-5,0,0,0">
         <StackPanel.Resources>
             <SolidColorBrush x:Key="ModernButtonText" Color="#111111" />
             <SolidColorBrush x:Key="ModernButtonTextHover" Color="#333333" />