[start page] refactoring

common/loginpage/res/img/logo_onlyoffice.svg

@@ -1,4 +1,4 @@
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="324.7" height="60">
+<svg xmlns="http://www.w3.org/2000/svg" width="324.7" height="60">
   <symbol id="logo__asc" viewBox="0 0 324.7 60">
     <defs><style>.svg--asc1{fill:#5b5b5b}.svg--asc2{fill:#3a3a3a;}</style><linearGradient id="a" data-name="New Gradient Swatch 4" x1="32.78" y1="71.17" x2="32.78" y2="25.17" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fcc2b1"/><stop offset=".88" stop-color="#d9420b"/></linearGradient><linearGradient id="b" x1="32.78" y1="51.69" x2="32.78" y2="21.41" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#deedc9"/><stop offset=".66" stop-color="#8bba25"/></linearGradient><linearGradient id="c" x1="32.78" y1="40.18" x2="32.78" y2="-.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#c2ebfa"/><stop offset="1" stop-color="#26a8de"/></linearGradient></defs><path d="M76.9 29.7q0-7.9 4.5-12a16 16 0 0 1 10.7-3.9 15.6 15.6 0 0 1 10.6 3.9c3.1 2.7 4.6 6.7 4.6 12s-1.5 9.3-4.6 11.9a15.2 15.2 0 0 1-10.6 4 15.6 15.6 0 0 1-10.7-4c-3-2.6-4.5-6.6-4.5-11.9zm6.6 0c0 3.6.7 6.3 2 8a8.8 8.8 0 0 0 4.5 3.2l1.1.2h2.1l1.1-.2a8.5 8.5 0 0 0 4.4-3.3c1.3-1.7 2-4.3 2-7.9s-.7-6.2-2-8a8.8 8.8 0 0 0-4.4-3.2l-1.1-.2h-2.1l-1.1.2a8.8 8.8 0 0 0-4.5 3.2c-1.3 1.7-2 4.4-2 8zM110.6 14.1h8.2l10.8 19.6 1.6 4.2h.1l-.1-5.5V14.1h6.3v31.1h-8.2l-10.8-20.4-1.6-3.4h-.1l.1 5.5v18.3h-6.3V14.1zM144 14.1h6.3V40h12.4v5.2H144V14.1zM158.8 14.1h7.3l6.4 10.9 1 2.2h.2l1-2.2 6.5-10.9h6.7l-11.3 18.5v12.6h-6.3V32.5l-11.5-18.4z" class="svg--asc1" /><path d="M187.1 29.7c0-5.3 1.6-9.3 4.6-12a16.5 16.5 0 0 1 21.3 0c3 2.7 4.6 6.7 4.6 12S216 39 213 41.6a16.2 16.2 0 0 1-21.3 0c-3-2.6-4.6-6.6-4.6-11.9zm6.6 0c0 3.6.7 6.3 2.1 8a8.2 8.2 0 0 0 4.4 3.2l1.1.2h2.1l1.2-.2a8.9 8.9 0 0 0 4.4-3.3c1.3-1.7 2-4.3 2-7.9s-.7-6.2-2-8a9.2 9.2 0 0 0-4.4-3.2l-1.2-.2h-2.1l-1.1.2a8.2 8.2 0 0 0-4.4 3.2c-1.4 1.7-2.1 4.4-2.1 8zM221.9 14.1h17.4v5.2h-11.1v7.6h10.6v5.2h-10.6v13.1h-6.3V14.1zM244 14.1h17.4v5.2h-11.1v7.6h10.6v5.2h-10.6v13.1H244V14.1zM265.1 45.2V14.1h6.3v31.1h-6.3zM301 14.8v5.4a20 20 0 0 0-3.5-.9 23.8 23.8 0 0 0-3.9-.3c-3.3 0-5.8 1-7.6 3.1a11.1 11.1 0 0 0-2.6 7.7 11.1 11.1 0 0 0 2.5 7.5c1.6 2.1 4 3.1 7.2 3.1l3.5-.3a12.7 12.7 0 0 0 4-1.1l.4 5.3-.9.2a4 4 0 0 1-1.3.4l-3 .5-3.7.2h-1a17.3 17.3 0 0 1-9.9-4.1c-3-2.5-4.5-6.3-4.5-11.6s1.5-9.1 4.4-11.9 6.9-4.2 11.8-4.2h3.5l3.2.5.7.2.7.2zM306 14.1h18.7V19h-12.3v7.8h11.1v4.8h-11.1v8.7h12.3v4.9H306V14.1z" class="svg--asc2"/><path d="M28.7 59.2l-27-12.6c-2.3-1-2.3-2.8 0-3.8l9.4-4.4 17.6 8.2a11.6 11.6 0 0 0 8.2 0l17.5-8.2 9.5 4.4c2.2 1 2.2 2.8 0 3.8l-27 12.6a10.6 10.6 0 0 1-8.2 0z" fill-rule="evenodd" fill="url(#a)"/><path d="M28.7 44.2l-27-12.6c-2.3-1-2.3-2.8 0-3.8l9.2-4.3 17.8 8.3a10.6 10.6 0 0 0 8.2 0l17.8-8.3 9.2 4.3c2.2 1 2.2 2.8 0 3.8l-27 12.6a10.6 10.6 0 0 1-8.2 0z" fill-rule="evenodd" fill="url(#b)"/><path d="M28.7 29.8l-27-12.6c-2.3-1-2.3-2.8 0-3.8L28.7.8a10.6 10.6 0 0 1 8.2 0l27 12.6c2.2 1 2.2 2.8 0 3.8l-27 12.6a11.6 11.6 0 0 1-8.2 0z" fill-rule="evenodd" fill="url(#c)"/>
   </symbol>

common/loginpage/src/component.less

@@ -218,7 +218,8 @@ input[type="radio"] {
     combo-box
 */
 .box-cmp-select {
-    display: inline-block;
+    /*display: inline-block;*/
+    font-size: 0;
 
     &:after {
         content: '';

common/loginpage/src/dlglogin.js

@@ -266,8 +266,11 @@ window.LoginDlg = function(opts) {
     };
 
     function hideLoginError() {
-        $el.find('#auth-error').fadeOut(100);
-        $el.find('.error').removeClass('error');
+        let $lbl = $el.find('#auth-error');
+        if ( $lbl.is(':visible') ) {
+            $lbl.fadeOut(100);
+            $el.find('.error').removeClass('error');
+        }
     };
 
     function getUserInfo(url, token) {

common/loginpage/src/sdk.js

@@ -79,7 +79,7 @@
         } else {
             _clouds = [{ id: "asc",
                             name: "ONLYOFFICE",
-                            check: {"url":"/api/2.0/capabilities.json"} }];
+                            check: {url:"/api/2.0/capabilities.json"} }];
         }
 
         return _clouds;

common/loginpage/src/window.less

@@ -101,6 +101,25 @@ dialog {
         border-top: 1px solid @color-gray-3;
         margin: 24px 0;
     }
+
+    .dlg--option {
+        margin: 12px 0;
+
+        &.first {
+            margin-top: 0;
+        }
+    }
+
+    .error-box {
+        /*height: 22px;*/
+        position: relative;
+    }
+
+    .msg-error {
+        position: absolute;
+        top: -7px;
+        font-size: 12px;
+    }
 }
 
 .tbox {
@@ -129,22 +148,10 @@ dialog {
 }
 
 .dlg-login {
-    .tbox {
-        margin: 12px 0;
-    }
-
-    .tbox.first {
-        margin-top: 0;
-    }
-
     #btn-login, #btn-next {
         margin-left: 30px;
     }    
 
-    .msg-error {
-        font-size: 12px;
-    }
-
     .logo {
         margin: 10px 0 6px;
     }
@@ -178,16 +185,12 @@ dialog {
         }
     }
 
-    .error-box {
-        height: 22px;
-    }
-
     .combined {
-        margin: 0 15px 0 0;
+        margin-right: 15px;
     }
 
     .notice {
-        margin: 0;
+        margin: 0 0 12px;
         line-height: 18px;
     }
 
@@ -196,6 +199,10 @@ dialog {
         color: #999;
     }
 
+    .box-cmp-select, select {
+        width: 100%;
+    }
+}
     select {
         width: 200px;
     }