Merge pull request #5209 from CodingFabian/text-layer-transform-origin

Set transformOrigin for text layer in css.
mozilla · Aug 19, 2014 · b4fb1e2 · b4fb1e2
2 parents 6969ed4 + 1da38ec
commit b4fb1e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/web/text_layer_builder.js b/web/text_layer_builder.js
@@ -91,7 +91,6 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
             transform = 'rotate(' + rotation + 'deg) ' + transform;
           }
           CustomStyle.setProp('transform' , textDiv, transform);
-          CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
         }
       }
 

diff --git a/web/viewer.css b/web/viewer.css
@@ -1027,7 +1027,7 @@ html[dir='rtl'] .verticalToolbarSeparator {
 }
 
 .horizontalToolbarSeparator {
-  display: block; 
+  display: block;
   margin: 0 0 4px 0;
   height: 1px;
   width: 100%;
@@ -1305,8 +1305,6 @@ canvas {
   top: 0;
   right: 0;
   bottom: 0;
-  color: #000;
-  font-family: sans-serif;
   overflow: hidden;
 }
 
@@ -1315,6 +1313,11 @@ canvas {
   position: absolute;
   white-space: pre;
   cursor: text;
+  -webkit-transform-origin: 0% 0%;
+  -moz-transform-origin: 0% 0%;
+  -o-transform-origin: 0% 0%;
+  -ms-transform-origin: 0% 0%;
+  transform-origin: 0% 0%;
 }
 
 .textLayer .highlight {
@@ -1489,7 +1492,7 @@ canvas {
 }
 
 .dialog .separator {
-  display: block; 
+  display: block;
   margin: 4px 0 4px 0;
   height: 1px;
   width: 100%;
@@ -1672,7 +1675,7 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
     background: url(images/[email protected]) no-repeat;
     background-size: 7px 16px;
   }
-  
+
   html[dir='ltr'] .toolbarButton#sidebarToggle::before {
     content: url(images/[email protected]);
   }
@@ -1962,4 +1965,3 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
     display: none;
   }
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,6 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() { @@
                 transform = 'rotate(' + rotation + 'deg) ' + transform;
               }
               CustomStyle.setProp('transform' , textDiv, transform);
-              CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');
             }
           }
@@ Expand Down @@