Merge 11ada77 into e2ace6c

kumabook · Nov 29, 2018 · d066e62 · d066e62
2 parents e2ace6c + 11ada77
commit d066e62
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 46 deletions.
diff --git a/content_scripts/sticky-view.css b/content_scripts/sticky-view.css
@@ -61,34 +61,18 @@
 
 .stickynotes-delete-button {
     float            : left;
-    background-image : url('delete.png');
-}
-.stickynotes-delete-button:hover {
-    background-image : url('delete-hover.png');
 }
 
 .stickynotes-menu-button {
     float            : right;
-    background-image : url('menu.png');
-}
-.stickynotes-menu-button:hover {
-    background-image : url('menu-hover.png');
 }
 
 .stickynotes-edit-tag-button {
     float            : right;
-    background-image : url('edit-tag.png');
-}
-.stickynotes-edit-tag-button:hover {
-    background-image : url('edit-tag-hover.png');
 }
 
 .stickynotes-minimize-button {
     float            : left;
-    background-image : url('minimize.png');
-}
-.stickynotes-minimize-button:hover {
-    background-image : url('minimize-hover.png');
 }
 
 .stickynotes-textarea:focus,
@@ -140,21 +124,6 @@
     background-size : contain;
 }
 
-.stickynotes-icon-color {
-    background-image : url('color.png');
-}
-
-.stickynotes-icon-page-option {
-    background-image : url('page-option.png');
-}
-
-.stickynotes-icon-back {
-    background-image : url('back.png');
-}
-.stickynotes-icon-close {
-    background-image : url('close.png');
-}
-
 .stickynotes-button {
     font-weight: bold;
     padding: 4px 16px;
@@ -232,41 +201,78 @@
     margin : 4px 12px;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
+.stickynotes-delete-button {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/delete.png');
+}
+.stickynotes-delete-button:hover {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/delete-hover.png');
+}
+.stickynotes-menu-button {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/menu.png');
+}
+.stickynotes-menu-button:hover {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/menu-hover.png');
+}
+.stickynotes-edit-tag-button {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/edit-tag.png');
+}
+.stickynotes-edit-tag-button:hover {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/edit-tag-hover.png');
+}
+.stickynotes-minimize-button {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/minimize.png');
+}
+.stickynotes-minimize-button:hover {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/minimize-hover.png');
+}
+.stickynotes-icon-color {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/color.png');
+}
+.stickynotes-icon-page-option {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/page-option.png');
+}
+.stickynotes-icon-back {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/back.png');
+}
+.stickynotes-icon-close {
+    background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/close.png');
+}
+
+@-moz-document url-prefix() {
     .stickynotes-delete-button {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/delete.png');
+        background-image : url('delete.png');
     }
     .stickynotes-delete-button:hover {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/delete-hover.png') !important;
+        background-image : url('delete-hover.png');
     }
     .stickynotes-menu-button {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/menu.png') !important;
+        background-image : url('menu.png');
     }
     .stickynotes-menu-button:hover {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/menu-hover.png') !important;
+        background-image : url('menu-hover.png');
     }
     .stickynotes-edit-tag-button {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/edit-tag.png') !important;
+        background-image : url('edit-tag.png');
     }
     .stickynotes-edit-tag-button:hover {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/edit-tag-hover.png') !important;
+        background-image : url('edit-tag-hover.png');
     }
     .stickynotes-minimize-button {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/minimize.png') !important;
+        background-image : url('minimize.png');
     }
     .stickynotes-minimize-button:hover {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/minimize-hover.png') !important;
+        background-image : url('minimize-hover.png');
     }
     .stickynotes-icon-color {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/color.png') !important;
+        background-image : url('color.png');
     }
     .stickynotes-icon-page-option {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/page-option.png') !important;
+        background-image : url('page-option.png');
     }
     .stickynotes-icon-back {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/back.png') !important;
+        background-image : url('back.png');
     }
     .stickynotes-icon-close {
-        background-image : url('chrome-extension://__MSG_@@extension_id__/content_scripts/close.png') !important;
+        background-image : url('close.png');
     }
 }
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "StickyNotes",
-  "version": "1.1.4.1",
+  "version": "1.1.6.0",
   "manifest_version": 2,
   "applications": {
     "gecko": {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "id": "sticky@filenamezero.dip.jp",
   "title": "Sticky Notes",
   "name": "stickynotes",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "Put sticky notes on the web page",
   "main": "./main.js",
   "author": "Hiroki Kumamoto",