build v3.2.1

jsxc · Jun 2, 2017 · bd2844d · bd2844d
1 parent 4f6930e
commit bd2844d
Show file tree

Hide file tree

Showing 13 changed files with 5,201 additions and 3,779 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+v3.2.1 / 2017-06-02
+===
+- upgrade jsxc to v3.2.1 ([change log](https://github.com/jsxc/jsxc/blob/master/CHANGELOG.md))
+
 v3.1.1 / 2017-02-14
 ===
 - upgrade jsxc to v3.1.1 ([change log](https://github.com/jsxc/jsxc/blob/master/CHANGELOG.md))

diff --git a/build/css/jsxc.sogo.css b/build/css/jsxc.sogo.css
@@ -2402,7 +2402,8 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
     width: 100%; }
 
 #jsxc_dialog .mfp-close, #jsxc_webrtc .mfp-close {
-  font-size: 23px; }
+  font-size: 23px;
+  font-weight: normal; }
 
 .mfp-bg {
   z-index: 9000; }
@@ -2785,7 +2786,7 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
   width: 14px;
   height: 100%;
   position: absolute;
-  left: -14px !important;
+  right: 100%;
   top: 0;
   z-index: 110;
   background-color: transparent;
@@ -2997,15 +2998,14 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
   position: fixed;
   left: 0;
   bottom: 0;
-  width: 30px;
-  height: 30px; }
+  width: 30px; }
   @media (max-width: 768px) {
     #jsxc_windowListSB {
       display: none; } }
   #jsxc_windowListSB > div {
     box-sizing: border-box;
     width: 14px;
-    height: 100%;
+    height: 30px;
     background-color: #cccccc;
     color: gray;
     text-align: center;
@@ -3115,7 +3115,8 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
     .jsxc_window .jsxc_emoticons:hover:after {
       opacity: 0.5; }
   .jsxc_window .jsxc_fade {
-    position: relative; }
+    position: relative;
+    overflow: hidden; }
     .jsxc_window .jsxc_fade .jsxc_overlay {
       display: none;
       background-color: rgba(0, 0, 0, 0.5);
@@ -3165,6 +3166,31 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
           text-overflow: ellipsis; }
         .jsxc_window .jsxc_fade .jsxc_overlay > div a:hover {
           text-decoration: underline; }
+    .jsxc_window .jsxc_fade .jsxc_mam-load-more {
+      display: none;
+      text-align: center;
+      font-size: 0.8em;
+      font-style: italic;
+      position: absolute;
+      top: -42px;
+      left: 0;
+      right: 0;
+      height: 42px;
+      cursor: pointer;
+      z-index: 80;
+      line-height: 42px;
+      opacity: 0;
+      -webkit-transition: opacity 0.5s, top 0.5s;
+              transition: opacity 0.5s, top 0.5s; }
+      .jsxc_window .jsxc_fade .jsxc_mam-load-more.jsxc_show {
+        top: 0;
+        opacity: 0.7; }
+        .jsxc_window .jsxc_fade .jsxc_mam-load-more.jsxc_show:hover {
+          opacity: 1; }
+    .jsxc_window .jsxc_fade.jsxc_mam-enable .jsxc_textarea {
+      padding-top: 42px; }
+    .jsxc_window .jsxc_fade.jsxc_mam-enable .jsxc_mam-load-more {
+      display: block; }
   .jsxc_window .jsxc_avatar {
     margin-top: 1px; }
   .jsxc_window .jsxc_textarea {
@@ -3252,16 +3278,16 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
   position: relative;
   outline: none;
   clear: both; }
-  .jsxc_chatmessage.jsxc_error {
-    opacity: 0.7; }
-    .jsxc_chatmessage.jsxc_error:before {
-      content: " ";
-      position: absolute;
-      top: 3px;
-      right: 3px;
-      width: 8px;
-      height: 8px;
-      background-color: yellow; }
+  .jsxc_chatmessage.jsxc_error:before {
+    content: attr(data-error-msg);
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(255, 255, 255, 0.7);
+    text-align: center;
+    padding: 10px 5px; }
   .jsxc_chatmessage a {
     color: #00f;
     text-decoration: underline;
@@ -3410,26 +3436,6 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
     width: 1.2em;
     height: 1.2em;
     vertical-align: middle; }
-  .jsxc_sys.jsxc_composing {
-    text-align: center;
-    font-size: 0.9em;
-    font-style: italic;
-    display: block;
-    opacity: 0;
-    overflow: hidden;
-    -webkit-transition: opacity 0.6s;
-            transition: opacity 0.6s; }
-    .jsxc_sys.jsxc_composing:before {
-      content: " ";
-      width: 1.5em;
-      height: 1em;
-      display: inline-block;
-      background-size: 80%;
-      background-repeat: no-repeat;
-      margin: 0 3px 0 0;
-      background-image: url('../js/jsxc/img/composing.png'); }
-    .jsxc_sys.jsxc_composing.jsxc_fadein {
-      opacity: 1; }
 
 div.jsxc_settings {
   position: relative; }
@@ -3466,6 +3472,35 @@ div.jsxc_transfer {
     div.jsxc_transfer.jsxc_enc.jsxc_trust {
       background-image: url('../js/jsxc/img/padlock_close_green.svg'); }
 
+.jsxc_status-msg {
+  font-size: 12px;
+  display: none;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  height: 50%;
+  line-height: 17.5px;
+  opacity: 0.7; }
+  .jsxc_status-msg.jsxc_composing:before {
+    content: " ";
+    width: 1em;
+    height: 1em;
+    display: inline-block;
+    background-size: cover;
+    vertical-align: middle;
+    background-repeat: no-repeat;
+    background-image: url('../js/jsxc/img/composing.png'); }
+
+.jsxc_status-msg-show .jsxc_name {
+  height: 50%;
+  line-height: 20px; }
+
+.jsxc_status-msg-show .jsxc_status-msg {
+  display: block; }
+
+.jsxc_status-msg-show .jsxc_lastmsg {
+  display: none !important; }
+
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_bar .jsxc_avatar, li[data-type='groupchat'] .jsxc_avatar {
   text-indent: 999px;
   background-image: url('../js/jsxc/img/group_white.svg');
@@ -3475,7 +3510,7 @@ div.jsxc_transfer {
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fade {
   padding-top: 44px; }
 
-.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_sendFile {
+.jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_fingerprints, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_verification, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_transfer, .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_video {
   display: none; }
 
 .jsxc_windowItem.jsxc_groupchat.jsxc_normal .jsxc_members {
@@ -3543,6 +3578,8 @@ div.jsxc_transfer {
           color: inherit; }
       .jsxc_windowItem .jsxc_memberlist.jsxc_expand ul > li .jsxc_avatar {
         margin-right: 4px; }
+  .jsxc_windowItem .jsxc_memberlist .jsxc_avatar :before {
+    display: none; }
 
 li[data-type='groupchat'] .jsxc_video {
   display: none; }
@@ -3628,6 +3665,14 @@ li[data-type='groupchat'] .jsxc_video {
       background-color: #f2f2f2;
       padding: 10px;
       margin: 0 -30px 10px; }
+      #jsxc_dialog form fieldset h3.jsxc_experimental:after {
+        content: "experimental";
+        font-size: 0.7em;
+        border-radius: 2px;
+        padding: 1px 5px;
+        background-color: orange;
+        margin-left: 5px;
+        font-weight: normal; }
   #jsxc_dialog legend {
     border: 0;
     font-size: 20px; }