Merge branch 'iframes-must-die' of github.com:ether/etherpad-lite into iframes-must-die

src/static/css/iframe_editor.css

@@ -1,8 +1,8 @@
 /* These CSS rules are included in both the outer and inner ACE iframe.
    Also see inner.css, included only in the inner one.
 */
-html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
+#innerdocbody html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
-span { cursor: auto; }
+#innerdocbody span { cursor: auto; }
 
 ::selection {
   background: #acf;
@@ -11,7 +11,7 @@ span { cursor: auto; }
   background: #acf;
 }
 
-a { 
+#innerdocbody a { 
   cursor: pointer !important; 
   white-space:pre-wrap;
 }
@@ -80,21 +80,19 @@ ul.list-indent6, ul.list-indent7, ul.list-indent8, ul.list-indent9, ul.list-inde
 ul.list-indent11, ul.list-indent12, ul.list-indent13, 
 ul.list-indent14, ul.list-indent15, ul.list-indent16 { list-style-type: none; }
 
-body {
-  margin: 0;
-  white-space: nowrap;
-  word-wrap: normal;
-}
-
 #outerdocbody {
   background-color: #fff;
 }
-body.grayedout { background-color: #eee !important }
+
+#innerdocbody.grayedout { background-color: #eee !important }
 
 #innerdocbody {
   font-size: 12px; /* overridden by body.style */
   font-family:Arial, sans-serif; /* overridden by body.style */
   line-height: 16px; /* overridden by body.style */
+  margin: 0;
+  white-space: nowrap;
+  word-wrap: normal;
 }
 
 body.doesWrap {

src/static/css/pad.css

@@ -547,6 +547,12 @@ table#otheruserstable {
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;
   display: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 #chattext {
   background-color: white;