Skip to content
Permalink
Browse files

Merge branch 't/9945'

  • Loading branch information...
oleq committed May 29, 2013
2 parents 8ad21b6 + 20b65e5 commit ff0947ac7a782b270d83a166758012e9d52d3df6
Showing with 17 additions and 0 deletions.
  1. +1 −0 CHANGES.md
  2. +3 −0 core/env.js
  3. +7 −0 skins/kama/mainui.css
  4. +6 −0 skins/moono/mainui.css
@@ -11,6 +11,7 @@ CKEditor 4 Changelog
* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while config#enterMode is ENTER_BR.
* [#6504](http://dev.ckeditor.com/ticket/6504): Resolved race condition while loading several customConfig files.
* [#10298](http://dev.ckeditor.com/ticket/10298): Data processor breaks attributes containing protected parts.
* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.

## CKEditor 4.1.1

@@ -306,6 +306,9 @@ if ( !CKEDITOR.env ) {
if ( env.air )
env.cssClass += ' cke_browser_air';

if ( env.iOS )
env.cssClass += ' cke_browser_ios';

return env;
})();
}
@@ -133,6 +133,13 @@ Special outer level classes used in this file:
white-space: normal;
}

/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
.cke_browser_ios .cke_contents
{
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

/* The resizer is the small UI element that is rendered at the bottom right
part of the editor. It makes is possible to resize the editor UI. */
.cke_resizer
@@ -147,6 +147,12 @@ Special outer level classes used in this file:
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#ffebebeb', endColorstr='#cfd1cf');
}

/* On iOS we need to manually enable scrolling in the contents block. (#9945) */
.cke_browser_ios .cke_contents
{
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

/* The resizer is the small UI element that is rendered at the bottom right
part of the editor. It makes is possible to resize the editor UI. */

0 comments on commit ff0947a

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.