Permalink
Browse files

Splitting ExpressionDark and ExpressionLight into a Common.xaml, Dark…

….xaml, Light.xaml
  • Loading branch information...
1 parent e44ee7b commit f1c03a6a57cfbcf713bc47ba57e8a7763c9c400e @StanislawSwierc committed Jan 7, 2012
View
@@ -5,7 +5,8 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="Themes/Expression/Dark/Theme.xaml"/>
+ <ResourceDictionary Source="Themes/Expression/Common.xaml"/>
+ <ResourceDictionary Source="Themes/Expression/Dark.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
@@ -11,9 +11,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008">
-
- <!-- Main Colors -->
-
+
<Color x:Key="MainColor">#FF595959</Color>
<Color x:Key="HoverColor">#FF393939</Color>
<Color x:Key="DefaultColor">#FF9BB1C5</Color>
@@ -76,7 +74,6 @@
<SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
<SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
-
<Style x:Key="NuclearButtonFocusVisual">
<Setter Property="Control.Template">
<Setter.Value>
@@ -0,0 +1,65 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <Color x:Key="MainColor">#FF595959</Color>
+ <Color x:Key="HoverColor">#FF393939</Color>
+ <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+ <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
+ <SolidColorBrush x:Key="ShadeBrush" Color="#FF434343" />
+
+ <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+ <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+
+ <Color x:Key="BlackColor">#FF000000</Color>
+ <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+ <SolidColorBrush x:Key="TextBrush" Color="#FFFFFFFF" />
+ <SolidColorBrush x:Key="NormalBrush" Color="{StaticResource MainColor}" />
+ <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
+ <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+ <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
+
+ <LinearGradientBrush x:Key="PressedBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#4C000000" Offset="0" />
+ <GradientStop Color="#26FFFFFF" Offset="1" />
+ <GradientStop Color="#4C000000" Offset="0.467" />
+ <GradientStop Color="#26FFFFFF" Offset="0.479" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FF333333" />
+
+ <LinearGradientBrush x:Key="SelectedBackgroundBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="{StaticResource TopGradientSelectColor}" Offset="0" />
+ <GradientStop Color="{StaticResource BottomGradientSelectColor}" Offset="1" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+ <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FF787878" />
+ <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+ <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
+
+ <!-- EXPRESSION COMMON VALUES -->
+
+ <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#59FFFFFF" Offset="0" />
+ <GradientStop Color="#00FFFFFF" Offset="1" />
+ <GradientStop Color="#26FFFFFF" Offset="0.467" />
+ <GradientStop Color="#00FFFFFF" Offset="0.475" />
+ </LinearGradientBrush>
+
+ <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#4CFFFFFF" Offset="0" />
+ <GradientStop Color="#26FFFFFF" Offset="1" />
+ <GradientStop Color="#26FFFFFF" Offset="0.467" />
+ <GradientStop Color="#00FFFFFF" Offset="0.475" />
+ <GradientStop Color="#00FFFFFF" Offset="0.856" />
+ </LinearGradientBrush>
+
+ <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+ <GradientStop Color="#444" Offset="0.0" />
+ <GradientStop Color="#888" Offset="1.0" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+ <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+</ResourceDictionary>
@@ -0,0 +1,66 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <Color x:Key="MainColor">#FF939393</Color>
+ <Color x:Key="HoverColor">#FFAAAAAA</Color>
+ <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+ <SolidColorBrush x:Key="LightBrush" Color="#FFAFAFAF" />
+ <SolidColorBrush x:Key="ShadeBrush" Color="#FF9F9F9F" />
+
+ <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+ <Color x:Key="BottomGradientSelectColor">#FF999999</Color>
+
+ <Color x:Key="BlackColor">#FF000000</Color>
+ <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+ <SolidColorBrush x:Key="TextBrush" Color="#FF000000" />
+ <SolidColorBrush x:Key="NormalBrush" Color="{StaticResource MainColor}" />
+ <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF9B9999" />
+ <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+ <SolidColorBrush x:Key="GlyphBrush" Color="#FFFFFFFF" />
+
+ <LinearGradientBrush x:Key="PressedBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#4C000000" Offset="0" />
+ <GradientStop Color="#26FFFFFF" Offset="1" />
+ <GradientStop Color="#4C000000" Offset="0.467" />
+ <GradientStop Color="#26FFFFFF" Offset="0.479" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFD6D6D6" />
+
+ <LinearGradientBrush x:Key="SelectedBackgroundBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="{StaticResource TopGradientSelectColor}" Offset="0" />
+ <GradientStop Color="{StaticResource BottomGradientSelectColor}" Offset="1" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
+ <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FFD4D4D4" />
+ <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+ <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFFFFFFF" />
+
+
+ <!-- EXPRESSION COMMON VALUES -->
+
+ <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#59FFFFFF" Offset="0" />
+ <GradientStop Color="#00FFFFFF" Offset="1" />
+ <GradientStop Color="#26FFFFFF" Offset="0.467" />
+ <GradientStop Color="#00FFFFFF" Offset="0.475" />
+ </LinearGradientBrush>
+
+ <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+ <GradientStop Color="#4CFFFFFF" Offset="0" />
+ <GradientStop Color="#26FFFFFF" Offset="1" />
+ <GradientStop Color="#26FFFFFF" Offset="0.467" />
+ <GradientStop Color="#00FFFFFF" Offset="0.475" />
+ <GradientStop Color="#00FFFFFF" Offset="0.856" />
+ </LinearGradientBrush>
+
+ <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+ <GradientStop Color="#444" Offset="0.0" />
+ <GradientStop Color="#888" Offset="1.0" />
+ </LinearGradientBrush>
+
+ <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+ <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+</ResourceDictionary>
Oops, something went wrong.

0 comments on commit f1c03a6

Please sign in to comment.