Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

….xaml, Light.xaml
  • Loading branch information...
commit f1c03a6a57cfbcf713bc47ba57e8a7763c9c400e 1 parent e44ee7b
StanislawSwierc authored January 07, 2012
3  ThemesBrowser/App.xaml
@@ -5,7 +5,8 @@
5 5
     <Application.Resources>
6 6
         <ResourceDictionary>
7 7
             <ResourceDictionary.MergedDictionaries>
8  
-                <ResourceDictionary Source="Themes/Expression/Dark/Theme.xaml"/>
  8
+                <ResourceDictionary Source="Themes/Expression/Common.xaml"/>
  9
+                <ResourceDictionary Source="Themes/Expression/Dark.xaml"/>
9 10
             </ResourceDictionary.MergedDictionaries>
10 11
         </ResourceDictionary>
11 12
     </Application.Resources>
5  ThemesBrowser/Themes/Expression/Dark/Theme.xaml → ThemesBrowser/Themes/Expression/Common.xaml
@@ -11,9 +11,7 @@
11 11
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
12 12
   mc:Ignorable="d"
13 13
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008">
14  
-
15  
-    <!-- Main Colors -->
16  
-
  14
+    
17 15
     <Color x:Key="MainColor">#FF595959</Color>
18 16
     <Color x:Key="HoverColor">#FF393939</Color>
19 17
     <Color x:Key="DefaultColor">#FF9BB1C5</Color>
@@ -76,7 +74,6 @@
76 74
     <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
77 75
     <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
78 76
 
79  
-
80 77
     <Style x:Key="NuclearButtonFocusVisual">
81 78
         <Setter Property="Control.Template">
82 79
             <Setter.Value>
65  ThemesBrowser/Themes/Expression/Dark.xaml
... ...
@@ -0,0 +1,65 @@
  1
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  2
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
  3
+
  4
+    <Color x:Key="MainColor">#FF595959</Color>
  5
+    <Color x:Key="HoverColor">#FF393939</Color>
  6
+    <Color x:Key="DefaultColor">#FF9BB1C5</Color>
  7
+    <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
  8
+    <SolidColorBrush x:Key="ShadeBrush" Color="#FF434343" />
  9
+
  10
+    <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
  11
+    <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
  12
+
  13
+    <Color x:Key="BlackColor">#FF000000</Color>
  14
+    <Color x:Key="WhiteColor">#FFFFFFFF</Color>
  15
+
  16
+    <SolidColorBrush x:Key="TextBrush" Color="#FFFFFFFF" />
  17
+    <SolidColorBrush x:Key="NormalBrush" Color="{StaticResource MainColor}" />
  18
+    <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
  19
+    <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
  20
+    <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
  21
+
  22
+    <LinearGradientBrush x:Key="PressedBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  23
+        <GradientStop Color="#4C000000" Offset="0" />
  24
+        <GradientStop Color="#26FFFFFF" Offset="1" />
  25
+        <GradientStop Color="#4C000000" Offset="0.467" />
  26
+        <GradientStop Color="#26FFFFFF" Offset="0.479" />
  27
+    </LinearGradientBrush>
  28
+
  29
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FF333333" />
  30
+
  31
+    <LinearGradientBrush x:Key="SelectedBackgroundBrush" EndPoint="0.5,1" StartPoint="0.5,0">
  32
+        <GradientStop Color="{StaticResource TopGradientSelectColor}" Offset="0" />
  33
+        <GradientStop Color="{StaticResource BottomGradientSelectColor}" Offset="1" />
  34
+    </LinearGradientBrush>
  35
+
  36
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
  37
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FF787878" />
  38
+    <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
  39
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
  40
+
  41
+    <!-- EXPRESSION COMMON VALUES -->
  42
+
  43
+    <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  44
+        <GradientStop Color="#59FFFFFF" Offset="0" />
  45
+        <GradientStop Color="#00FFFFFF" Offset="1" />
  46
+        <GradientStop Color="#26FFFFFF" Offset="0.467" />
  47
+        <GradientStop Color="#00FFFFFF" Offset="0.475" />
  48
+    </LinearGradientBrush>
  49
+
  50
+    <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  51
+        <GradientStop Color="#4CFFFFFF" Offset="0" />
  52
+        <GradientStop Color="#26FFFFFF" Offset="1" />
  53
+        <GradientStop Color="#26FFFFFF" Offset="0.467" />
  54
+        <GradientStop Color="#00FFFFFF" Offset="0.475" />
  55
+        <GradientStop Color="#00FFFFFF" Offset="0.856" />
  56
+    </LinearGradientBrush>
  57
+
  58
+    <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
  59
+        <GradientStop Color="#444" Offset="0.0" />
  60
+        <GradientStop Color="#888" Offset="1.0" />
  61
+    </LinearGradientBrush>
  62
+
  63
+    <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
  64
+    <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
  65
+</ResourceDictionary>
66  ThemesBrowser/Themes/Expression/Light.xaml
... ...
@@ -0,0 +1,66 @@
  1
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  2
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
  3
+
  4
+    <Color x:Key="MainColor">#FF939393</Color>
  5
+    <Color x:Key="HoverColor">#FFAAAAAA</Color>
  6
+    <Color x:Key="DefaultColor">#FF9BB1C5</Color>
  7
+    <SolidColorBrush x:Key="LightBrush" Color="#FFAFAFAF" />
  8
+    <SolidColorBrush x:Key="ShadeBrush" Color="#FF9F9F9F" />
  9
+
  10
+    <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
  11
+    <Color x:Key="BottomGradientSelectColor">#FF999999</Color>
  12
+
  13
+    <Color x:Key="BlackColor">#FF000000</Color>
  14
+    <Color x:Key="WhiteColor">#FFFFFFFF</Color>
  15
+
  16
+    <SolidColorBrush x:Key="TextBrush" Color="#FF000000" />
  17
+    <SolidColorBrush x:Key="NormalBrush" Color="{StaticResource MainColor}" />
  18
+    <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF9B9999" />
  19
+    <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
  20
+    <SolidColorBrush x:Key="GlyphBrush" Color="#FFFFFFFF" />
  21
+
  22
+    <LinearGradientBrush x:Key="PressedBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  23
+        <GradientStop Color="#4C000000" Offset="0" />
  24
+        <GradientStop Color="#26FFFFFF" Offset="1" />
  25
+        <GradientStop Color="#4C000000" Offset="0.467" />
  26
+        <GradientStop Color="#26FFFFFF" Offset="0.479" />
  27
+    </LinearGradientBrush>
  28
+
  29
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFD6D6D6" />
  30
+
  31
+    <LinearGradientBrush x:Key="SelectedBackgroundBrush" EndPoint="0.5,1" StartPoint="0.5,0">
  32
+        <GradientStop Color="{StaticResource TopGradientSelectColor}" Offset="0" />
  33
+        <GradientStop Color="{StaticResource BottomGradientSelectColor}" Offset="1" />
  34
+    </LinearGradientBrush>
  35
+
  36
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
  37
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FFD4D4D4" />
  38
+    <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
  39
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFFFFFFF" />
  40
+
  41
+
  42
+    <!-- EXPRESSION COMMON VALUES -->
  43
+
  44
+    <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  45
+        <GradientStop Color="#59FFFFFF" Offset="0" />
  46
+        <GradientStop Color="#00FFFFFF" Offset="1" />
  47
+        <GradientStop Color="#26FFFFFF" Offset="0.467" />
  48
+        <GradientStop Color="#00FFFFFF" Offset="0.475" />
  49
+    </LinearGradientBrush>
  50
+
  51
+    <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
  52
+        <GradientStop Color="#4CFFFFFF" Offset="0" />
  53
+        <GradientStop Color="#26FFFFFF" Offset="1" />
  54
+        <GradientStop Color="#26FFFFFF" Offset="0.467" />
  55
+        <GradientStop Color="#00FFFFFF" Offset="0.475" />
  56
+        <GradientStop Color="#00FFFFFF" Offset="0.856" />
  57
+    </LinearGradientBrush>
  58
+
  59
+    <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
  60
+        <GradientStop Color="#444" Offset="0.0" />
  61
+        <GradientStop Color="#888" Offset="1.0" />
  62
+    </LinearGradientBrush>
  63
+
  64
+    <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
  65
+    <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
  66
+</ResourceDictionary>
3,212  ThemesBrowser/Themes/Expression/Light/Theme.xaml
0 additions, 3212 deletions not shown
8  ThemesBrowser/ThemesBrowser.csproj
@@ -76,11 +76,15 @@
76 76
       <Generator>MSBuild:Compile</Generator>
77 77
       <SubType>Designer</SubType>
78 78
     </Page>
79  
-    <Page Include="Themes\Expression\Dark\Theme.xaml">
  79
+    <Page Include="Themes\Expression\Light.xaml">
80 80
       <Generator>MSBuild:Compile</Generator>
81 81
       <SubType>Designer</SubType>
82 82
     </Page>
83  
-    <Page Include="Themes\Expression\Light\Theme.xaml">
  83
+    <Page Include="Themes\Expression\Dark.xaml">
  84
+      <Generator>MSBuild:Compile</Generator>
  85
+      <SubType>Designer</SubType>
  86
+    </Page>
  87
+    <Page Include="Themes\Expression\Common.xaml">
84 88
       <Generator>MSBuild:Compile</Generator>
85 89
       <SubType>Designer</SubType>
86 90
     </Page>

0 notes on commit f1c03a6

Please sign in to comment.
Something went wrong with that request. Please try again.