From 48a24a48c14d778ee485f1cd9b57b5821f850af9 Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Fri, 6 Sep 2013 21:00:02 +0200
Subject: [PATCH] Fixing annotation icon issues

---
 src/shared/annotation.js               | 1 -
 web/images/annotation-check.svg        | 3 ++-
 web/images/annotation-comment.svg      | 3 ++-
 web/images/annotation-help.svg         | 3 ++-
 web/images/annotation-insert.svg       | 3 ++-
 web/images/annotation-key.svg          | 3 ++-
 web/images/annotation-newparagraph.svg | 3 ++-
 web/images/annotation-note.svg         | 3 ++-
 web/images/annotation-paragraph.svg    | 3 ++-
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/shared/annotation.js b/src/shared/annotation.js
index 1440d8bb3..d16898f91 100644
--- a/src/shared/annotation.js
+++ b/src/shared/annotation.js
@@ -543,7 +543,6 @@ var TextAnnotation = (function TextAnnotationClosure() {
       container.className = 'annotText';
 
       var image = document.createElement('img');
-      image.style.width = container.style.width;
       image.style.height = container.style.height;
       var iconName = item.name;
       image.src = PDFJS.imageResourcesPath + 'annotation-' +
diff --git a/web/images/annotation-check.svg b/web/images/annotation-check.svg
index f28f0e89a..71cd16df5 100644
--- a/web/images/annotation-check.svg
+++ b/web/images/annotation-check.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="40"
-   height="40">
+   height="40"
+   viewBox="0 0 40 40">
   <path
      d="M 1.5006714,23.536225 6.8925879,18.994244 14.585721,26.037937 34.019683,4.5410479 38.499329,9.2235032 14.585721,35.458952 z"
      id="path4"
diff --git a/web/images/annotation-comment.svg b/web/images/annotation-comment.svg
index b2aee63e5..86f1f1724 100644
--- a/web/images/annotation-comment.svg
+++ b/web/images/annotation-comment.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    height="40"
-   width="40">
+   width="40"
+   viewBox="0 0 40 40">
   <rect
      style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
      width="33.76017"
diff --git a/web/images/annotation-help.svg b/web/images/annotation-help.svg
index 349112ef3..00938fefe 100644
--- a/web/images/annotation-help.svg
+++ b/web/images/annotation-help.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="40"
-   height="40">
+   height="40"
+   viewBox="0 0 40 40">
   <g
      transform="translate(0,-60)"
      id="layer1">
diff --git a/web/images/annotation-insert.svg b/web/images/annotation-insert.svg
index 60fbf954c..519ef6826 100644
--- a/web/images/annotation-insert.svg
+++ b/web/images/annotation-insert.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="64"
-   height="64">
+   height="64"
+   viewBox="0 0 64 64">
   <path
      d="M 32.003143,1.4044602 57.432701,62.632577 6.5672991,62.627924 z"
      style="fill:#ffff00;fill-opacity:0.94117647;fill-rule:nonzero;stroke:#000000;stroke-width:1.00493038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
diff --git a/web/images/annotation-key.svg b/web/images/annotation-key.svg
index c0bbb09c5..8d09d5378 100644
--- a/web/images/annotation-key.svg
+++ b/web/images/annotation-key.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="64"
-   height="64">
+   height="64"
+   viewBox="0 0 64 64">
   <path
      d="M 25.470843,9.4933766 C 25.30219,12.141818 30.139101,14.445969 34.704831,13.529144 40.62635,12.541995 41.398833,7.3856498 35.97505,5.777863 31.400921,4.1549155 25.157674,6.5445892 25.470843,9.4933766 z M 4.5246282,17.652051 C 4.068249,11.832873 9.2742983,5.9270407 18.437379,3.0977088 29.751911,-0.87185184 45.495663,1.4008022 53.603953,7.1104009 c 9.275765,6.1889221 7.158128,16.2079421 -3.171076,21.5939521 -1.784316,1.635815 -6.380222,1.21421 -7.068351,3.186186 -1.04003,0.972427 -1.288046,2.050158 -1.232864,3.168203 1.015111,2.000108 -3.831548,1.633216 -3.270553,3.759574 0.589477,5.264544 -0.179276,10.53738 -0.362842,15.806257 -0.492006,2.184998 1.163456,4.574232 -0.734888,6.610642 -2.482919,2.325184 -7.30604,2.189143 -9.193497,-0.274767 -2.733688,-1.740626 -8.254447,-3.615254 -6.104247,-6.339626 3.468112,-1.708686 -2.116197,-3.449897 0.431242,-5.080274 5.058402,-1.39256 -2.393215,-2.304318 -0.146889,-4.334645 3.069198,-0.977415 2.056986,-2.518352 -0.219121,-3.540397 1.876567,-1.807151 1.484149,-4.868919 -2.565455,-5.942205 0.150866,-1.805474 2.905737,-4.136876 -1.679967,-5.20493 C 10.260902,27.882167 4.6872697,22.95045 4.5245945,17.652051 z"
      id="path604"
diff --git a/web/images/annotation-newparagraph.svg b/web/images/annotation-newparagraph.svg
index 6c179fd3f..38d2497da 100644
--- a/web/images/annotation-newparagraph.svg
+++ b/web/images/annotation-newparagraph.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="64"
-   height="64">
+   height="64"
+   viewBox="0 0 64 64">
   <path
      d="M 32.003143,10.913072 57.432701,53.086929 6.567299,53.083723 z"
      id="path2985"
diff --git a/web/images/annotation-note.svg b/web/images/annotation-note.svg
index ed169439b..70173651c 100644
--- a/web/images/annotation-note.svg
+++ b/web/images/annotation-note.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="40"
-   height="40">
+   height="40"
+   viewBox="0 0 40 40">
   <rect
      width="36.075428"
      height="31.096582"
diff --git a/web/images/annotation-paragraph.svg b/web/images/annotation-paragraph.svg
index 6fd90c19f..6ae5212b7 100644
--- a/web/images/annotation-paragraph.svg
+++ b/web/images/annotation-paragraph.svg
@@ -2,7 +2,8 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    width="40"
-   height="40">
+   height="40"
+   viewBox="0 0 40 40">
   <rect
      width="33.76017"
      height="33.76017"