Merge pull request #3366 from ether/release/1.6.4

Release/1.6.4

src/static/css/iframe_editor.css

@@ -31,13 +31,17 @@ body {
 body.grayedout { background-color: #eee !important }
 
 #innerdocbody {
-  font-size: 12px; /* overridden by body.style */
+  font-size: 16px; /* overridden by body.style */
   font-family:Arial, sans-serif; /* overridden by body.style */
   line-height: 16px; /* overridden by body.style */
   background-color: white;
   color: black;
 }
 
+.innerdocbody>div{
+  padding: 1px;
+}
+
 body.doesWrap {
   /* white-space: pre-wrap; */
 
@@ -58,9 +62,11 @@ body.doesWrap {
   white-space: normal;
 }
 
-body.doesWrap:not(.noprewrap) > div{
-  /* Related to #1766 */
-  white-space: pre-wrap;
+@-moz-document url-prefix() {
+  body.doesWrap:not(.noprewrap) > div{
+    /* Related to #1766 */
+    white-space: pre-wrap;
+  }
 }
 
 #innerdocbody {

src/static/css/pad.css

@@ -3,8 +3,9 @@ html,
 body,
 p {
   margin: 0;
-  padding: 0;
+  padding: 0px;
 }
+
 .clear {
   clear: both
 }
@@ -1071,9 +1072,9 @@ input[type=checkbox] {
       overflow: auto;
     }
     #mycolorpicker {
-      left: -73px;
-      top:auto !important;
-      bottom:33px !important;
+      left: 0px;
+      top:37px !important;
+      position:fixed;
       /* #mycolorpicker: width -#users: width */;
     }
     #editorcontainer {

src/static/js/ace2_inner.js

@@ -5404,8 +5404,8 @@ function Ace2Inner(){
             // height is taken to be the top offset of the next line. If we
             // didn't do this special case, we would miss out on any top margin
             // included on the first line. The default stylesheet doesn't add
-            // extra margins, but plugins might.
-            h = b.nextSibling.offsetTop;
+            // extra margins/padding, but plugins might.
+            h = b.nextSibling.offsetTop - window.getComputedStyle(doc.body).getPropertyValue("padding-top");
           } else {
             h = b.nextSibling.offsetTop - b.offsetTop;
           }