Skip to content

Commit ca6b0cd

Browse files
committed
Merge branch 't/11809'
2 parents 8c6d5e4 + f33a21b commit ca6b0cd

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ CKEditor 4 Changelog
44
## CKEditor 4.4.1
55

66
Fixed Issues:
7-
8-
* [#11223](http://dev.ckeditor.com/ticket/11223): Fixeed issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the title element.
7+
* [#11809](http://dev.ckeditor.com/ticket/11809): Set indentation to four spaces in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
8+
* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the title element.
99
* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin from required in [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
1010
* [#11754](http://dev.ckeditor.com/ticket/11754): Fixed: Infinite loop in Google Chrome when contents contains not closed attributes.
1111
* [#11848](http://dev.ckeditor.com/ticket/11848): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception in IE, when there was no selection in editor.

contents.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ pre
9393
{
9494
white-space: pre-wrap; /* CSS 2.1 */
9595
word-wrap: break-word; /* IE7 */
96+
-moz-tab-size: 4;
97+
-o-tab-size: 4;
98+
-webkit-tab-size: 4;
99+
tab-size: 4;
96100
}
97101

98102
.marker

plugins/codesnippet/samples/codesnippet.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ <h1 class="samples">
4444
<p>
4545
Select theme: <select id="select"></select>
4646
</p>
47-
<p>
48-
The CKEditor instance below was created by using the following configuration settings:
49-
</p>
47+
<p>
48+
The CKEditor instance below was created by using the following configuration settings:
49+
</p>
5050

5151
<pre class="samples" id="sampleConfig">
5252
CKEDITOR.replace( 'editor1', {

samples/sample.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ input, textarea, select, option, optgroup, button, td, th
1818
font-size: 100%;
1919
}
2020

21+
pre
22+
{
23+
-moz-tab-size: 4;
24+
-o-tab-size: 4;
25+
-webkit-tab-size: 4;
26+
tab-size: 4;
27+
}
28+
2129
pre, code, kbd, samp, tt
2230
{
2331
font-family: monospace,monospace;
@@ -165,10 +173,6 @@ pre.samples
165173
padding: 0.25em;
166174
white-space: pre-wrap; /* CSS 2.1 */
167175
word-wrap: break-word; /* IE7 */
168-
-moz-tab-size: 4;
169-
-o-tab-size: 4;
170-
-webkit-tab-size: 4;
171-
tab-size: 4;
172176
}
173177

174178
#footer

0 commit comments

Comments
 (0)