Skip to content

Commit

Permalink
Merge pull request #681 from xxMUROxx/feature/AccentColors
Browse files Browse the repository at this point in the history 
Added new Accent colors
  • Loading branch information
@punker76
punker76 committed Oct 3, 2013
2 parents 8d170a1 + 02e7895 commit 8448217
Show file tree
Hide file tree
Showing 25 changed files with 667 additions and 81 deletions.
108 changes: 88 additions & 20 deletions MahApps.Metro/MahApps.Metro.NET45.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,94 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Amber.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Blue.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Brown.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Cobalt.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Crimson.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Cyan.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Emerald.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Green.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Indigo.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Lime.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Magenta.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Mauve.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Olive.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Orange.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Pink.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Purple.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Red.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Sienna.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Steel.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Teal.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Violet.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Yellow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Clean\CleanWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -374,26 +462,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Accents\Orange.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Accents\Purple.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Accents\Red.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Accents\Blue.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Accents\Green.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\Colours.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
68 changes: 68 additions & 0 deletions MahApps.Metro/MahApps.Metro.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,74 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Amber.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Brown.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Cobalt.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Crimson.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Cyan.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Emerald.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Indigo.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Lime.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Magenta.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Mauve.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Olive.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Pink.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Sienna.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Steel.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Teal.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Violet.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Accents\Yellow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Styles\Clean\CleanWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Amber.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FFF0A30A</Color>
<Color x:Key="HighlightLightColor">#FFF0A30A</Color>

<Color x:Key="AccentColor">#CCF0A30A</Color>
<!--60%-->
<Color x:Key="AccentColor2">#99F0A30A</Color>
<!--40%-->
<Color x:Key="AccentColor3">#66F0A30A</Color>
<!--20%-->
<Color x:Key="AccentColor4">#33F0A30A</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Brown.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FF825A2C</Color>
<Color x:Key="HighlightLightColor">#FF825A2C</Color>

<Color x:Key="AccentColor">#CC825A2C</Color>
<!--60%-->
<Color x:Key="AccentColor2">#99825A2C</Color>
<!--40%-->
<Color x:Key="AccentColor3">#66825A2C</Color>
<!--20%-->
<Color x:Key="AccentColor4">#33825A2C</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Cobalt.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FF0050EF</Color>
<Color x:Key="HighlightLightColor">#FF0050EF</Color>

<Color x:Key="AccentColor">#CC0050EF</Color>
<!--60%-->
<Color x:Key="AccentColor2">#990050EF</Color>
<!--40%-->
<Color x:Key="AccentColor3">#660050EF</Color>
<!--20%-->
<Color x:Key="AccentColor4">#330050EF</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Crimson.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FFA20025</Color>
<Color x:Key="HighlightLightColor">#FFA20025</Color>

<Color x:Key="AccentColor">#CCA20025</Color>
<!--60%-->
<Color x:Key="AccentColor2">#99A20025</Color>
<!--40%-->
<Color x:Key="AccentColor3">#66A20025</Color>
<!--20%-->
<Color x:Key="AccentColor4">#33A20025</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Cyan.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FF1BA1E2</Color>
<Color x:Key="HighlightLightColor">#FF1BA1E2</Color>

<Color x:Key="AccentColor">#CC1BA1E2</Color>
<!--60%-->
<Color x:Key="AccentColor2">#991BA1E2</Color>
<!--40%-->
<Color x:Key="AccentColor3">#661BA1E2</Color>
<!--20%-->
<Color x:Key="AccentColor4">#331BA1E2</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
26 changes: 26 additions & 0 deletions MahApps.Metro/Styles/Accents/Emerald.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FF008A00</Color>
<Color x:Key="HighlightLightColor">#FF008A00</Color>

<Color x:Key="AccentColor">#CC008A00</Color>
<!--60%-->
<Color x:Key="AccentColor2">#99008A00</Color>
<!--40%-->
<Color x:Key="AccentColor3">#66008A00</Color>
<!--20%-->
<Color x:Key="AccentColor4">#33008A00</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Color="{StaticResource AccentColor}" />

<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
17 changes: 9 additions & 8 deletions MahApps.Metro/Styles/Accents/Green.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Color x:Key="HighlightDarkColor">#FF48cb00</Color>
<Color x:Key="HighlightLightColor">#FF48cb00</Color>
<Color x:Key="HighlightDarkColor">#FF60A917</Color>
<Color x:Key="HighlightLightColor">#FF60A917</Color>

<Color x:Key="AccentColor">#CC48cb00</Color>
<Color x:Key="AccentColor">#CC60A917</Color>
<!--60%-->
<Color x:Key="AccentColor2">#9948cb00</Color>
<Color x:Key="AccentColor2">#9960A917</Color>
<!--40%-->
<Color x:Key="AccentColor3">#6648cb00</Color>
<Color x:Key="AccentColor3">#6660A917</Color>
<!--20%-->
<Color x:Key="AccentColor4">#3348cb00</Color>
<Color x:Key="AccentColor4">#3360A917</Color>

<LinearGradientBrush x:Key="BrandingBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
<GradientStop Color="{DynamicResource HighlightDarkColor}" Offset="0"/>
<GradientStop Color="#FF98370F" Offset="1"/>
<GradientStop Color="#FFD4D115" Offset="1"/>
</LinearGradientBrush>

<SolidColorBrush x:Key="AccentColorBrush"
Expand All @@ -22,4 +22,5 @@
<SolidColorBrush x:Key="AccentSelectedColorBrush"
Color="White" />


</ResourceDictionary>
Loading

0 comments on commit 8448217

Please sign in to comment.