From e278ebda5da1b4d12d5690139da2da6a390ea528 Mon Sep 17 00:00:00 2001
From: Gene S <or.else@gmail.com>
Date: Thu, 18 Feb 2016 19:30:21 -0800
Subject: [PATCH] bug fixes

---
 css/base.css |  8 ++++----
 index.html   | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/css/base.css b/css/base.css
index 60ce6057..4c3ed852 100644
--- a/css/base.css
+++ b/css/base.css
@@ -278,7 +278,7 @@ form {
   width: 3rem;
   height: auto;
   flex: none;
-  border-radius: 33%;
+  border-radius: 50%;
 }
 
 /* Application settings */
@@ -346,7 +346,7 @@ form {
 #contact-box .avatar {
   width: 3rem;
   height: auto;
-  border-radius: 40%;
+  border-radius: 50%;
 }
 
 /* Online-offline indicator positioned inside avatar-box */
@@ -735,6 +735,6 @@ form {
 }
 .avatar-box .material-icons {
   color: rgba(250, 250, 250, 0.8); /* #fafafa, gray 50 */
-  background-color: #e0e0e0;
-  border-radius: 40%;
+  background-color: #757575;
+  border-radius: 50%;
 }
diff --git a/index.html b/index.html
index 0e56c525..0dbd9000 100644
--- a/index.html
+++ b/index.html
@@ -10,17 +10,12 @@
       rel="stylesheet" type="text/css" />
     <!-- Google's material design icons -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
-    <!-- Customized Bootstrap style (material design). -->
-    <!--link rel="stylesheet" href="css/bootstrap.css" /-->
     <!-- Styles for local elements -->
     <link rel="stylesheet" href="css/base.css" />
     <!-- ReactJs scripts -->
     <script src="https://fb.me/react-0.14.7.js"></script>
     <script src="https://fb.me/react-dom-0.14.7.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.23/browser.min.js"></script>
-    <!-- Some scripts to make bootstrap more dynamic -->
-    <!--script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script-->
-    <!--script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script-->
     <script src="tinode.js"></script>
   </head>
   <body>
@@ -528,8 +523,16 @@
       tnMeContactUpdate: function(what, cont) {
         if (what === "on" || what === "off" || what === "read") {
           this.forceUpdate();
+        } else if (what === "msg") {
+          // Skip update if the topic is currently open, otherwise a badge will annoyingly pop up.
+          if (this.state.selected !== cont.topic) {
+            this.forceUpdate();
+          }
+        } else if (what === "recv") {
+          // Explicitly ignoring "recv"
         } else {
-          console.log("changed (not updating for it): " + what + " in :");
+          // TODO(gene): handle other types of notifications
+          console.log("changed (not updating for it): " + what + " in:");
           console.log(cont);
         }
       },