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

1603.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	styles.js	Tue Dec 20 19:50:42 2016 UTC
2			Wed Feb 1 19:57:58 2017 UTC

1603.2 Comparison summary

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

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

1603.4 Active regular expressions

No regular expressions were active.

1603.5 Comparison detail

1		/**
2		* Copyrig ht (c) 200 3-2015, CK Source - F rederico K nabben. Al l rights r eserved.
3		* This so ftware is covered by CKEditor Commercial License. Usage with out proper license i s prohibit ed.
4		*/
5
6		// This fi le contain s style de finitions that can b e used by CKEditor p lugins.
7		//
8		// The mos t common u se for it is the "st ylescombo" plugin, w hich shows a combo
9		// in the editor too lbar, cont aining all styles. O ther plugi ns instead , like
10		// the div plugin, u se a subse t of the s tyles on t heir featu re.
11		//
12		// If you don't have plugins t hat depend on this f ile, you c an simply ignore it.
13		// Otherwi se it is s trongly re commended to customi ze this fi le to matc h your
14		// website requireme nts and de sign prope rly.
15
16		CKEDITOR.s tylesSet.a dd( 'defau lt', [
17		/* Block Sty les */
18
19		// These sty les are al ready avai lable in t he "Format " combo (" format" pl ugin),
20		// so they a re not nee ded here b y default. You may e nable them to avoid
21		// placing t he "Format " combo in the toolb ar, mainta ining the same featu res.
22		/*
23		{ name: 'Par agraph', element: ' p' },
24		{ name: 'Hea ding 1', element: ' h1' },
25		{ name: 'Hea ding 2', element: ' h2' },
26		{ name: 'Hea ding 3', element: ' h3' },
27		{ name: 'Hea ding 4', element: ' h4' },
28		{ name: 'Hea ding 5', element: ' h5' },
29		{ name: 'Hea ding 6', element: ' h6' },
30		{ name: 'Pre formatted Text',elem ent: 'pre' },
31		{ name: 'Add ress', el ement: 'ad dress' },
32		*/
33
34		{ name: 'Ita lic Title' , element: ' h2', style s: { 'font -style': ' italic' } },
35		{ name: 'Sub title', el ement: 'h3 ', styles: { 'color' : '#aaa', 'font-styl e': 'itali c' } },
36		{
37		name : 'Special Container ',
38		elem ent: 'div' ,
39		styl es: {
40		paddin g: '5px 10 px',
41		backgr ound: '#ee e',
42		border : '1px sol id #ccc'
43		}
44		},
45
46		/* Inline St yles */
47
48		// These are core styl es availab le as tool bar button s. You may opt enabl ing
49		// some of t hem in the Styles co mbo, remov ing them f rom the to olbar.
50		// (This req uires the "stylescom bo" plugin )
51		/*
52		{ name: 'Str ong', el ement: 'st rong', ove rrides: 'b ' },
53		{ name: 'Emp hasis', el ement: 'em ' , over rides: 'i' },
54		{ name: 'Und erline', element: ' u' },
55		{ name: 'Str ikethrough ', element: ' strike' },
56		{ name: 'Sub script', element: ' sub' },
57		{ name: 'Sup erscript', element: ' sup' },
58		*/
59
60		{ name: 'Mar ker', el ement: 'sp an', attri butes: { ' class': 'm arker' } } ,
61
62		{ name: 'Big ', el ement: 'bi g' },
63		{ name: 'Sma ll', el ement: 'sm all' },
64		{ name: 'Typ ewriter', element: ' tt' },
65
66		{ name: 'Com puter Code ', element: ' code' },
67		{ name: 'Key board Phra se', element: ' kbd' },
68		{ name: 'Sam ple Text', element: ' samp' },
69		{ name: 'Var iable', el ement: 'va r' },
70
71		{ name: 'Del eted Text' , element: ' del' },
72		{ name: 'Ins erted Text ', element: ' ins' },
73
74		{ name: 'Cit ed Work', element: ' cite' },
75		{ name: 'Inl ine Quotat ion', element: ' q' },
76
77		{ name: 'Lan guage: RTL ', element: ' span', att ributes: { 'dir': 'r tl' } },
78		{ name: 'Lan guage: LTR ', element: ' span', att ributes: { 'dir': 'l tr' } },
79
80		/* Object St yles */
81
82		{
83		name : 'Styled image (lef t)',
84		elem ent: 'img' ,
85		attr ibutes: { 'class': ' left' }
86		},
87
88		{
89		name : 'Styled image (rig ht)',
90		elem ent: 'img' ,
91		attr ibutes: { 'class': ' right' }
92		},
93
94		{
95		name : 'Compact table',
96		elem ent: 'tabl e',
97		attr ibutes: {
98		cellpa dding: '5' ,
99		cellsp acing: '0' ,
100		border : '1',
101		border color: '#c cc'
102		},
103		styl es: {
104		'borde r-collapse ': 'collap se'
105		}
106		},
107
108		{ name: 'Bor derless Ta ble', el ement: 'ta ble', styles: { 'border- style': 'h idden', 'b ackground- color': '# E6E6FA' } },
109		{ name: 'Squ are Bullet ed List', element: ' ul', styles : { 'list- style-type ': 'square ' } }
110		] );
111