Merge branch 'release/macos/v4.8.7'

ONLYOFFICE · Feb 8, 2018 · 29319ac · 29319ac
2 parents 6cf36a6 + a98c982
commit 29319ac
Show file tree

Hide file tree

Showing 99 changed files with 8,478 additions and 1,636 deletions.
diff --git a/common/loginpage/deploy/index.html b/common/loginpage/deploy/index.html
diff --git a/common/loginpage/src/dlglogin.js b/common/loginpage/src/dlglogin.js
diff --git a/common/loginpage/src/index.html b/common/loginpage/src/index.html
@@ -75,43 +75,31 @@
         .romb {
             width: 40px;
             height: 40px;
-            -webkit-transform: rotate(135deg) skew(20deg, 20deg);
+            transform: rotate(135deg) skew(20deg, 20deg);
             position: absolute;
-            background: red;
             border-radius: 6px;
             animation: movedown 3s infinite ease;
         }
 
         #blue {
             z-index: 3;
             background: #55bce6;
-            animation-name: blue;
+            animation-name: bluetile;
         }
 
         #red {
             z-index:1;
             background: #de7a59;
-            animation-name: red;
+            animation-name: redtile;
         }
 
         #green {
             z-index: 2;
             background: #a1cb5c;
-            animation-name: green;
+            animation-name: greentile;
         }
 
-        @-webkit-keyframes red {
-              0%    { top:120px; background: #de7a59; }
-             10%    { top:120px; background: #F2CBBF; }
-             14%    { background: #f4f4f4; top:120px; }
-             15%    { background: #f4f4f4; top:0;}
-             20%    { background: #E6E4E4; }
-             30%    { background: #D2D2D2; }
-             40%    { top:120px; }
-            100%    { top:120px; background: #de7a59; }
-        }
-
-        @keyframes red {
+        @keyframes redtile {
               0%    { top:120px; background: #de7a59; }
              10%    { top:120px; background: #F2CBBF; }
              14%    { background: #f4f4f4; top:120px; }
@@ -122,7 +110,7 @@
             100%    { top:120px; background: #de7a59; }
         }
 
-        @-webkit-keyframes green {
+        @keyframes greentile {
               0%    { top:110px; background: #a1cb5c; opacity:1; }
              10%    { top:110px; background: #CBE0AC; opacity:1; }
              14%    { background: #f4f4f4; top:110px; opacity:1; }
@@ -134,30 +122,7 @@
             100%    { top:110px; background: #a1cb5c; }
         }
 
-        @keyframes green {
-              0%    { top:110px; background: #a1cb5c; opacity:1; }
-             10%    { top:110px; background: #CBE0AC; opacity:1; }
-             14%    { background: #f4f4f4; top:110px; opacity:1; }
-             15%    { background: #f4f4f4; top:0; opacity:1; }
-             20%    { background: #f4f4f4; top:0; opacity:0; }
-             25%    { background: #EFEFEF; top:0; opacity:1; }
-             30%    { background:#E6E4E4; }
-             70%    { top:110px; }
-            100%    { top:110px; background: #a1cb5c; }
-        }
-
-        @-webkit-keyframes blue {
-              0%    { top:100px; background: #55bce6; opacity:1; }
-             10%    { top:100px; background: #BFE8F8; opacity:1; }
-             14%    { background: #f4f4f4; top:100px; opacity:1; }
-             15%    { background: #f4f4f4; top:0; opacity:1; }
-             20%    { background: #f4f4f4; top:0; opacity:0; }
-             25%    { background: #f4f4f4; top:0; opacity:0; }
-             45%    { background: #EFEFEF; top:0; opacity:0,2; }
-            100%    { top:100px; background: #55bce6; }
-        }
-
-        @keyframes blue {
+        @keyframes bluetile {
               0%    { top:100px; background: #55bce6; opacity:1; }
              10%    { top:100px; background: #BFE8F8; opacity:1; }
              14%    { background: #f4f4f4; top:100px; opacity:1; }

diff --git a/common/loginpage/src/index.html.deploy b/common/loginpage/src/index.html.deploy
@@ -62,62 +62,31 @@
         .romb {
             width: 40px;
             height: 40px;
-            -webkit-transform: rotate(135deg) skew(20deg, 20deg);
-            -moz-transform: rotate(135deg) skew(20deg, 20deg);
-            -ms-transform: rotate(135deg) skew(20deg, 20deg);
-            -o-transform: rotate(135deg) skew(20deg, 20deg);
+            transform: rotate(135deg) skew(20deg, 20deg);
             position: absolute;
-            background: red;
             border-radius: 6px;
-            -webkit-animation: movedown 3s infinite ease;
-            -moz-animation: movedown 3s infinite ease;
-            -ms-animation: movedown 3s infinite ease;
-            -o-animation: movedown 3s infinite ease;
             animation: movedown 3s infinite ease;
         }
 
         #blue {
             z-index: 3;
             background: #55bce6;
-            -webkit-animation-name: blue;
-            -moz-animation-name: blue;
-            -ms-animation-name: blue;
-            -o-animation-name: blue;
-            animation-name: blue;
+            animation-name: bluetile;
         }
 
         #red {
             z-index:1;
             background: #de7a59;
-            -webkit-animation-name: red;
-            -moz-animation-name: red;
-            -ms-animation-name: red;
-            -o-animation-name: red;
-            animation-name: red;
+            animation-name: redtile;
         }
 
         #green {
             z-index: 2;
             background: #a1cb5c;
-            -webkit-animation-name: green;
-            -moz-animation-name: green;
-            -ms-animation-name: green;
-            -o-animation-name: green;
-            animation-name: green;
+            animation-name: greentile;
         }
 
-        @-webkit-keyframes red {
-              0%    { top:120px; background: #de7a59; }
-             10%    { top:120px; background: #F2CBBF; }
-             14%    { background: #f4f4f4; top:120px; }
-             15%    { background: #f4f4f4; top:0;}
-             20%    { background: #E6E4E4; }
-             30%    { background: #D2D2D2; }
-             40%    { top:120px; }
-            100%    { top:120px; background: #de7a59; }
-        }
-
-        @keyframes red {
+        @keyframes redtile {
               0%    { top:120px; background: #de7a59; }
              10%    { top:120px; background: #F2CBBF; }
              14%    { background: #f4f4f4; top:120px; }
@@ -128,7 +97,7 @@
             100%    { top:120px; background: #de7a59; }
         }
 
-        @-webkit-keyframes green {
+        @keyframes greentile {
               0%    { top:110px; background: #a1cb5c; opacity:1; }
              10%    { top:110px; background: #CBE0AC; opacity:1; }
              14%    { background: #f4f4f4; top:110px; opacity:1; }
@@ -140,30 +109,7 @@
             100%    { top:110px; background: #a1cb5c; }
         }
 
-        @keyframes green {
-              0%    { top:110px; background: #a1cb5c; opacity:1; }
-             10%    { top:110px; background: #CBE0AC; opacity:1; }
-             14%    { background: #f4f4f4; top:110px; opacity:1; }
-             15%    { background: #f4f4f4; top:0; opacity:1; }
-             20%    { background: #f4f4f4; top:0; opacity:0; }
-             25%    { background: #EFEFEF; top:0; opacity:1; }
-             30%    { background:#E6E4E4; }
-             70%    { top:110px; }
-            100%    { top:110px; background: #a1cb5c; }
-        }
-
-        @-webkit-keyframes blue {
-              0%    { top:100px; background: #55bce6; opacity:1; }
-             10%    { top:100px; background: #BFE8F8; opacity:1; }
-             14%    { background: #f4f4f4; top:100px; opacity:1; }
-             15%    { background: #f4f4f4; top:0; opacity:1; }
-             20%    { background: #f4f4f4; top:0; opacity:0; }
-             25%    { background: #f4f4f4; top:0; opacity:0; }
-             45%    { background: #EFEFEF; top:0; opacity:0,2; }
-            100%    { top:100px; background: #55bce6; }
-        }
-
-        @keyframes blue {
+        @keyframes bluetile {
               0%    { top:100px; background: #55bce6; opacity:1; }
              10%    { top:100px; background: #BFE8F8; opacity:1; }
              14%    { background: #f4f4f4; top:100px; opacity:1; }
@@ -226,7 +172,6 @@
                 <div class="romb" id="blue"></div>
                 <div class="romb" id="green"></div>
                 <div class="romb" id="red"></div>
-                <div class="loader-page-text">Loading...</div>
             </div>
         </div>
         <div id="placeholder">