Permalink
Browse files

Update logo

  • Loading branch information...
1 parent a5c4a4b commit 27af231293cfe3c2a585c4428b1915544a4b568f @adam-p committed Sep 2, 2015
Showing with 38 additions and 69 deletions.
  1. BIN src/common/images/icon1024-monochrome.png
  2. BIN src/common/images/icon1024.png
  3. BIN src/common/images/icon12-button-disabled.png
  4. BIN src/common/images/icon12-button-monochrome.png
  5. BIN src/common/images/icon12-button.png
  6. BIN src/common/images/icon12-monochrome.png
  7. BIN src/common/images/icon12.png
  8. BIN src/common/images/icon128-monochrome.png
  9. BIN src/common/images/icon128.png
  10. BIN src/common/images/icon12@2x.png
  11. BIN src/common/images/icon14-button-disabled.png
  12. BIN src/common/images/icon14-button-monochrome.png
  13. BIN src/common/images/icon14-button.png
  14. BIN src/common/images/icon14-monochrome.png
  15. BIN src/common/images/icon14.png
  16. BIN src/common/images/icon14@2x.png
  17. BIN src/common/images/icon16-button-disabled.png
  18. BIN src/common/images/icon16-button-monochrome.png
  19. BIN src/common/images/icon16-button.png
  20. BIN src/common/images/icon16-bw.png
  21. BIN src/common/images/icon16-bw@2x.png
  22. BIN src/common/images/icon16-monochrome.png
  23. BIN src/common/images/icon16.png
  24. BIN src/common/images/icon16@2x.png
  25. BIN src/common/images/icon19-button-disabled.png
  26. BIN src/common/images/icon19-button-monochrome.png
  27. BIN src/common/images/icon19-button.png
  28. BIN src/common/images/icon19-monochrome.png
  29. BIN src/common/images/icon19.png
  30. BIN src/common/images/icon24-button-disabled.png
  31. BIN src/common/images/icon24-button-monochrome.png
  32. BIN src/common/images/icon24-button.png
  33. BIN src/common/images/icon24-bw.png
  34. BIN src/common/images/icon24-bw@2x.png
  35. BIN src/common/images/icon24-monochrome.png
  36. BIN src/common/images/icon24.png
  37. BIN src/common/images/icon24@2x.png
  38. BIN src/common/images/icon256-monochrome.png
  39. BIN src/common/images/icon256.png
  40. BIN src/common/images/icon28-button-disabled.png
  41. BIN src/common/images/icon28-button-monochrome.png
  42. BIN src/common/images/icon28-button.png
  43. BIN src/common/images/icon28-monochrome.png
  44. BIN src/common/images/icon28.png
  45. BIN src/common/images/icon32-button-disabled.png
  46. BIN src/common/images/icon32-button-monochrome.png
  47. BIN src/common/images/icon32-button.png
  48. BIN src/common/images/icon32-monochrome.png
  49. BIN src/common/images/icon32.png
  50. BIN src/common/images/icon38-button-disabled.png
  51. BIN src/common/images/icon38-button-monochrome.png
  52. BIN src/common/images/icon38-button.png
  53. BIN src/common/images/icon38-monochrome.png
  54. BIN src/common/images/icon38.png
  55. BIN src/common/images/icon48-button-disabled.png
  56. BIN src/common/images/icon48-button-monochrome.png
  57. BIN src/common/images/icon48-button.png
  58. BIN src/common/images/icon48-monochrome.png
  59. BIN src/common/images/icon48.png
  60. BIN src/common/images/icon512-monochrome.png
  61. BIN src/common/images/icon512.png
  62. BIN src/common/images/icon64-monochrome.png
  63. BIN src/common/images/icon64.png
  64. BIN src/common/images/icon76-monochrome.png
  65. BIN src/common/images/icon76.png
  66. BIN src/common/images/icon96-monochrome.png
  67. BIN src/common/images/icon96.png
  68. +1 −1 src/common/options.html
  69. +16 −2 src/common/options.js
  70. +0 −2 src/common/test/index.html
  71. +1 −1 src/firefox/chrome/content/postbox-overlay.xul
  72. +2 −2 src/firefox/chrome/skin/toolbar-osx.css
  73. +18 −18 src/firefox/chrome/skin/toolbar.css
  74. +0 −40 src/manifest.json
  75. +0 −3 test/index.html
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -337,7 +337,7 @@
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!
View
@@ -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');
}
});
}
@@ -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>
@@ -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>
@@ -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");
}
}
@@ -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");
}
}
View
@@ -1,40 +0,0 @@
-{
- "manifest_version": 2,
- "name": "__MSG_app_name__",
- "version": "2.11.10",
- "description": "__MSG_app_slogan__",
- "homepage_url": "http://markdown-here.com",
- "minimum_chrome_version": "6",
- "default_locale": "en",
- "icons": {
- "16": "common/images/icon16.png",
- "32": "common/images/icon32.png",
- "48": "common/images/icon48.png",
- "128": "common/images/icon128.png",
- "512": "common/images/icon512.png"
- },
- "permissions": ["contextMenus", "storage"],
- "background": {"page": "chrome/background.html"},
- "content_scripts": [
- {
- "matches": ["http://*/*", "https://*/*"],
- "js": [
- "common/utils.js",
- "common/common-logic.js",
- "common/jsHtmlToText.js",
- "common/marked.js",
- "common/mdh-html-to-text.js",
- "common/markdown-here.js",
- "chrome/contentscript.js"
- ]
- }
- ],
- "browser_action": {
- "default_icon": {
- "19": "common/images/icon19.png",
- "38": "common/images/icon38.png"
- },
- "default_title": "__MSG_toggle_button_tooltip__"
- },
- "options_page": "common/options.html"
-}
View
@@ -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%">

0 comments on commit 27af231

Please sign in to comment.