New icons! Thank you sdw-nylas

mbilker · Mar 7, 2016 · 4cca45c · 4cca45c
1 parent cdd32d6
commit 4cca45c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 4 deletions.
diff --git a/images/IDR_CLOSE_DIALOG.png → assets/IDR_CLOSE_DIALOG.png b/images/IDR_CLOSE_DIALOG.png → assets/IDR_CLOSE_DIALOG.png
diff --git a/images/IDR_CLOSE_DIALOG_H.png → assets/IDR_CLOSE_DIALOG_H.png b/images/IDR_CLOSE_DIALOG_H.png → assets/IDR_CLOSE_DIALOG_H.png
diff --git a/assets/icon-composer-encrypt@1x.png b/assets/icon-composer-encrypt@1x.png
diff --git a/assets/icon-composer-encrypt@2x.png b/assets/icon-composer-encrypt@2x.png
diff --git a/assets/icon-plugins-encryption@2x.png b/assets/icon-plugins-encryption@2x.png
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/lib/composer/composer-loader.es6 b/lib/composer/composer-loader.es6
@@ -46,8 +46,8 @@ class ComposerLoader extends React.Component {
 
   render() {
     let button = <button className="btn btn-toolbar">
-      Encrypt
-      <RetinaImg name="toolbar-chevron.png" mode={RetinaImg.Mode.ContentPreserve} />
+      <RetinaImg url="nylas://cypher/assets/icon-composer-encrypt@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
+      <RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask} />
     </button>
 
     return <Popover ref="popover" className="pgp-composer" buttonComponent={button}>

diff --git a/package.json b/package.json
@@ -9,6 +9,8 @@
   "engines": {
     "nylas": ">=0.4.10"
   },
+  "title": "Cypher",
+  "icon": "./assets/icon.png",
   "description": "Privacy extensions for N1",
   "dependencies": {
     "debug": "^2.2.0",

diff --git a/stylesheets/smalltalk.css b/stylesheets/smalltalk.css
@@ -37,7 +37,7 @@
 }
 
 .smalltalk .page > .close-button {
-  background-image: url(nylas://cypher/images/IDR_CLOSE_DIALOG.png);
+  background-image: url(nylas://cypher/assets/IDR_CLOSE_DIALOG.png);
   background-position: center;
   background-repeat: no-repeat;
   height: 14px;
@@ -49,7 +49,7 @@
 }
 
 .smalltalk .page > .close-button:hover {
-  background-image: url(nylas://cypher/images/IDR_CLOSE_DIALOG_H.png);
+  background-image: url(nylas://cypher/assets/IDR_CLOSE_DIALOG_H.png);
 }
 
 .smalltalk .page header {