remove emoji css trazyn#29

notxx · Sep 12, 2017 · 9d627b7 · 9d627b7
1 parent c74128e
commit 9d627b7
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 3,416 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,2 @@
 *.js linguist-language=JavaScript
 src/assets/* linguist-vendored
-src/global.css linguist-vendored
diff --git a/main.js b/main.js
@@ -451,7 +451,7 @@ const createMainWindow = () => {
 
         conversations = conversations.slice(0, 10).map((e, index) => {
             return {
-                label: e.NickName,
+                label: e.RemarkName || e.NickName,
                 accelerator: `Cmd+${index}`,
                 click() {
                     mainWindow.show();
@@ -464,7 +464,7 @@ const createMainWindow = () => {
 
         contacts = contacts.map(e => {
             return {
-                label: e.NickName,
+                label: e.RemarkName || e.NickName,
                 click() {
                     mainWindow.show();
                     mainWindow.webContents.send('show-userinfo', {