pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Gene S
2016-02-18 19:30:21 -08:00
parent 103184c8da
commit e278ebda5d
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/base.css
+4 -4
View File
@@ -278,7 +278,7 @@ form {
width: 3rem; width: 3rem;
height: auto; height: auto;
flex: none; flex: none;
border-radius: 33%; border-radius: 50%;
} }
/* Application settings */ /* Application settings */
@@ -346,7 +346,7 @@ form {
#contact-box .avatar { #contact-box .avatar {
width: 3rem; width: 3rem;
height: auto; height: auto;
border-radius: 40%; border-radius: 50%;
} }
/* Online-offline indicator positioned inside avatar-box */ /* Online-offline indicator positioned inside avatar-box */
@@ -735,6 +735,6 @@ form {
} }
.avatar-box .material-icons { .avatar-box .material-icons {
color: rgba(250, 250, 250, 0.8); /* #fafafa, gray 50 */ color: rgba(250, 250, 250, 0.8); /* #fafafa, gray 50 */
background-color: #e0e0e0; background-color: #757575;
border-radius: 40%; border-radius: 50%;
} }
index.html
+9 -6
View File
@@ -10,17 +10,12 @@
rel="stylesheet" type="text/css" /> rel="stylesheet" type="text/css" />
<!-- Google's material design icons --> <!-- Google's material design icons -->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" /> <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 --> <!-- Styles for local elements -->
<link rel="stylesheet" href="css/base.css" /> <link rel="stylesheet" href="css/base.css" />
<!-- ReactJs scripts --> <!-- ReactJs scripts -->
<script src="https://fb.me/react-0.14.7.js"></script> <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://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> <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> <script src="tinode.js"></script>
</head> </head>
<body> <body>
@@ -528,8 +523,16 @@
tnMeContactUpdate: function(what, cont) { tnMeContactUpdate: function(what, cont) {
if (what === "on" || what === "off" || what === "read") { if (what === "on" || what === "off" || what === "read") {
this.forceUpdate(); 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 { } 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); console.log(cont);
} }
}, },