diff --git a/Fluent.Ribbon.Showcase/Converters/BackgroundImageViewportConverter.cs b/Fluent.Ribbon.Showcase/Converters/BackgroundImageViewportConverter.cs
new file mode 100644
index 000000000..72e61a8af
--- /dev/null
+++ b/Fluent.Ribbon.Showcase/Converters/BackgroundImageViewportConverter.cs
@@ -0,0 +1,24 @@
+namespace FluentTest.Converters
+{
+ using System;
+ using System.Globalization;
+ using System.Windows;
+ using System.Windows.Data;
+
+ public class BackgroundImageViewportConverter : IValueConverter
+ {
+ #region IValueConverter Members
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return new Rect(0, 0, (double)value, 46);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.NET 4.0.csproj b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.NET 4.0.csproj
index 31b19dd72..bfd902d4f 100644
--- a/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.NET 4.0.csproj
+++ b/Fluent.Ribbon.Showcase/Fluent.Ribbon.Showcase.NET 4.0.csproj
@@ -77,6 +77,13 @@
Properties\GlobalAssemblyInfo.cs
+
+
+ RibbonWindowWithBackgroundImage.xaml
+
+
+ RibbonWindowColorized.xaml
+
@@ -111,6 +118,14 @@
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -235,11 +250,6 @@
-
-
-
-
-
@@ -258,6 +268,11 @@
+
+
+ Images\banner.png
+
+
-
+
#FFF0A30A
#CCF0A30A
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Blue.xaml b/Fluent.Ribbon/Themes/Accents/Blue.xaml
index 556e854cc..1f8da6585 100644
--- a/Fluent.Ribbon/Themes/Accents/Blue.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Blue.xaml
@@ -7,7 +7,7 @@
mc:Ignorable="options d">
-
+
#FF2B579A
#CC2B579A
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Brown.xaml b/Fluent.Ribbon/Themes/Accents/Brown.xaml
index d2f79e2cb..2de171ae5 100644
--- a/Fluent.Ribbon/Themes/Accents/Brown.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Brown.xaml
@@ -7,7 +7,7 @@
mc:Ignorable="options d">
-
+
#FF825A2C
#CC825A2C
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Cobalt.xaml b/Fluent.Ribbon/Themes/Accents/Cobalt.xaml
index bc6298b79..0453762dd 100644
--- a/Fluent.Ribbon/Themes/Accents/Cobalt.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Cobalt.xaml
@@ -7,7 +7,7 @@
mc:Ignorable="options d">
-
+
#FF0050EF
#CC0050EF
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Crimson.xaml b/Fluent.Ribbon/Themes/Accents/Crimson.xaml
index 11d3a96ab..73d138cef 100644
--- a/Fluent.Ribbon/Themes/Accents/Crimson.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Crimson.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Cyan.xaml b/Fluent.Ribbon/Themes/Accents/Cyan.xaml
index 1ee178155..fd105190d 100644
--- a/Fluent.Ribbon/Themes/Accents/Cyan.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Cyan.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Emerald.xaml b/Fluent.Ribbon/Themes/Accents/Emerald.xaml
index 0053ef0c9..dbbceadb6 100644
--- a/Fluent.Ribbon/Themes/Accents/Emerald.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Emerald.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Green.xaml b/Fluent.Ribbon/Themes/Accents/Green.xaml
index 610b86817..206300456 100644
--- a/Fluent.Ribbon/Themes/Accents/Green.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Green.xaml
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Indigo.xaml b/Fluent.Ribbon/Themes/Accents/Indigo.xaml
index 1e50133b6..4fe6dc5d0 100644
--- a/Fluent.Ribbon/Themes/Accents/Indigo.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Indigo.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Lime.xaml b/Fluent.Ribbon/Themes/Accents/Lime.xaml
index d063e6713..742a6a40e 100644
--- a/Fluent.Ribbon/Themes/Accents/Lime.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Lime.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Magenta.xaml b/Fluent.Ribbon/Themes/Accents/Magenta.xaml
index b5eb18f11..8cba8f0d7 100644
--- a/Fluent.Ribbon/Themes/Accents/Magenta.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Magenta.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Mauve.xaml b/Fluent.Ribbon/Themes/Accents/Mauve.xaml
index bec4d85e0..edae7aa12 100644
--- a/Fluent.Ribbon/Themes/Accents/Mauve.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Mauve.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Olive.xaml b/Fluent.Ribbon/Themes/Accents/Olive.xaml
index d853bcc83..821ef1b84 100644
--- a/Fluent.Ribbon/Themes/Accents/Olive.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Olive.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Orange.xaml b/Fluent.Ribbon/Themes/Accents/Orange.xaml
index f69c93b95..93faccbad 100644
--- a/Fluent.Ribbon/Themes/Accents/Orange.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Orange.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Pink.xaml b/Fluent.Ribbon/Themes/Accents/Pink.xaml
index 5d93fa7d1..bcfa0898a 100644
--- a/Fluent.Ribbon/Themes/Accents/Pink.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Pink.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Purple.xaml b/Fluent.Ribbon/Themes/Accents/Purple.xaml
index 58066fc71..c2ed0125c 100644
--- a/Fluent.Ribbon/Themes/Accents/Purple.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Purple.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Red.xaml b/Fluent.Ribbon/Themes/Accents/Red.xaml
index d37dda863..d912dc67f 100644
--- a/Fluent.Ribbon/Themes/Accents/Red.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Red.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Sienna.xaml b/Fluent.Ribbon/Themes/Accents/Sienna.xaml
index 3f6589a79..f80cf5b62 100644
--- a/Fluent.Ribbon/Themes/Accents/Sienna.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Sienna.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Steel.xaml b/Fluent.Ribbon/Themes/Accents/Steel.xaml
index 8f30aab61..c7d280a42 100644
--- a/Fluent.Ribbon/Themes/Accents/Steel.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Steel.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Taupe.xaml b/Fluent.Ribbon/Themes/Accents/Taupe.xaml
index 0e578ac01..556d38836 100644
--- a/Fluent.Ribbon/Themes/Accents/Taupe.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Taupe.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Teal.xaml b/Fluent.Ribbon/Themes/Accents/Teal.xaml
index 1d1013b34..a34feddac 100644
--- a/Fluent.Ribbon/Themes/Accents/Teal.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Teal.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Violet.xaml b/Fluent.Ribbon/Themes/Accents/Violet.xaml
index c58d740b6..099eaef48 100644
--- a/Fluent.Ribbon/Themes/Accents/Violet.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Violet.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Accents/Yellow.xaml b/Fluent.Ribbon/Themes/Accents/Yellow.xaml
index 96fb03ab9..68fd8fb1a 100644
--- a/Fluent.Ribbon/Themes/Accents/Yellow.xaml
+++ b/Fluent.Ribbon/Themes/Accents/Yellow.xaml
@@ -40,7 +40,7 @@
-
+
@@ -65,5 +65,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Fluent.Ribbon/Themes/Colors/BaseDark.xaml b/Fluent.Ribbon/Themes/Colors/BaseDark.xaml
index 735fe60c6..aea0ec022 100644
--- a/Fluent.Ribbon/Themes/Colors/BaseDark.xaml
+++ b/Fluent.Ribbon/Themes/Colors/BaseDark.xaml
@@ -5,8 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="options d">
-
-
+
+
#FFFFFFFF
#FF252525
@@ -27,7 +27,7 @@
-
+
@@ -100,6 +100,14 @@
+
+
+
+
+
+
+
+
@@ -146,6 +154,9 @@
+
+
+
diff --git a/Fluent.Ribbon/Themes/Colors/BaseLight.xaml b/Fluent.Ribbon/Themes/Colors/BaseLight.xaml
index d5bb8e239..0b3be3903 100644
--- a/Fluent.Ribbon/Themes/Colors/BaseLight.xaml
+++ b/Fluent.Ribbon/Themes/Colors/BaseLight.xaml
@@ -6,7 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="options d">
-
+
#FF000000
#FFFFFFFF
@@ -51,7 +51,7 @@
-
+
@@ -100,6 +100,14 @@
+
+
+
+
+
+
+
+
@@ -126,7 +134,7 @@
-
+
@@ -146,6 +154,9 @@
+
+
+
diff --git a/Fluent.Ribbon/Themes/Colors/Colors.xaml b/Fluent.Ribbon/Themes/Colors/Colors.xaml
index f82c42f9a..71c235007 100644
--- a/Fluent.Ribbon/Themes/Colors/Colors.xaml
+++ b/Fluent.Ribbon/Themes/Colors/Colors.xaml
@@ -146,6 +146,14 @@
+
+
+
+
+
+
+
+
@@ -192,6 +200,11 @@
+
+
+
+
+
diff --git a/Fluent.Ribbon/Themes/Controls/Button.xaml b/Fluent.Ribbon/Themes/Controls/Button.xaml
index e938d1b03..da2a6cc93 100644
--- a/Fluent.Ribbon/Themes/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Button.xaml
@@ -9,9 +9,9 @@
diff --git a/Fluent.Ribbon/Themes/Controls/Ribbon.xaml b/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
index 6703d7c3c..12f2e9293 100644
--- a/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
+++ b/Fluent.Ribbon/Themes/Controls/Ribbon.xaml
@@ -16,6 +16,7 @@
+
+
diff --git a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
index f354f040f..748d06624 100644
--- a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
+++ b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
@@ -100,8 +100,10 @@
TargetType="{x:Type Fluent:RibbonTabControl}">
+
+ Value="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Foreground}" />
@@ -229,6 +232,8 @@
Margin="1,0,1,0"
Grid.Row="1"
Grid.RowSpan="1"
+ Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background}"
+ TextElement.Foreground="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Content.Foreground}"
KeyboardNavigation.TabNavigation="Local"
KeyboardNavigation.DirectionalNavigation="Contained"
KeyboardNavigation.TabIndex="2">
@@ -248,6 +253,8 @@
Background="{Binding Path=SelectedItem.BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />