Skip to content
Permalink
Browse files

Merge branch 't/13279' into major

  • Loading branch information...
Reinmar committed Jun 15, 2015
2 parents c097f48 + ab0eb06 commit 2b01e55986b9dfe58d1e2520427f1597a19c6d76
@@ -49,6 +49,7 @@ Other Changes:
* [#13207](http://dev.ckeditor.com/ticket/13207): Use modal window to display help in toolbar configurator.
* [#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.
* [#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.
* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.

## CKEditor 4.5 Beta

@@ -94,8 +94,6 @@ pre
white-space: pre-wrap; /* CSS 2.1 */
word-wrap: break-word; /* IE7 */
-moz-tab-size: 4;
-o-tab-size: 4;
-webkit-tab-size: 4;
tab-size: 4;
}

@@ -20,7 +20,6 @@ div.ckconsole {
z-index: 99999;
opacity: 0.8;
transition: opacity 0.5s;
-webkit-transition: opacity 0.5s;
}

div.ckconsole_side_left {
@@ -66,7 +65,6 @@ div.ckconsole:hover {
background: #EEE;
border-top: solid 2px #CCC;
transition: background 0.1s;
-webkit-transition: background 0.1s;
}
.ckconsole .ckconsole_panel_header:before {
content: '\25bE\00a0'; /* small down triangle arrow + nbsp */
@@ -110,7 +108,6 @@ div.ckconsole:hover {
border-bottom: solid 1px #EEE;
background: rgba(0,0,0,0);
transition: background 1s;
-webkit-transition: background 1s;
}

.ckconsole .ckconsole_fresh_log_item {
@@ -33,10 +33,6 @@
border: solid 3px #555;
overflow: auto;
color: #000;
-webkit-transition: border-color 0.5s;
-moz-transition: border-color 0.5s;
-o-transition: border-color 0.5s;
-ms-transition: border-color 0.5s;
transition: border-color 0.5s;
font-family: Monaco, monospace;
font-size: 13px;
@@ -35,10 +35,6 @@
margin: 0;
padding: 0 5px;
background: rgba(0, 0, 0, 0.25);
-webkit-transition: background-color 1s;
-moz-transition: background-color 1s;
-o-transition: background-color 1s;
-ms-transition: background-color 1s;
transition: background-color 1s;
}
#console > p.old {
@@ -23,8 +23,6 @@
padding: 0;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
background: #eee;
}
@@ -35,9 +33,6 @@
float: left;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.editors li:nth-child(2n) {
background: #D4E59A;
@@ -597,9 +597,9 @@
( env.hc ? 'font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;' : '' ) +
( env.hidpi ? 'background-size: 9px 10px;' : '' ),
looks: [
'top:-8px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '2px', 1 ),
'top:-17px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '2px 2px 0px 0px', 1 ),
'top:-1px;' + CKEDITOR.tools.cssVendorPrefix( 'border-radius', '0px 0px 2px 2px', 1 )
'top:-8px; border-radius: 2px;',
'top:-17px; border-radius: 2px 2px 0px 0px;',
'top:-1px; border-radius: 0px 0px 2px 2px;'
]
}
),
@@ -21,8 +21,6 @@ input, textarea, select, option, optgroup, button, td, th
pre
{
-moz-tab-size: 4;
-o-tab-size: 4;
-webkit-tab-size: 4;
tab-size: 4;
}

@@ -42,9 +40,6 @@ code
background: #f3f3f3;
border: 1px solid #ddd;
padding: 1px 4px;

-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}

@@ -63,9 +58,6 @@ abbr
margin: 0 0 0 5px;
color: #fff;
float: right;

-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}

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

-moz-box-shadow: 0 2px 3px 0 #FFA54E inset;
-webkit-box-shadow: 0 2px 3px 0 #FFA54E inset;
box-shadow: 0 2px 3px 0 #FFA54E inset;
}

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

-moz-box-shadow: 0 2px 3px 0 #50D4FD inset;
-webkit-box-shadow: 0 2px 3px 0 #50D4FD inset;
box-shadow: 0 2px 3px 0 #50D4FD inset;
}

@@ -436,7 +436,6 @@ div.toolbarModifier {
resize: none;
outline: none;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
white-space: pre;
word-wrap: normal;
@@ -52,8 +52,6 @@ Special outer level classes used in this file:
display: block;

/* Rounded borders. */
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
border: 1px solid #D3D3D3;

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

/* Rounded borders. */
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
-webkit-touch-callout: none;
border-radius: 5px;

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

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

-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
@@ -55,8 +55,6 @@ panel contents and color panels check menu.css and colorpanel.css.

overflow: hidden;

-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}

@@ -71,8 +69,6 @@ panel contents and color panels check menu.css and colorpanel.css.
.cke_combopanel
{
border: 1px solid #8f8f73;
-moz-border-radius-topleft: 0;
-webkit-border-top-left-radius: 0;
border-top-left-radius: 0;
width: 150px;
height: 170px;
@@ -36,12 +36,7 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;
}

@@ -59,12 +54,7 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
height: auto;
vertical-align: baseline;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;

/* These are rule inherited by all children elements. */
@@ -117,8 +107,6 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
.cke_reset_all select
{
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}

.cke_reset_all table
@@ -60,17 +60,14 @@ The visual representation of a rich combo widget looks as follows:
a.cke_combo_button
{
display: inline-block;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
background: url(images/sprites.png) 0 -100px repeat-x; /* For backwards compatibility. */
float: left;
padding: 2px 4px 2px 6px;
height: 22px;
margin: 0 5px 5px 0;

background: -moz-linear-gradient(bottom, #fff, #d3d3d3 100px);
background: -webkit-gradient(linear, left bottom, left -100, from(#fff), to(#d3d3d3));
background: linear-gradient(to top, #fff, #d3d3d3 100px);
}

/* Different states of the container. */
@@ -82,16 +82,6 @@ CKEDITOR.skin.ua_dialog = 'ie,iequirks,ie7,ie8';
// The "$color" placeholder can be used in the returned string. It'll be
// replaced with the desired color.
CKEDITOR.skin.chameleon = function( editor, part ) {
// Use this function just to avoid having to repeat all these rules on
// several places of our template.
function getLinearBackground( definition ) {
return 'background:-moz-linear-gradient(' + definition + ');' + // FF3.6+
'background:-webkit-linear-gradient(' + definition + ');' + // Chrome10+, Safari5.1+
'background:-o-linear-gradient(' + definition + ');' + // Opera 11.10+
'background:-ms-linear-gradient(' + definition + ');' + // IE10+
'background:linear-gradient(' + definition + ');'; // W3C
}

var css;

// The Chameleon feature is available for each CKEditor instance,
@@ -113,20 +103,17 @@ CKEDITOR.skin.chameleon = function( editor, part ) {
cssId + ' .cke_dialog_tab' +
'{' +
'background-color:$color;' +
'background:-webkit-gradient(linear,0 -15,0 40,from(#fff),to($color));' +
getLinearBackground( 'top,#fff -15px,$color 40px' ) +
'linear-gradient( to bottom,#fff -15px,$color 40px );' +
'}' +

cssId + ' .cke_toolgroup' +
'{' +
'background:-webkit-gradient(linear,0 0,0 100,from(#fff),to($color));' +
getLinearBackground( 'top,#fff,$color 100px' ) +
'linear-gradient( to bottom,#fff,$color 100px );' +
'}' +

cssId + ' .cke_combo_button' +
'{' +
'background:-webkit-gradient(linear, left bottom, left -100, from(#fff), to($color));' +
getLinearBackground( 'bottom,#fff,$color 100px' ) +
'linear-gradient( to top,#fff,$color 100px );' +
'}' +

cssId + ' .cke_dialog_contents,' +
@@ -63,20 +63,13 @@ Special outer level classes used in this file:
/* The box that holds buttons. */
.cke_toolgroup
{
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
float: left;
margin: 0 6px 5px 0;
padding: 2px;
background: url(images/sprites.png) repeat-x 0 -500px;

background: -webkit-gradient(linear, 0 0, 0 100, from(#fff), to(#d3d3d3)); /* Chrome,Safari4+ */
background: -moz-linear-gradient(top, #fff, #d3d3d3 100px); /* FF3.6+ */
background: -webkit-linear-gradient(top, #fff, #d3d3d3 100px); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #fff, #d3d3d3 100px); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #fff, #d3d3d3 100px); /* IE10+ */
background: linear-gradient(top, #fff, #d3d3d3 100px); /* W3C */
background: linear-gradient(to bottom, #fff, #d3d3d3 100px);
}

.cke_hc .cke_toolgroup
@@ -104,8 +97,6 @@ a.cke_button
display: inline-block;
height: 18px;
padding: 2px 4px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
outline: none;
cursor: default;
Oops, something went wrong.

0 comments on commit 2b01e55

Please sign in to comment.
You can’t perform that action at this time.