Update logo

adam-p · Sep 2, 2015 · 27af231 · 27af231
1 parent a5c4a4b
commit 27af231
Show file tree

Hide file tree

Showing 75 changed files with 38 additions and 69 deletions.
diff --git a/src/common/images/icon1024-monochrome.png b/src/common/images/icon1024-monochrome.png
diff --git a/src/common/images/icon1024.png b/src/common/images/icon1024.png
diff --git a/src/common/images/icon12-button-disabled.png b/src/common/images/icon12-button-disabled.png
diff --git a/src/common/images/icon12-button-monochrome.png b/src/common/images/icon12-button-monochrome.png
diff --git a/src/common/images/icon12-button.png b/src/common/images/icon12-button.png
diff --git a/src/common/images/icon12-monochrome.png b/src/common/images/icon12-monochrome.png
diff --git a/src/common/images/icon12.png b/src/common/images/icon12.png
diff --git a/src/common/images/icon128-monochrome.png b/src/common/images/icon128-monochrome.png
diff --git a/src/common/images/icon128.png b/src/common/images/icon128.png
diff --git a/src/common/images/icon12@2x.png b/src/common/images/icon12@2x.png
diff --git a/src/common/images/icon14-button-disabled.png b/src/common/images/icon14-button-disabled.png
diff --git a/src/common/images/icon14-button-monochrome.png b/src/common/images/icon14-button-monochrome.png
diff --git a/src/common/images/icon14-button.png b/src/common/images/icon14-button.png
diff --git a/src/common/images/icon14-monochrome.png b/src/common/images/icon14-monochrome.png
diff --git a/src/common/images/icon14.png b/src/common/images/icon14.png
diff --git a/src/common/images/icon14@2x.png b/src/common/images/icon14@2x.png
diff --git a/src/common/images/icon16-button-disabled.png b/src/common/images/icon16-button-disabled.png
diff --git a/src/common/images/icon16-button-monochrome.png b/src/common/images/icon16-button-monochrome.png
diff --git a/src/common/images/icon16-button.png b/src/common/images/icon16-button.png
diff --git a/src/common/images/icon16-bw.png b/src/common/images/icon16-bw.png
diff --git a/src/common/images/icon16-bw@2x.png b/src/common/images/icon16-bw@2x.png
diff --git a/src/common/images/icon16-monochrome.png b/src/common/images/icon16-monochrome.png
diff --git a/src/common/images/icon16.png b/src/common/images/icon16.png
diff --git a/src/common/images/icon16@2x.png b/src/common/images/icon16@2x.png
diff --git a/src/common/images/icon19-button-disabled.png b/src/common/images/icon19-button-disabled.png
diff --git a/src/common/images/icon19-button-monochrome.png b/src/common/images/icon19-button-monochrome.png
diff --git a/src/common/images/icon19-button.png b/src/common/images/icon19-button.png
diff --git a/src/common/images/icon19-monochrome.png b/src/common/images/icon19-monochrome.png
diff --git a/src/common/images/icon19.png b/src/common/images/icon19.png
diff --git a/src/common/images/icon24-button-disabled.png b/src/common/images/icon24-button-disabled.png
diff --git a/src/common/images/icon24-button-monochrome.png b/src/common/images/icon24-button-monochrome.png
diff --git a/src/common/images/icon24-button.png b/src/common/images/icon24-button.png
diff --git a/src/common/images/icon24-bw.png b/src/common/images/icon24-bw.png
diff --git a/src/common/images/icon24-bw@2x.png b/src/common/images/icon24-bw@2x.png
diff --git a/src/common/images/icon24-monochrome.png b/src/common/images/icon24-monochrome.png
diff --git a/src/common/images/icon24.png b/src/common/images/icon24.png
diff --git a/src/common/images/icon24@2x.png b/src/common/images/icon24@2x.png
diff --git a/src/common/images/icon256-monochrome.png b/src/common/images/icon256-monochrome.png
diff --git a/src/common/images/icon256.png b/src/common/images/icon256.png
diff --git a/src/common/images/icon28-button-disabled.png b/src/common/images/icon28-button-disabled.png
diff --git a/src/common/images/icon28-button-monochrome.png b/src/common/images/icon28-button-monochrome.png
diff --git a/src/common/images/icon28-button.png b/src/common/images/icon28-button.png
diff --git a/src/common/images/icon28-monochrome.png b/src/common/images/icon28-monochrome.png
diff --git a/src/common/images/icon28.png b/src/common/images/icon28.png
diff --git a/src/common/images/icon32-button-disabled.png b/src/common/images/icon32-button-disabled.png
diff --git a/src/common/images/icon32-button-monochrome.png b/src/common/images/icon32-button-monochrome.png
diff --git a/src/common/images/icon32-button.png b/src/common/images/icon32-button.png
diff --git a/src/common/images/icon32-monochrome.png b/src/common/images/icon32-monochrome.png
diff --git a/src/common/images/icon32.png b/src/common/images/icon32.png
diff --git a/src/common/images/icon38-button-disabled.png b/src/common/images/icon38-button-disabled.png
diff --git a/src/common/images/icon38-button-monochrome.png b/src/common/images/icon38-button-monochrome.png
diff --git a/src/common/images/icon38-button.png b/src/common/images/icon38-button.png
diff --git a/src/common/images/icon38-monochrome.png b/src/common/images/icon38-monochrome.png
diff --git a/src/common/images/icon38.png b/src/common/images/icon38.png
diff --git a/src/common/images/icon48-button-disabled.png b/src/common/images/icon48-button-disabled.png
diff --git a/src/common/images/icon48-button-monochrome.png b/src/common/images/icon48-button-monochrome.png
diff --git a/src/common/images/icon48-button.png b/src/common/images/icon48-button.png
diff --git a/src/common/images/icon48-monochrome.png b/src/common/images/icon48-monochrome.png
diff --git a/src/common/images/icon48.png b/src/common/images/icon48.png
diff --git a/src/common/images/icon512-monochrome.png b/src/common/images/icon512-monochrome.png
diff --git a/src/common/images/icon512.png b/src/common/images/icon512.png
diff --git a/src/common/images/icon64-monochrome.png b/src/common/images/icon64-monochrome.png
diff --git a/src/common/images/icon64.png b/src/common/images/icon64.png
diff --git a/src/common/images/icon76-monochrome.png b/src/common/images/icon76-monochrome.png
diff --git a/src/common/images/icon76.png b/src/common/images/icon76.png
diff --git a/src/common/images/icon96-monochrome.png b/src/common/images/icon96-monochrome.png
diff --git a/src/common/images/icon96.png b/src/common/images/icon96.png
diff --git a/src/common/options.html b/src/common/options.html
@@ -337,7 +337,7 @@ <h1>
             Type some Markdown into the email.<br/>Try this: <code>_Hello_ `Markdown` **Here**!</code>
           </li>
           <li data-i18n="click_toggle">
-            Right-click in the email and then click "Markdown Toggle". (Or click the <img src="images/icon16.png"/> button on the toolbar.<span class="hotkey-display-wrapper"> Or press <span class="hotkey-display"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)
+            Right-click in the email and then click "Markdown Toggle". (Or click the <img style="width:16px" src="images/icon32-button-monochrome.png"/> button on the toolbar.<span class="hotkey-display-wrapper"> Or press <span class="hotkey-display"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)
           </li>
           <li data-i18n="pretty_cool">
             The message should now look pretty cool. Send it to your friends!

diff --git a/src/common/options.js b/src/common/options.js
@@ -160,9 +160,23 @@ function localize() {
     // Take this opportunity to show appropriate size images for the pixel
     // density. This saves us from having to make the `img` tags in the
     // translated content more complex.
+    // TODO: Change to media queries (and so use background-image style).
     if (window.devicePixelRatio === 2) {
-      $('img[src="images/icon16.png"]').css('width', '16px')
-                                       .attr('src', 'images/icon16@2x.png');
+      $('img[src="images/icon16.png"]')
+        .css('width', '16px')
+        .attr('src', 'images/icon32.png');
+      $('img[src="images/icon16-button.png"]')
+        .css('width', '16px')
+        .attr('src', 'images/icon32-button.png');
+      $('img[src="images/icon16-monochrome.png"]')
+        .css('width', '16px')
+        .attr('src', 'images/icon32-monochrome.png');
+      $('img[src="images/icon16-button-monochrome.png"]')
+        .css('width', '16px')
+        .attr('src', 'images/icon32-button-monochrome.png');
+      $('img[src="images/icon16-button-disabled.png"]')
+        .css('width', '16px')
+        .attr('src', 'images/icon32-button-disabled.png');
     }
   });
 }

diff --git a/src/common/test/index.html b/src/common/test/index.html
@@ -16,8 +16,6 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
-  <link rel="shortcut icon" href="/favicon.ico"/>
-  <link rel="apple-touch-icon" href="/apple-touch-icon.png"/>
   <link rel="stylesheet" href="mocha.css"/>
 </head>
 

diff --git a/src/firefox/chrome/content/postbox-overlay.xul b/src/firefox/chrome/content/postbox-overlay.xul
@@ -15,7 +15,7 @@
                    class=""
                    label="&toggle_button_text;"
                    tooltiptext="&toggle_button_tooltip;"
-                   image="resource://markdown_here_common/images/icon16.png"
+                   image="resource://markdown_here_common/images/icon16-button-monochrome.png"
                    oncommand="markdown_here.onToolbarButtonCommand(event)" />
   </toolbar>
 

diff --git a/src/firefox/chrome/skin/toolbar-osx.css b/src/firefox/chrome/skin/toolbar-osx.css
@@ -16,7 +16,7 @@ toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] > .toolb
  */
 
 #formatToolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon12.png");
+  list-style-image: url("resource://markdown_here_common/images/icon12-button-monochrome.png");
 }
 
 #formatToolbarButton-markdown_here > .toolbarbutton-icon {
@@ -26,6 +26,6 @@ toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] > .toolb
 
 @media (min-resolution: 2dppx) {
   #formatToolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon12@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon24-button-monochrome.png");
   }
 }
diff --git a/src/firefox/chrome/skin/toolbar.css b/src/firefox/chrome/skin/toolbar.css
@@ -5,14 +5,14 @@
 /* Note that `#pageAction-markdown_here` is an `<image>`, so the `width` can be
    set directly. */
 #pageAction-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon14.png");
+  list-style-image: url("resource://markdown_here_common/images/icon14-button-monochrome.png");
   width: 14px;
   height: 14px;
 }
 
 @media (min-resolution: 2dppx) {
   #pageAction-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon14@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon28-button-monochrome.png");
   }
 }
 
@@ -22,12 +22,12 @@
  */
 
 #context-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon16.png");
+  list-style-image: url("resource://markdown_here_common/images/icon16-monochrome.png");
 }
 
 @media (min-resolution: 2dppx) {
   #context-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon16@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon32-monochrome.png");
   }
 }
 
@@ -50,44 +50,44 @@
 /* This also controls how the icon will look in the toolbar customize palette. */
 
 #toolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon24.png");
+  list-style-image: url("resource://markdown_here_common/images/icon24-button-monochrome.png");
 }
 
 @media (min-resolution: 2dppx) {
   #toolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon24@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon48-button-monochrome.png");
   }
 }
 
 #toolbarButton-markdown_here[disabled="true"] {
-  list-style-image: url("resource://markdown_here_common/images/icon24-bw.png");
+  list-style-image: url("resource://markdown_here_common/images/icon24-button-disabled.png");
 }
 
 @media (min-resolution: 2dppx) {
   #toolbarButton-markdown_here[disabled="true"] {
-    list-style-image: url("resource://markdown_here_common/images/icon24-bw@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon48-button-disabled.png");
   }
 }
 
 /* The "small" icon toolbar, which is the standard. */
 
 toolbar[iconsize="small"] #toolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon16.png");
+  list-style-image: url("resource://markdown_here_common/images/icon16-button-monochrome.png");
 }
 
 @media (min-resolution: 2dppx) {
   toolbar[iconsize="small"] #toolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon16@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon32-button-monochrome.png");
   }
 }
 
 toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] {
-  list-style-image: url("resource://markdown_here_common/images/icon16-bw.png");
+  list-style-image: url("resource://markdown_here_common/images/icon16-button-disabled.png");
 }
 
 @media (min-resolution: 2dppx) {
   toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] {
-    list-style-image: url("resource://markdown_here_common/images/icon16-bw@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon32-button-disabled.png");
   }
 }
 
@@ -100,7 +100,7 @@ toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] {
 /* The "normal" size, which is small. */
 
 #composeToolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon16.png");
+  list-style-image: url("resource://markdown_here_common/images/icon16-button-monochrome.png");
 }
 
 #composeToolbarButton-markdown_here > .toolbarbutton-icon {
@@ -110,14 +110,14 @@ toolbar[iconsize="small"] #toolbarButton-markdown_here[disabled="true"] {
 
 @media (min-resolution: 2dppx) {
   #composeToolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon16@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon32-button-monochrome.png");
   }
 }
 
 /* The "large" size. This is available in Thunderbird+Xubuntu and Postbox. */
 
 toolbar[iconsize="large"] #composeToolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon24.png");
+  list-style-image: url("resource://markdown_here_common/images/icon24-button-monochrome.png");
 }
 
 toolbar[iconsize="large"] #composeToolbarButton-markdown_here > .toolbarbutton-icon {
@@ -127,7 +127,7 @@ toolbar[iconsize="large"] #composeToolbarButton-markdown_here > .toolbarbutton-i
 
 @media (min-resolution: 2dppx) {
   toolbar[iconsize="large"] #composeToolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon24@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon48-button-monochrome.png");
   }
 }
 
@@ -137,7 +137,7 @@ toolbar[iconsize="large"] #composeToolbarButton-markdown_here > .toolbarbutton-i
  */
 
 #formatToolbarButton-markdown_here {
-  list-style-image: url("resource://markdown_here_common/images/icon16.png");
+  list-style-image: url("resource://markdown_here_common/images/icon16-button-monochrome.png");
 }
 
 #formatToolbarButton-markdown_here > .toolbarbutton-icon {
@@ -147,6 +147,6 @@ toolbar[iconsize="large"] #composeToolbarButton-markdown_here > .toolbarbutton-i
 
 @media (min-resolution: 2dppx) {
   #formatToolbarButton-markdown_here {
-    list-style-image: url("resource://markdown_here_common/images/icon16@2x.png");
+    list-style-image: url("resource://markdown_here_common/images/icon32-button-monochrome.png");
   }
 }
diff --git a/src/manifest.json b/src/manifest.json
diff --git a/test/index.html b/test/index.html
@@ -10,9 +10,6 @@
   <meta name="author" content="">
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <link rel="shortcut icon" href="/favicon.ico">
-  <link rel="apple-touch-icon" href="/apple-touch-icon.png">
 </head>
 
 <body style="height: 100%">