952. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:36 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

952.1 Files compared

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\Tools\WebResourceUtility\Views	WebResourceUtilityStyles.xaml	Tue Dec 20 19:52:28 2016 UTC
2			Wed Feb 1 19:57:36 2017 UTC

952.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	121

952.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

952.4 Active regular expressions

No regular expressions were active.

952.5 Comparison detail

1		<ResourceD ictionary
2		xm lns="http: //schemas. microsoft. com/winfx/ 2006/xaml/ presentati on"
3		xm lns:x="htt p://schema s.microsof t.com/winf x/2006/xam l"
4		xmlns: v="clr-nam espace:Mic rosoft.Crm .Sdk.Sampl es">
5
6		<S tyle x:Key ="ContentB orderStyle " TargetTy pe="{x:Typ e Border}" >
7		<Set ter Proper ty="Border Brush" Val ue="#FF000 84D"/>
8		<Set ter Proper ty="Border Thickness" Value="2" />
9		<Set ter Proper ty="Corner Radius" Va lue="4"/>
10		<Set ter Proper ty="Margin " Value="2 "/>
11		<Set ter Proper ty="Paddin g" Value=" 2"/>
12		</ Style>
13		<S tyle x:Key ="Backgrou ndGray" Ta rgetType=" {x:Type Wi ndow}">
14		<Set ter Proper ty="Backgr ound" Valu e="#FF0008 4D"/>
15		</ Style>
16		<S tyle x:Key ="MasterGr idStyle" T argetType= "{x:Type G rid}">
17		<Set ter Proper ty="Backgr ound">
18		<Sette r.Value>
19		<LinearG radientBru sh EndPoin t="0.5,1" StartPoint ="0.5,0">
20		<GradientS top Color= "#FF304D8B " Offset=" 1"/>
21		<GradientS top Color= "#FFC4C6CE " Offset=" 0.008"/>
22		</Linear GradientBr ush>
23		</Sett er.Value>
24		</Se tter>
25
26		</ Style>
27
28		<S tyle Targe tType="{x: Type Butto n}" >
29		<S etter Prop erty="IsEn abled" Val ue="{Bindi ng Path=Ar eAllButton sEnabled}" />
30		<Set ter Proper ty="Backgr ound">
31		<Sette r.Value>
32		<LinearG radientBru sh EndPoin t="0.5,1" StartPoint ="0.5,0">
33		<Gradi entStop Co lor="#FFBF EDF3" Offs et="0"/>
34		<Gradi entStop Co lor="#FF42 74EF" Offs et="1"/>
35		</Li nearGradie ntBrush>
36		</Sett er.Value>
37		</Se tter>
38		<Set ter Proper ty="FontFa mily" Valu e="/WebRes ourceUtili ty;compone nt/Fonts/# Arial"/>
39		<Set ter Proper ty="FontWe ight" Valu e="Bold" / >
40		</ Style>
41
42		<S tyle Targe tType="{x: Type TabIt em}">
43		<Set ter Proper ty="Templa te">
44		<Sette r.Value>
45		<Control Template T argetType= "{x:Type T abItem}">
46		<Grid>
47		<B order
48		Name ="Border"
49		Back ground="Da rkGray"
50		Marg in="0,0,-4 ,0"
51		Bord erThicknes s="4,4,4,4 "
52		Corn erRadius=" 8,0,0,8" >
53		<Con tentPresen ter x:Name ="Contents Site"
54		Vertic alAlignmen t="Center"
55		Horizo ntalAlignm ent="Left"
56		Conten tSource="H eader"
57		Margin ="6"
58		Width= "160"/>
59		</ Border>
60		</Grid>
61		<ControlTe mplate.Tri ggers>
62		<T rigger Pro perty="IsS elected" V alue="True ">
63		<Set ter Target Name="Bord er" Proper ty="Backgr ound" Valu e="LightGr ay" />
64		</ Trigger>
65		<T rigger Pro perty="IsS elected" V alue="Fals e">
66		<Set ter Target Name="Bord er" Proper ty="Backgr ound" Valu e="DarkGra y" />
67		</ Trigger>
68		</ControlT emplate.Tr iggers>
69		</Contro lTemplate>
70		</Sett er.Value>
71		</Se tter>
72		</ Style>
73
74		<! -- TabCont rol Style -->
75		<S tyle Targ etType="{x :Type TabC ontrol}">
76		<Setter Pr operty="Te mplate">
77		<Setter. Value>
78		<Contr olTemplate TargetTyp e="{x:Type TabContro l}">
79		<Gri d>
80		<G rid.Column Definition s>
81		<ColumnDef inition Wi dth="Auto" />
82		<ColumnDef inition Wi dth="*"/>
83		</ Grid.Colum nDefinitio ns>
84		<T abPanel
85		Margin= "0,15,0,0"
86		Grid.Colu mn="0"
87		Panel.ZIn dex="1"
88		IsItemsHo st="True"
89		Backgroun d="Transpa rent" />
90		<B order
91		Grid.Colu mn="1"
92		BorderBru sh="LightG ray"
93		Backgro und="Light gray"
94		BorderThi ckness="10 "
95		CornerRad ius="4, 4, 4, 4"
96		Padding ="10">
97		<ContentPr esenter Co ntentSourc e="Selecte dContent" />
98		</ Border>
99		</Gr id>
100		</Cont rolTemplat e>
101		</Setter .Value>
102		</Setter>
103		</Styl e>
104		<C olor x:Key ="NotActiv eColor">Re d</Color>
105		<C olor x:Key ="SuperDar kGray">#FF 4D4A4A</Co lor>
106
107		<Contr olTemplate x:Key="Te xtBoxError Template" TargetType ="Control" >
108		<G rid ClipTo Bounds="Fa lse" >
109		<Ellipse Fill="Red " Horizont alAlignmen t="Right" VerticalAl ignment="T op"
110		Width ="8" Heigh t="8"
111		ToolT ip="{Bindi ng Element Name=adorn edElement, Path=Ador nedElement .(Validati on.Errors) ,
112		Conve rter={v:Va lidationEr rorsToStri ngConverte r}}"/>
113		<Border BorderBrus h="Red" Bo rderThickn ess="1" Ma rgin="-1">
114		<Ado rnedElemen tPlacehold er Name="a dornedElem ent" />
115		</Border >
116		</ Grid>
117		</Cont rolTemplat e>
118
119
120		<!-- R esource di ctionary e ntries sho uld be def ined here. -->
121		</Resource Dictionary >