Browse Source

Various smaller fixes and improvements

JC Brand 7 years ago
parent
commit
b3f2fafeea

+ 7 - 293
css/converse.css

@@ -10,292 +10,6 @@
     https://coolors.co/app/264653-2a9d8f-e9c46a-f4a261-e76f51
     http://paletton.com/#uid=70a0u0kkNs+b4JOgryLpxqpsbkI
  */
-@font-face {
-  font-family: 'Converse-js';
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht");
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht#iefix") format("embedded-opentype"), url("../fonticons/fonts/icomoon.ttf?wvi0ht") format("truetype"), url("../fonticons/fonts/icomoon.woff?wvi0ht") format("woff"), url("../fonticons/fonts/icomoon.svg?wvi0ht#icomoon") format("svg");
-  font-weight: normal;
-  font-style: normal; }
-.icon-conversejs {
-  padding-right: 0.2em;
-  font-family: 'Converse-js';
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-
-.icon-conversejs:before {
-  content: "\e600"; }
-
-#converse-embedded-chat .icon-address-book:before,
-#conversejs .icon-address-book:before {
-  content: "\270f"; }
-#converse-embedded-chat .icon-attachment:before,
-#conversejs .icon-attachment:before {
-  content: "\e032"; }
-#converse-embedded-chat .icon-away:before,
-#conversejs .icon-away:before {
-  content: "\25fb"; }
-#converse-embedded-chat .icon-blocked:before,
-#conversejs .icon-blocked:before {
-  content: "\2718"; }
-#converse-embedded-chat .icon-bold:before,
-#conversejs .icon-bold:before {
-  content: "\e04d"; }
-#converse-embedded-chat .icon-bubbles2:before,
-#conversejs .icon-bubbles2:before {
-  content: "\e016"; }
-#converse-embedded-chat .icon-bubbles3:before,
-#conversejs .icon-bubbles3:before {
-  content: "\e017"; }
-#converse-embedded-chat .icon-bubbles:before,
-#conversejs .icon-bubbles:before {
-  content: "\e015"; }
-#converse-embedded-chat .icon-busy:before,
-#conversejs .icon-busy:before {
-  content: "\e004"; }
-#converse-embedded-chat .icon-dnd:before,
-#conversejs .icon-dnd:before {
-  content: "\e004"; }
-#converse-embedded-chat .icon-cancel-circle:before,
-#conversejs .icon-cancel-circle:before {
-  content: "\e058"; }
-#converse-embedded-chat .icon-checkmark:before,
-#conversejs .icon-checkmark:before {
-  content: "\2713"; }
-#converse-embedded-chat .icon-close:before,
-#conversejs .icon-close:before {
-  content: "\2715"; }
-#converse-embedded-chat .icon-closed:before,
-#conversejs .icon-closed:before {
-  content: "\25ba"; }
-#converse-embedded-chat .icon-cog:before,
-#conversejs .icon-cog:before {
-  content: "\e02f"; }
-#converse-embedded-chat .icon-cogs:before,
-#conversejs .icon-cogs:before {
-  content: "\e022"; }
-#converse-embedded-chat .icon-conversejs:before,
-#conversejs .icon-conversejs:before {
-  content: "\e600"; }
-#converse-embedded-chat .icon-database:before,
-#conversejs .icon-database:before {
-  content: "\f1c0"; }
-#converse-embedded-chat .icon-envelope:before,
-#conversejs .icon-envelope:before {
-  content: "\f003"; }
-#converse-embedded-chat .icon-exit:before,
-#conversejs .icon-exit:before {
-  content: "\e601"; }
-#converse-embedded-chat .icon-eye-blocked:before,
-#conversejs .icon-eye-blocked:before {
-  content: "\e031"; }
-#converse-embedded-chat .icon-eye:before,
-#conversejs .icon-eye:before {
-  content: "\e030"; }
-#converse-embedded-chat .icon-github:before,
-#conversejs .icon-github:before {
-  content: "\eab0"; }
-#converse-embedded-chat .icon-globe:before,
-#conversejs .icon-globe:before {
-  content: "\f0ac"; }
-#converse-embedded-chat .icon-google2:before,
-#conversejs .icon-google2:before {
-  content: "\ea89"; }
-#converse-embedded-chat .icon-group:before,
-#conversejs .icon-group:before {
-  content: "\f0c0"; }
-#converse-embedded-chat .icon-happy:before,
-#conversejs .icon-happy:before {
-  content: "\263b"; }
-#converse-embedded-chat .icon-heart2:before,
-#conversejs .icon-heart2:before {
-  content: "\f004"; }
-#converse-embedded-chat .icon-heart:before,
-#conversejs .icon-heart:before {
-  content: "\2764"; }
-#converse-embedded-chat .icon-heart_empty:before,
-#conversejs .icon-heart_empty:before {
-  content: "\f08a"; }
-#converse-embedded-chat .icon-hide-users:before,
-#conversejs .icon-hide-users:before {
-  content: "\e01c"; }
-#converse-embedded-chat .icon-home:before,
-#conversejs .icon-home:before {
-  content: "\e000"; }
-#converse-embedded-chat .icon-idcard-dark:before,
-#conversejs .icon-idcard-dark:before {
-  content: "\f2c2"; }
-#converse-embedded-chat .icon-idcard:before,
-#conversejs .icon-idcard:before {
-  content: "\f2c3"; }
-#converse-embedded-chat .icon-image:before,
-#conversejs .icon-image:before {
-  content: "\2b14"; }
-#converse-embedded-chat .icon-info:before,
-#conversejs .icon-info:before {
-  content: "\2360"; }
-#converse-embedded-chat .icon-italic:before,
-#conversejs .icon-italic:before {
-  content: "\e04f"; }
-#converse-embedded-chat .icon-key:before,
-#conversejs .icon-key:before {
-  content: "\e028"; }
-#converse-embedded-chat .icon-legal:before,
-#conversejs .icon-legal:before {
-  content: "\f0e3"; }
-#converse-embedded-chat .icon-lock:before,
-#conversejs .icon-lock:before {
-  content: "\e027"; }
-#converse-embedded-chat .icon-minus:before,
-#conversejs .icon-minus:before {
-  content: "\e05a"; }
-#converse-embedded-chat .icon-music:before,
-#conversejs .icon-music:before {
-  content: "\266b"; }
-#converse-embedded-chat .icon-newtab:before,
-#conversejs .icon-newtab:before {
-  content: "\e053"; }
-#converse-embedded-chat .icon-notebook:before,
-#conversejs .icon-notebook:before {
-  content: "\2710"; }
-#converse-embedded-chat .icon-notification:before,
-#conversejs .icon-notification:before {
-  content: "\e01f"; }
-#converse-embedded-chat .icon-offline:before,
-#conversejs .icon-offline:before {
-  content: "\e002"; }
-#converse-embedded-chat .icon-logout:before,
-#conversejs .icon-logout:before {
-  content: "\e002"; }
-#converse-embedded-chat .icon-online:before,
-#conversejs .icon-online:before {
-  content: "\25fc"; }
-#converse-embedded-chat .icon-opened:before,
-#conversejs .icon-opened:before {
-  content: "\25bc"; }
-#converse-embedded-chat .icon-pencil:before,
-#conversejs .icon-pencil:before {
-  content: "\270e"; }
-#converse-embedded-chat .icon-phone-hang-up:before,
-#conversejs .icon-phone-hang-up:before {
-  content: "\260e"; }
-#converse-embedded-chat .icon-phone:before,
-#conversejs .icon-phone:before {
-  content: "\260f"; }
-#converse-embedded-chat .icon-plus:before,
-#conversejs .icon-plus:before {
-  content: "\271a"; }
-#converse-embedded-chat .icon-pushpin:before,
-#conversejs .icon-pushpin:before {
-  content: "\e012"; }
-#converse-embedded-chat .icon-quotes-left:before,
-#conversejs .icon-quotes-left:before {
-  content: "\e01d"; }
-#converse-embedded-chat .icon-reddit:before,
-#conversejs .icon-reddit:before {
-  content: "\eac6"; }
-#converse-embedded-chat .icon-remove:before,
-#conversejs .icon-remove:before {
-  content: "\e02d"; }
-#converse-embedded-chat .icon-room-info:before,
-#conversejs .icon-room-info:before {
-  content: "\e059"; }
-#converse-embedded-chat .icon-save:before,
-#conversejs .icon-save:before {
-  content: "\f0c7"; }
-#converse-embedded-chat .icon-search:before,
-#conversejs .icon-search:before {
-  content: "\e021"; }
-#converse-embedded-chat .icon-show-users:before,
-#conversejs .icon-show-users:before {
-  content: "\e01e"; }
-#converse-embedded-chat .icon-smiley:before,
-#conversejs .icon-smiley:before {
-  content: "\263a"; }
-#converse-embedded-chat .icon-snowflake:before,
-#conversejs .icon-snowflake:before {
-  content: "\f2dc"; }
-#converse-embedded-chat .icon-spell-check:before,
-#conversejs .icon-spell-check:before {
-  content: "\e045"; }
-#converse-embedded-chat .icon-spinner:before,
-#conversejs .icon-spinner:before {
-  content: "\231b"; }
-#converse-embedded-chat .icon-star:before,
-#conversejs .icon-star:before {
-  content: "\f005"; }
-#converse-embedded-chat .icon-star_empty:before,
-#conversejs .icon-star_empty:before {
-  content: "\f006"; }
-#converse-embedded-chat .icon-strikethrough:before,
-#conversejs .icon-strikethrough:before {
-  content: "\e050"; }
-#converse-embedded-chat .icon-twitter:before,
-#conversejs .icon-twitter:before {
-  content: "\ea96"; }
-#converse-embedded-chat .icon-underline:before,
-#conversejs .icon-underline:before {
-  content: "\e04e"; }
-#converse-embedded-chat .icon-unlocked:before,
-#conversejs .icon-unlocked:before {
-  content: "\e025"; }
-#converse-embedded-chat .icon-user:before,
-#conversejs .icon-user:before {
-  content: "\e01a"; }
-#converse-embedded-chat .icon-users:before,
-#conversejs .icon-users:before {
-  content: "\e01b"; }
-#converse-embedded-chat .icon-warning:before,
-#conversejs .icon-warning:before {
-  content: "\26a0"; }
-#converse-embedded-chat .icon-wrench:before,
-#conversejs .icon-wrench:before {
-  content: "\e024"; }
-#converse-embedded-chat .icon-xa:before,
-#conversejs .icon-xa:before {
-  content: "\e602"; }
-#converse-embedded-chat .icon-zoomin:before,
-#conversejs .icon-zoomin:before {
-  content: "\e02b"; }
-#converse-embedded-chat .icon-zoomout:before,
-#conversejs .icon-zoomout:before {
-  content: "\e02a"; }
-#converse-embedded-chat [data-icon]:before,
-#conversejs [data-icon]:before {
-  content: attr(data-icon);
-  font-family: 'Converse-js';
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  speak: none;
-  text-transform: none;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-#converse-embedded-chat [class^="icon-"]:before, #converse-embedded-chat [class*=" icon-"]:before,
-#conversejs [class^="icon-"]:before,
-#conversejs [class*=" icon-"]:before {
-  background-position: 14px 14px;
-  background-image: none;
-  font-family: 'Converse-js';
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  width: auto;
-  height: auto;
-  line-height: 1;
-  speak: none;
-  text-transform: none;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-
 #conversejs :root {
   --blue: #387592;
   --indigo: #6610f2;
@@ -4986,19 +4700,15 @@ body.reset {
     animation: spin 2s infinite, linear;
     display: block;
     text-align: center;
-    margin: 1em; }
-    #conversejs .spinner:before {
-      font-size: 24px;
-      font-family: 'Converse-js' !important;
-      content: "\231b"; }
+    margin: 2em;
+    font-size: 24px; }
   #conversejs .left {
     float: left; }
   #conversejs .right {
     float: right; }
   #conversejs .centered {
     text-align: center;
-    display: block;
-    margin: 0; }
+    display: block; }
   #conversejs .hor_centered {
     text-align: center;
     display: block;
@@ -6200,7 +5910,11 @@ body.reset {
         color: #E77051; }
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-info,
       #conversejs .chatroom .box-flyout .chatroom-body .chat-info {
+        color: #E77051;
         line-height: normal; }
+        #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-info.badge,
+        #conversejs .chatroom .box-flyout .chatroom-body .chat-info.badge {
+          color: white; }
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .mentioned,
       #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
         font-weight: bold; }

+ 0 - 292
css/fonts.css

@@ -1,292 +0,0 @@
-/*
-    Color scheme helpers:
-    https://coolors.co/app/264653-2a9d8f-e9c46a-f4a261-e76f51
-    http://paletton.com/#uid=70a0u0kkNs+b4JOgryLpxqpsbkI
- */
-@font-face {
-  font-family: 'Converse-js';
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht");
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht#iefix") format("embedded-opentype"), url("../fonticons/fonts/icomoon.ttf?wvi0ht") format("truetype"), url("../fonticons/fonts/icomoon.woff?wvi0ht") format("woff"), url("../fonticons/fonts/icomoon.svg?wvi0ht#icomoon") format("svg");
-  font-weight: normal;
-  font-style: normal; }
-.icon-conversejs {
-  padding-right: 0.2em;
-  font-family: 'Converse-js';
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-
-.icon-conversejs:before {
-  content: "\e600"; }
-
-#converse-embedded-chat .icon-address-book:before,
-#conversejs .icon-address-book:before {
-  content: "\270f"; }
-#converse-embedded-chat .icon-attachment:before,
-#conversejs .icon-attachment:before {
-  content: "\e032"; }
-#converse-embedded-chat .icon-away:before,
-#conversejs .icon-away:before {
-  content: "\25fb"; }
-#converse-embedded-chat .icon-blocked:before,
-#conversejs .icon-blocked:before {
-  content: "\2718"; }
-#converse-embedded-chat .icon-bold:before,
-#conversejs .icon-bold:before {
-  content: "\e04d"; }
-#converse-embedded-chat .icon-bubbles2:before,
-#conversejs .icon-bubbles2:before {
-  content: "\e016"; }
-#converse-embedded-chat .icon-bubbles3:before,
-#conversejs .icon-bubbles3:before {
-  content: "\e017"; }
-#converse-embedded-chat .icon-bubbles:before,
-#conversejs .icon-bubbles:before {
-  content: "\e015"; }
-#converse-embedded-chat .icon-busy:before,
-#conversejs .icon-busy:before {
-  content: "\e004"; }
-#converse-embedded-chat .icon-dnd:before,
-#conversejs .icon-dnd:before {
-  content: "\e004"; }
-#converse-embedded-chat .icon-cancel-circle:before,
-#conversejs .icon-cancel-circle:before {
-  content: "\e058"; }
-#converse-embedded-chat .icon-checkmark:before,
-#conversejs .icon-checkmark:before {
-  content: "\2713"; }
-#converse-embedded-chat .icon-close:before,
-#conversejs .icon-close:before {
-  content: "\2715"; }
-#converse-embedded-chat .icon-closed:before,
-#conversejs .icon-closed:before {
-  content: "\25ba"; }
-#converse-embedded-chat .icon-cog:before,
-#conversejs .icon-cog:before {
-  content: "\e02f"; }
-#converse-embedded-chat .icon-cogs:before,
-#conversejs .icon-cogs:before {
-  content: "\e022"; }
-#converse-embedded-chat .icon-conversejs:before,
-#conversejs .icon-conversejs:before {
-  content: "\e600"; }
-#converse-embedded-chat .icon-database:before,
-#conversejs .icon-database:before {
-  content: "\f1c0"; }
-#converse-embedded-chat .icon-envelope:before,
-#conversejs .icon-envelope:before {
-  content: "\f003"; }
-#converse-embedded-chat .icon-exit:before,
-#conversejs .icon-exit:before {
-  content: "\e601"; }
-#converse-embedded-chat .icon-eye-blocked:before,
-#conversejs .icon-eye-blocked:before {
-  content: "\e031"; }
-#converse-embedded-chat .icon-eye:before,
-#conversejs .icon-eye:before {
-  content: "\e030"; }
-#converse-embedded-chat .icon-github:before,
-#conversejs .icon-github:before {
-  content: "\eab0"; }
-#converse-embedded-chat .icon-globe:before,
-#conversejs .icon-globe:before {
-  content: "\f0ac"; }
-#converse-embedded-chat .icon-google2:before,
-#conversejs .icon-google2:before {
-  content: "\ea89"; }
-#converse-embedded-chat .icon-group:before,
-#conversejs .icon-group:before {
-  content: "\f0c0"; }
-#converse-embedded-chat .icon-happy:before,
-#conversejs .icon-happy:before {
-  content: "\263b"; }
-#converse-embedded-chat .icon-heart2:before,
-#conversejs .icon-heart2:before {
-  content: "\f004"; }
-#converse-embedded-chat .icon-heart:before,
-#conversejs .icon-heart:before {
-  content: "\2764"; }
-#converse-embedded-chat .icon-heart_empty:before,
-#conversejs .icon-heart_empty:before {
-  content: "\f08a"; }
-#converse-embedded-chat .icon-hide-users:before,
-#conversejs .icon-hide-users:before {
-  content: "\e01c"; }
-#converse-embedded-chat .icon-home:before,
-#conversejs .icon-home:before {
-  content: "\e000"; }
-#converse-embedded-chat .icon-idcard-dark:before,
-#conversejs .icon-idcard-dark:before {
-  content: "\f2c2"; }
-#converse-embedded-chat .icon-idcard:before,
-#conversejs .icon-idcard:before {
-  content: "\f2c3"; }
-#converse-embedded-chat .icon-image:before,
-#conversejs .icon-image:before {
-  content: "\2b14"; }
-#converse-embedded-chat .icon-info:before,
-#conversejs .icon-info:before {
-  content: "\2360"; }
-#converse-embedded-chat .icon-italic:before,
-#conversejs .icon-italic:before {
-  content: "\e04f"; }
-#converse-embedded-chat .icon-key:before,
-#conversejs .icon-key:before {
-  content: "\e028"; }
-#converse-embedded-chat .icon-legal:before,
-#conversejs .icon-legal:before {
-  content: "\f0e3"; }
-#converse-embedded-chat .icon-lock:before,
-#conversejs .icon-lock:before {
-  content: "\e027"; }
-#converse-embedded-chat .icon-minus:before,
-#conversejs .icon-minus:before {
-  content: "\e05a"; }
-#converse-embedded-chat .icon-music:before,
-#conversejs .icon-music:before {
-  content: "\266b"; }
-#converse-embedded-chat .icon-newtab:before,
-#conversejs .icon-newtab:before {
-  content: "\e053"; }
-#converse-embedded-chat .icon-notebook:before,
-#conversejs .icon-notebook:before {
-  content: "\2710"; }
-#converse-embedded-chat .icon-notification:before,
-#conversejs .icon-notification:before {
-  content: "\e01f"; }
-#converse-embedded-chat .icon-offline:before,
-#conversejs .icon-offline:before {
-  content: "\e002"; }
-#converse-embedded-chat .icon-logout:before,
-#conversejs .icon-logout:before {
-  content: "\e002"; }
-#converse-embedded-chat .icon-online:before,
-#conversejs .icon-online:before {
-  content: "\25fc"; }
-#converse-embedded-chat .icon-opened:before,
-#conversejs .icon-opened:before {
-  content: "\25bc"; }
-#converse-embedded-chat .icon-pencil:before,
-#conversejs .icon-pencil:before {
-  content: "\270e"; }
-#converse-embedded-chat .icon-phone-hang-up:before,
-#conversejs .icon-phone-hang-up:before {
-  content: "\260e"; }
-#converse-embedded-chat .icon-phone:before,
-#conversejs .icon-phone:before {
-  content: "\260f"; }
-#converse-embedded-chat .icon-plus:before,
-#conversejs .icon-plus:before {
-  content: "\271a"; }
-#converse-embedded-chat .icon-pushpin:before,
-#conversejs .icon-pushpin:before {
-  content: "\e012"; }
-#converse-embedded-chat .icon-quotes-left:before,
-#conversejs .icon-quotes-left:before {
-  content: "\e01d"; }
-#converse-embedded-chat .icon-reddit:before,
-#conversejs .icon-reddit:before {
-  content: "\eac6"; }
-#converse-embedded-chat .icon-remove:before,
-#conversejs .icon-remove:before {
-  content: "\e02d"; }
-#converse-embedded-chat .icon-room-info:before,
-#conversejs .icon-room-info:before {
-  content: "\e059"; }
-#converse-embedded-chat .icon-save:before,
-#conversejs .icon-save:before {
-  content: "\f0c7"; }
-#converse-embedded-chat .icon-search:before,
-#conversejs .icon-search:before {
-  content: "\e021"; }
-#converse-embedded-chat .icon-show-users:before,
-#conversejs .icon-show-users:before {
-  content: "\e01e"; }
-#converse-embedded-chat .icon-smiley:before,
-#conversejs .icon-smiley:before {
-  content: "\263a"; }
-#converse-embedded-chat .icon-snowflake:before,
-#conversejs .icon-snowflake:before {
-  content: "\f2dc"; }
-#converse-embedded-chat .icon-spell-check:before,
-#conversejs .icon-spell-check:before {
-  content: "\e045"; }
-#converse-embedded-chat .icon-spinner:before,
-#conversejs .icon-spinner:before {
-  content: "\231b"; }
-#converse-embedded-chat .icon-star:before,
-#conversejs .icon-star:before {
-  content: "\f005"; }
-#converse-embedded-chat .icon-star_empty:before,
-#conversejs .icon-star_empty:before {
-  content: "\f006"; }
-#converse-embedded-chat .icon-strikethrough:before,
-#conversejs .icon-strikethrough:before {
-  content: "\e050"; }
-#converse-embedded-chat .icon-twitter:before,
-#conversejs .icon-twitter:before {
-  content: "\ea96"; }
-#converse-embedded-chat .icon-underline:before,
-#conversejs .icon-underline:before {
-  content: "\e04e"; }
-#converse-embedded-chat .icon-unlocked:before,
-#conversejs .icon-unlocked:before {
-  content: "\e025"; }
-#converse-embedded-chat .icon-user:before,
-#conversejs .icon-user:before {
-  content: "\e01a"; }
-#converse-embedded-chat .icon-users:before,
-#conversejs .icon-users:before {
-  content: "\e01b"; }
-#converse-embedded-chat .icon-warning:before,
-#conversejs .icon-warning:before {
-  content: "\26a0"; }
-#converse-embedded-chat .icon-wrench:before,
-#conversejs .icon-wrench:before {
-  content: "\e024"; }
-#converse-embedded-chat .icon-xa:before,
-#conversejs .icon-xa:before {
-  content: "\e602"; }
-#converse-embedded-chat .icon-zoomin:before,
-#conversejs .icon-zoomin:before {
-  content: "\e02b"; }
-#converse-embedded-chat .icon-zoomout:before,
-#conversejs .icon-zoomout:before {
-  content: "\e02a"; }
-#converse-embedded-chat [data-icon]:before,
-#conversejs [data-icon]:before {
-  content: attr(data-icon);
-  font-family: 'Converse-js';
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-  speak: none;
-  text-transform: none;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-#converse-embedded-chat [class^="icon-"]:before, #converse-embedded-chat [class*=" icon-"]:before,
-#conversejs [class^="icon-"]:before,
-#conversejs [class*=" icon-"]:before {
-  background-position: 14px 14px;
-  background-image: none;
-  font-family: 'Converse-js';
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  width: auto;
-  height: auto;
-  line-height: 1;
-  speak: none;
-  text-transform: none;
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-
-/*# sourceMappingURL=fonts.css.map */

+ 7 - 7
css/inverse.css

@@ -4700,19 +4700,15 @@ body.reset {
     animation: spin 2s infinite, linear;
     display: block;
     text-align: center;
-    margin: 1em; }
-    #conversejs .spinner:before {
-      font-size: 24px;
-      font-family: 'Converse-js' !important;
-      content: "\231b"; }
+    margin: 2em;
+    font-size: 24px; }
   #conversejs .left {
     float: left; }
   #conversejs .right {
     float: right; }
   #conversejs .centered {
     text-align: center;
-    display: block;
-    margin: 0; }
+    display: block; }
   #conversejs .hor_centered {
     text-align: center;
     display: block;
@@ -6032,7 +6028,11 @@ body {
         color: #E77051; }
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-info,
       #conversejs .chatroom .box-flyout .chatroom-body .chat-info {
+        color: #E77051;
         line-height: normal; }
+        #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-info.badge,
+        #conversejs .chatroom .box-flyout .chatroom-body .chat-info.badge {
+          color: white; }
       #converse-embedded-chat .chatroom .box-flyout .chatroom-body .mentioned,
       #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
         font-weight: bold; }

+ 1 - 1
mockup/chatroom.html

@@ -62,7 +62,7 @@
                                         <span class="chat-msg-content">I'll be gone for a while, will be back in about an hour</span>
                                     </div>
 
-                                    <div class="message chat-info chat-event" data-isodate="2018-03-07T10:21:09+01:00" data-join="&quot;jcbrand&quot;">jcbrand has entered the room.</div>
+                                    <div class="message chat-info chat-event" data-isodate="2018-03-07T10:21:09+01:00" data-join="&quot;jcbrand&quot;">jcbrand has entered the room</div>
                                     <div class="message chat-info chat-event" data-isodate="2018-03-07T10:21:09+01:00" data-join="&quot;jcbrand&quot;">Topic set by jcbrand</div>
                                     <div class="message chat-info chat-topic" data-isodate="2018-03-07T10:21:09+01:00">Converse.js: The latest release is 3.3.4. Please be
                                          patient if your questions aren't answered immediately. We're all in different timezones.</div>

+ 4 - 0
sass/_chatrooms.scss

@@ -98,7 +98,11 @@
                     color: $chatroom-head-color;
                 }
                 .chat-info {
+                    color: $chatroom-head-color;
                     line-height: normal;
+                    &.badge {
+                        color: $chat-head-text-color;
+                    }
                 }
                 .mentioned {
                     font-weight: bold;

+ 2 - 7
sass/_core.scss

@@ -295,12 +295,8 @@ body.reset {
         @include animation(spin 2s infinite, linear);
         display: block;
         text-align: center;
-        margin: 1em;
-        &:before {
-            font-size: 24px;
-            font-family: 'Converse-js' !important;
-            content: "\231b";
-        }
+        margin: 2em;
+        font-size: 24px;
     }
     .left {
         float: left;
@@ -311,7 +307,6 @@ body.reset {
     .centered {
         text-align: center;
         display: block;
-        margin: 0;
     }
     .hor_centered {
         text-align: center;

+ 0 - 140
sass/_fonts.scss

@@ -1,140 +0,0 @@
-@font-face {
-    font-family: 'Converse-js';
-    src: url($font-path + 'icomoon.eot?wvi0ht');
-    src: url($font-path + 'icomoon.eot?wvi0ht#iefix') format('embedded-opentype'),
-         url($font-path + 'icomoon.ttf?wvi0ht') format('truetype'),
-         url($font-path + 'icomoon.woff?wvi0ht') format('woff'),
-         url($font-path + 'icomoon.svg?wvi0ht#icomoon') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-.icon-conversejs {
-    padding-right: 0.2em;
-    font-family: 'Converse-js';
-    speak: none;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 1;
-    /* Better Font Rendering =========== */
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-conversejs:before {
-    content: "\e600";
-}
-
-#converse-embedded-chat,
-#conversejs {
-    .icon-address-book:before   { content: "\270f"; }
-    .icon-attachment:before     { content: "\e032"; }
-    .icon-away:before           { content: "\25fb"; }
-    .icon-blocked:before        { content: "\2718"; }
-    .icon-bold:before           { content: "\e04d"; }
-    .icon-bubbles2:before       { content: "\e016"; }
-    .icon-bubbles3:before       { content: "\e017"; }
-    .icon-bubbles:before        { content: "\e015"; }
-    .icon-busy:before           { content: "\e004"; }
-    .icon-dnd:before            { content: "\e004"; }
-    .icon-cancel-circle:before  { content: "\e058"; }
-    .icon-checkmark:before      { content: "\2713"; }
-    .icon-close:before          { content: "\2715"; }
-    .icon-closed:before         { content: "\25ba"; }
-    .icon-cog:before            { content: "\e02f"; }
-    .icon-cogs:before           { content: "\e022"; }
-    .icon-conversejs:before     { content: "\e600"; }
-    .icon-database:before       { content: "\f1c0"; }
-    .icon-envelope:before       { content: "\f003"; }
-    .icon-exit:before           { content: "\e601"; }
-    .icon-eye-blocked:before    { content: "\e031"; }
-    .icon-eye:before            { content: "\e030"; }
-    .icon-github:before         { content: "\eab0"; }
-    .icon-globe:before          { content: "\f0ac"; }
-    .icon-google2:before        { content: "\ea89"; }
-    .icon-group:before          { content: "\f0c0"; }
-    .icon-happy:before          { content: "\263b"; }
-    .icon-heart2:before         { content: "\f004"; }
-    .icon-heart:before          { content: "\2764"; }
-    .icon-heart_empty:before    { content: "\f08a"; }
-    .icon-hide-users:before     { content: "\e01c"; }
-    .icon-home:before           { content: "\e000"; }
-    .icon-idcard-dark:before    { content: "\f2c2"; }
-    .icon-idcard:before         { content: "\f2c3"; }
-    .icon-image:before          { content: "\2b14"; }
-    .icon-info:before           { content: "\2360"; }
-    .icon-italic:before         { content: "\e04f"; }
-    .icon-key:before            { content: "\e028"; }
-    .icon-legal:before          { content: "\f0e3"; }
-    .icon-lock:before           { content: "\e027"; }
-    .icon-minus:before          { content: "\e05a"; }
-    .icon-music:before          { content: "\266b"; }
-    .icon-newtab:before         { content: "\e053"; }
-    .icon-notebook:before       { content: "\2710"; }
-    .icon-notification:before   { content: "\e01f"; }
-    .icon-offline:before        { content: "\e002"; }
-    .icon-logout:before         { content: "\e002"; }
-    .icon-online:before         { content: "\25fc"; }
-    .icon-opened:before         { content: "\25bc"; }
-    .icon-pencil:before         { content: "\270e"; }
-    .icon-phone-hang-up:before  { content: "\260e"; }
-    .icon-phone:before          { content: "\260f"; }
-    .icon-plus:before           { content: "\271a"; }
-    .icon-pushpin:before        { content: "\e012"; }
-    .icon-quotes-left:before    { content: "\e01d"; }
-    .icon-reddit:before         { content: "\eac6"; }
-    .icon-remove:before         { content: "\e02d"; }
-    .icon-room-info:before      { content: "\e059"; }
-    .icon-save:before           { content: "\f0c7"; }
-    .icon-search:before         { content: "\e021"; }
-    .icon-show-users:before     { content: "\e01e"; }
-    .icon-smiley:before         { content: "\263a"; }
-    .icon-snowflake:before      { content: "\f2dc"; }
-    .icon-spell-check:before    { content: "\e045"; }
-    .icon-spinner:before        { content: "\231b"; }
-    .icon-star:before           { content: "\f005"; }
-    .icon-star_empty:before     { content: "\f006"; }
-    .icon-strikethrough:before  { content: "\e050"; }
-    .icon-twitter:before        { content: "\ea96"; }
-    .icon-underline:before      { content: "\e04e"; }
-    .icon-unlocked:before       { content: "\e025"; }
-    .icon-user:before           { content: "\e01a"; }
-    .icon-users:before          { content: "\e01b"; }
-    .icon-warning:before        { content: "\26a0"; }
-    .icon-wrench:before         { content: "\e024"; }
-    .icon-xa:before             { content: "\e602"; }
-    .icon-zoomin:before         { content: "\e02b"; }
-    .icon-zoomout:before        { content: "\e02a"; }
-
-    [data-icon]:before {
-        content: attr(data-icon);
-        font-family: 'Converse-js';
-        font-variant: normal;
-        font-weight: normal;
-        line-height: 1;
-        speak: none;
-        text-transform: none;
-        /* Better Font Rendering =========== */
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-    }
-
-    [class^="icon-"]:before, [class*=" icon-"]:before {
-        background-position: 14px 14px;
-        background-image: none;
-        font-family: 'Converse-js';
-        font-style: normal;
-        font-variant: normal;
-        font-weight: normal;
-        width: auto;
-        height: auto;
-        line-height: 1;
-        speak: none;
-        text-transform: none;
-        /* Better Font Rendering =========== */
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-    }
-}

+ 0 - 1
sass/converse/converse.scss

@@ -14,7 +14,6 @@
 @import "bootstrap/scss/variables";
 @import "bootstrap/scss/mixins";
 
-@import "../fonts";
 #conversejs {
     @import "bootstrap/scss/root";
     @import "bootstrap/scss/reboot";

+ 4 - 4
src/converse-muc-views.js

@@ -1819,14 +1819,14 @@
                                 'data': `data-leavejoin="${nick}"`,
                                 'isodate': moment().format(),
                                 'extra_classes': 'chat-event',
-                                'message': __('%1$s has left and re-entered the room.', nick)
+                                'message': __('%1$s has left and re-entered the room', nick)
                             });
                     } else {
                         let  message;
                         if (_.get(stat, 'textContent')) {
                             message = __('%1$s has entered the room. "%2$s"', nick, stat.textContent);
                         } else {
-                            message = __('%1$s has entered the room.', nick);
+                            message = __('%1$s has entered the room', nick);
                         }
                         const data = {
                             'data': `data-join="${nick}"`,
@@ -1858,7 +1858,7 @@
                         if (_.get(stat, 'textContent')) {
                             message = __('%1$s has entered and left the room. "%2$s"', nick, stat.textContent);
                         } else {
-                            message = __('%1$s has entered and left the room.', nick);
+                            message = __('%1$s has entered and left the room', nick);
                         }
                         last_el.outerHTML =
                             tpl_info({
@@ -1872,7 +1872,7 @@
                         if (_.get(stat, 'textContent')) {
                             message = __('%1$s has left the room. "%2$s"', nick, stat.textContent);
                         } else {
-                            message = __('%1$s has left the room.', nick);
+                            message = __('%1$s has left the room', nick);
                         }
                         const data = {
                             'message': message,

+ 2 - 2
src/templates/chatbox_head.html

@@ -6,14 +6,14 @@
                 <img alt="User Avatar"
                     class="avatar"
                     height="{{{o.avatar_height}}}px" width="{{{o.avatar_width}}}px"
-                    src="data:{{{o.image_type}}};base64,{{{o.image}}}"/>
+                    src="data:{{{o.image_type || o._converse.DEFAULT_IMAGE_TYPE}}};base64,{{{o.image || o._converse.DEFAULT_IMAGE}}}"/>
             </div>
             {[ } ]}
             <div class="col chat-title" title="{{{o.jid}}}">
                 {[ if (o.url) { ]}
                     <a href="{{{o.url}}}" target="_blank" rel="noopener" class="user">
                 {[ } ]}
-                        {{{ o.fullname }}}
+                        {{{ o.fullname || o.jid }}}
                 {[ if (o.url) { ]}
                     </a>
                 {[ } ]}

+ 1 - 1
src/templates/spinner.html

@@ -1 +1 @@
-<span class="spinner centered"/>
+<span class="spinner fa fa-spinner centered"/>

+ 4 - 4
src/templates/toolbar_otr.html

@@ -2,15 +2,15 @@
     <li class="toggle-toolbar-menu toggle-otr {{{o.otr_status_class}}}" title="{{{o.otr_tooltip}}}">
         <span class="chat-toolbar-text">{{{o.otr_translated_status}}}</span>
         {[ if (o.otr_status == o.UNENCRYPTED) { ]}
-            <span class="icon-unlocked"></span>
+            <span class="fa fa-unlock"></span>
         {[ } ]}
         {[ if (o.otr_status == o.UNVERIFIED) { ]}
-            <span class="icon-lock"></span>
+            <span class="fa fa-lock"></span>
         {[ } ]}
         {[ if (o.otr_status == o.VERIFIED) { ]}
-            <span class="icon-lock"></span>
+            <span class="fa fa-lock"></span>
         {[ } ]} {[ if (o.otr_status == o.FINISHED) { ]}
-            <span class="icon-unlocked"></span>
+            <span class="fa fa-unlock"></span>
         {[ } ]}
         <ul class="toolbar-menu collapsed">
             {[ if (o.otr_status == o.UNENCRYPTED) { ]}