Skip to content

Commit f61eb55

Browse files
committed
All styles now related to .cke-editable div, font-size and line-height declared in px to fix webkit/blink bug
1 parent 2f050dc commit f61eb55

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

ckeditor/contents.css

+18-31
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,19 @@ Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
33
For licensing, see LICENSE.md or http://ckeditor.com/license
44
*/
55

6-
body.cke_editable
6+
.cke_editable
77
{
88
/* Font */
9-
font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
10-
font-size: 12px;
11-
12-
/* Text color */
9+
font-family: Helvetica, Arial, sans-serif;
10+
/* declare in px to fix Webkit/Blink bug that adds a span tag with line-height style - http://dev.ckeditor.com/ticket/9998?cversion=1&cnum_hist=45#comment:52 */
11+
font-size: 13px;
12+
line-height: 18px;
1313
color: #333;
14-
15-
/* Remove the background color to make it transparent */
1614
background-color: #fff;
17-
1815
margin: 20px;
1916
}
2017

21-
.cke_editable
22-
{
23-
font-size: 13px;
24-
line-height: 1.6;
25-
}
26-
27-
blockquote
18+
.cke_editable blockquote
2819
{
2920
font-style: italic;
3021
font-family: Georgia, Times, "Times New Roman", serif;
@@ -48,64 +39,60 @@ blockquote
4839
border-right-width: 5px;
4940
}
5041

51-
a
42+
.cke_editable a
5243
{
5344
color: #0782C1;
5445
}
5546

56-
ol,ul,dl
47+
.cke_editable ol,
48+
.cke_editable ul,
49+
.cke_editable dl
5750
{
5851
/* IE7: reset rtl list margin. (#7334) */
5952
*margin-right: 0px;
6053
/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
6154
padding: 0 15px;
6255
}
6356

64-
h1,h2,h3,h4,h5,h6
65-
{
66-
font-weight: normal;
67-
line-height: 1.2;
68-
}
69-
70-
hr
57+
.cke_editable hr
7158
{
7259
border: 0px;
7360
border-top: 1px solid #ccc;
7461
}
7562

76-
img.right
63+
.cke_editable img.right
7764
{
7865
border: 1px solid #ccc;
7966
float: right;
8067
margin-left: 15px;
8168
padding: 5px;
8269
}
8370

84-
img.left
71+
.cke_editable img.left
8572
{
8673
border: 1px solid #ccc;
8774
float: left;
8875
margin-right: 15px;
8976
padding: 5px;
9077
}
9178

92-
pre
79+
.cke_editable pre
9380
{
9481
white-space: pre-wrap; /* CSS 2.1 */
9582
word-wrap: break-word; /* IE7 */
9683
}
9784

98-
.marker
85+
.cke_editable .marker
9986
{
10087
background-color: Yellow;
10188
}
10289

103-
span[lang]
90+
.cke_editable span[lang]
10491
{
10592
font-style: italic;
10693
}
10794

108-
figure
95+
.cke_editable figure
10996
{
11097
text-align: center;
11198
border: solid 1px #ccc;
@@ -116,7 +103,7 @@ figure
116103
display: block; /* For IE8 */
117104
}
118105

119-
figure figcaption
106+
.cke_editable figure figcaption
120107
{
121108
text-align: center;
122109
display: block; /* For IE8 */

0 commit comments

Comments
 (0)