diff options
| author | Mirta <mirta@twine-s.com> | 2020-12-30 16:39:52 +0200 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-12-30 16:39:52 +0200 |
| commit | 00a491d93733d4625ad329b2ba8237f445364b3f (patch) | |
| tree | 4b24c6fa78d7648f4bb7cefafa464bb0b063fec4 /Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml | |
| parent | 124ad4150f80c6846fdee41dbbda9848c105f6e5 (diff) | |
| download | Tango-00a491d9.tar.gz Tango-00a491d9.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml index 09762d7ce..730066b46 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml @@ -21,9 +21,6 @@ <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Fonts.xaml"/> <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Styles.xaml"/> - <!--PPC Controls--> - <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Controls/ImageGalleryControl.xaml"/> - <!--Converters--> </ResourceDictionary.MergedDictionaries> @@ -54,13 +51,6 @@ <converters:StringToLinesConverter x:Key="StringToLinesConverter" /> <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" /> <converters:StringEllipsisConverter x:Key="StringEllipsisConverter" /> - <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" /> - <converters:TimeSpanToMinutesConverter x:Key="TimeSpanToMinutesConverter" /> - <converters:TimeSpanToSecondsConverter x:Key="TimeSpanToSecondsConverter" /> - <converters:TimeSpanToDaysConverter x:Key="TimeSpanToDaysConverter" /> - <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" /> - <converters:IsEqualToVisibilityConverter x:Key="IsEqualToVisibilityConverter" /> - <converters:IsToStringEqualToVisibilityConverter x:Key="IsToStringEqualToVisibilityConverter" /> <Style TargetType="FrameworkElement"> <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter> |