Skip to content

Commit 2b01e55

Browse files
committed
Merge branch 't/13279' into major
2 parents c097f48 + ab0eb06 commit 2b01e55

File tree

24 files changed

+28
-292
lines changed

24 files changed

+28
-292
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Other Changes:
4949
* [#13207](http://dev.ckeditor.com/ticket/13207): Use modal window to display help in toolbar configurator.
5050
* [#13316](http://dev.ckeditor.com/ticket/13316): Made [`CKEDITOR.env.isCompatible`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-isCompatible) a blacklist rather than a whitelist. More about the change in the [Browser Compatibility](http://docs.ckeditor.com/#!/guide/dev_browsers) guide.
5151
* [#13398](http://dev.ckeditor.com/ticket/13398): Renamed `CKEDITOR.fileTools.UploadsRepository` to [`CKEDITOR.fileTools.UploadRepository`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadRepository) and changed all related properties.
52+
* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.
5253

5354
## CKEditor 4.5 Beta
5455

contents.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ pre
9494
white-space: pre-wrap; /* CSS 2.1 */
9595
word-wrap: break-word; /* IE7 */
9696
-moz-tab-size: 4;
97-
-o-tab-size: 4;
98-
-webkit-tab-size: 4;
9997
tab-size: 4;
10098
}
10199

dev/console/console.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ div.ckconsole {
2020
z-index: 99999;
2121
opacity: 0.8;
2222
transition: opacity 0.5s;
23-
-webkit-transition: opacity 0.5s;
2423
}
2524

2625
div.ckconsole_side_left {
@@ -66,7 +65,6 @@ div.ckconsole:hover {
6665
background: #EEE;
6766
border-top: solid 2px #CCC;
6867
transition: background 0.1s;
69-
-webkit-transition: background 0.1s;
7068
}
7169
.ckconsole .ckconsole_panel_header:before {
7270
content: '\25bE\00a0'; /* small down triangle arrow + nbsp */
@@ -110,7 +108,6 @@ div.ckconsole:hover {
110108
border-bottom: solid 1px #EEE;
111109
background: rgba(0,0,0,0);
112110
transition: background 1s;
113-
-webkit-transition: background 1s;
114111
}
115112

116113
.ckconsole .ckconsole_fresh_log_item {

plugins/bbcode/dev/bbcode.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
border: solid 3px #555;
3434
overflow: auto;
3535
color: #000;
36-
-webkit-transition: border-color 0.5s;
37-
-moz-transition: border-color 0.5s;
38-
-o-transition: border-color 0.5s;
39-
-ms-transition: border-color 0.5s;
4036
transition: border-color 0.5s;
4137
font-family: Monaco, monospace;
4238
font-size: 13px;

plugins/clipboard/dev/clipboard.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
margin: 0;
3636
padding: 0 5px;
3737
background: rgba(0, 0, 0, 0.25);
38-
-webkit-transition: background-color 1s;
39-
-moz-transition: background-color 1s;
40-
-o-transition: background-color 1s;
41-
-ms-transition: background-color 1s;
4238
transition: background-color 1s;
4339
}
4440
#console > p.old {

plugins/indent/dev/indent.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
padding: 0;
2424

2525
box-sizing: content-box;
26-
-moz-box-sizing: content-box;
27-
-webkit-box-sizing: content-box;
2826

2927
background: #eee;
3028
}
@@ -35,9 +33,6 @@
3533
float: left;
3634

3735
box-sizing: border-box;
38-
-moz-box-sizing: border-box;
39-
-webkit-box-sizing: border-box;
40-
4136
}
4237
.editors li:nth-child(2n) {
4338
background: #D4E59A;

plugins/magicline/plugin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@
597597
( env.hc ? 'font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;' : '' ) +
598598
( env.hidpi ? 'background-size: 9px 10px;' : '' ),
599599
looks: [
600-
'top:-8px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '2px', 1 ),
601-
'top:-17px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '2px 2px 0px 0px', 1 ),
602-
'top:-1px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '0px 0px 2px 2px', 1 )
600+
'top:-8px; border-radius: 2px;',
601+
'top:-17px; border-radius: 2px 2px 0px 0px;',
602+
'top:-1px; border-radius: 0px 0px 2px 2px;'
603603
]
604604
}
605605
),

samples/old/sample.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ input, textarea, select, option, optgroup, button, td, th
2121
pre
2222
{
2323
-moz-tab-size: 4;
24-
-o-tab-size: 4;
25-
-webkit-tab-size: 4;
2624
tab-size: 4;
2725
}
2826

@@ -42,9 +40,6 @@ code
4240
background: #f3f3f3;
4341
border: 1px solid #ddd;
4442
padding: 1px 4px;
45-
46-
-moz-border-radius: 3px;
47-
-webkit-border-radius: 3px;
4843
border-radius: 3px;
4944
}
5045

@@ -63,9 +58,6 @@ abbr
6358
margin: 0 0 0 5px;
6459
color: #fff;
6560
float: right;
66-
67-
-moz-border-radius: 3px;
68-
-webkit-border-radius: 3px;
6961
border-radius: 3px;
7062
}
7163

@@ -75,8 +67,6 @@ abbr
7567
border: 1px solid #DA8028;
7668
text-shadow: 0 1px 0 #C97626;
7769

78-
-moz-box-shadow: 0 2px 3px 0 #FFA54E inset;
79-
-webkit-box-shadow: 0 2px 3px 0 #FFA54E inset;
8070
box-shadow: 0 2px 3px 0 #FFA54E inset;
8171
}
8272

@@ -87,8 +77,6 @@ abbr
8777
text-shadow: 0 1px 0 #048CAD;
8878
font-style: italic;
8979

90-
-moz-box-shadow: 0 2px 3px 0 #50D4FD inset;
91-
-webkit-box-shadow: 0 2px 3px 0 #50D4FD inset;
9280
box-shadow: 0 2px 3px 0 #50D4FD inset;
9381
}
9482

samples/toolbarconfigurator/less/toolbarmodifier.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ div.toolbarModifier {
436436
resize: none;
437437
outline: none;
438438
-moz-tab-size: 4;
439-
-o-tab-size: 4;
440439
tab-size: 4;
441440
white-space: pre;
442441
word-wrap: normal;

skins/kama/mainui.css

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ Special outer level classes used in this file:
5252
display: block;
5353

5454
/* Rounded borders. */
55-
-moz-border-radius: 5px;
56-
-webkit-border-radius: 5px;
5755
border-radius: 5px;
5856
border: 1px solid #D3D3D3;
5957

@@ -74,19 +72,12 @@ Special outer level classes used in this file:
7472
display: block;
7573

7674
/* Rounded borders. */
77-
-moz-border-radius: 5px;
78-
-webkit-border-radius: 5px;
7975
-webkit-touch-callout: none;
8076
border-radius: 5px;
8177

8278
/* The white-to-color gradiend we see at the top of the editor. */
8379
background: #d3d3d3 url(images/sprites.png) repeat-x 0 -1950px;
84-
background: -webkit-gradient(linear, 0 -15, 0 40, from(#fff), to(#d3d3d3)); /* Chrome,Safari4+ */
85-
background: -moz-linear-gradient(top, #fff -15px, #d3d3d3 40px); /* FF3.6+ */
86-
background: -webkit-linear-gradient(top, #fff -15px, #d3d3d3 40px); /* Chrome10+,Safari5.1+ */
87-
background: -o-linear-gradient(top, #fff -15px, #d3d3d3 40px); /* Opera 11.10+ */
88-
background: -ms-linear-gradient(top, #fff -15px, #d3d3d3 40px); /* IE10+ */
89-
background: linear-gradient(top, #fff -15px, #d3d3d3 40px); /* W3C */
80+
background: linear-gradient(to bottom, #fff -15px, #d3d3d3 40px);
9081

9182
/* Spacing with the inner blocks. */
9283
padding: 5px;
@@ -207,7 +198,5 @@ Special outer level classes used in this file:
207198
padding: 0 8px;
208199
outline-style: none;
209200

210-
-moz-box-sizing: border-box;
211-
-webkit-box-sizing: border-box;
212201
box-sizing: border-box;
213202
}

0 commit comments

Comments
 (0)