1601. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:58 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.

1601.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 Portal\trunk\BTSSSPortal\js\ckeditor	contents.css	Tue Dec 20 19:50:50 2016 UTC
2			Wed Feb 1 19:57:58 2017 UTC

1601.2 Comparison summary

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

1601.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

1601.4 Active regular expressions

No regular expressions were active.

1601.5 Comparison detail

1		/*
2		Copyright (c) 2003-2 015, CKSou rce - Fred erico Knab ben. All r ights rese rved.
3		This softw are is cov ered by CK Editor Com mercial Li cense. Usa ge without proper li cense is p rohibited.
4		*/
5
6		body
7		{
8		/* Font */
9		fo nt-family: sans-seri f, Arial, Verdana, " Trebuchet MS";
10		fo nt-size: 1 2px;
11
12		/* Text colo r */
13		co lor: #333;
14
15		/* Remove th e backgrou nd color t o make it transparen t */
16		ba ckground-c olor: #fff ;
17
18		ma rgin: 20px ;
19		}
20
21		.cke_edita ble
22		{
23		fo nt-size: 1 3px;
24		li ne-height: 1.6;
25		}
26
27		blockquote
28		{
29		fo nt-style: italic;
30		fo nt-family: Georgia, Times, "Ti mes New Ro man", seri f;
31		pa dding: 2px 0;
32		bo rder-style : solid;
33		bo rder-color : #ccc;
34		bo rder-width : 0;
35		}
36
37		.cke_conte nts_ltr bl ockquote
38		{
39		pa dding-left : 20px;
40		pa dding-righ t: 8px;
41		bo rder-left- width: 5px ;
42		}
43
44		.cke_conte nts_rtl bl ockquote
45		{
46		pa dding-left : 8px;
47		pa dding-righ t: 20px;
48		bo rder-right -width: 5p x;
49		}
50
51		a
52		{
53		co lor: #0782 C1;
54		}
55
56		ol,ul,dl
57		{
58		/* IE7: rese t rtl list margin. ( #7334) */
59		*m argin-righ t: 0px;
60		/* preserved spaces fo r list ite ms with te xt directi on other t han the li st. (#6249 ,#8049)*/
61		pa dding: 0 4 0px;
62		}
63
64		h1,h2,h3,h 4,h5,h6
65		{
66		fo nt-weight: normal;
67		li ne-height: 1.2;
68		}
69
70		hr
71		{
72		bo rder: 0px;
73		bo rder-top: 1px solid #ccc;
74		}
75
76		img.right
77		{
78		bo rder: 1px solid #ccc ;
79		fl oat: right ;
80		ma rgin-left: 15px;
81		pa dding: 5px ;
82		}
83
84		img.left
85		{
86		bo rder: 1px solid #ccc ;
87		fl oat: left;
88		ma rgin-right : 15px;
89		pa dding: 5px ;
90		}
91
92		pre
93		{
94		wh ite-space: pre-wrap; /* CSS 2. 1 */
95		wo rd-wrap: b reak-word; /* IE7 */
96		-m oz-tab-siz e: 4;
97		ta b-size: 4;
98		}
99
100		.marker
101		{
102		ba ckground-c olor: Yell ow;
103		}
104
105		span[lang]
106		{
107		fo nt-style: italic;
108		}
109
110		figure
111		{
112		te xt-align: center;
113		bo rder: soli d 1px #ccc ;
114		bo rder-radiu s: 2px;
115		ba ckground: rgba(0,0,0 ,0.05);
116		pa dding: 10p x;
117		ma rgin: 10px 20px;
118		di splay: inl ine-block;
119		}
120
121		figure > f igcaption
122		{
123		te xt-align: center;
124		di splay: blo ck; /* For IE8 */
125		}
126
127		a > img {
128		pa dding: 1px ;
129		ma rgin: 1px;
130		bo rder: none ;
131		ou tline: 1px solid #07 82C1;
132		}