[mobile de] Fix skeleton

This commit is contained in:
Julia Svinareva 2020-01-16 14:31:22 +03:00 committed by Alexey Golubev
parent c754b4dd53
commit 5cbc737d07
6 changed files with 38 additions and 16 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View file

@ -46,14 +46,15 @@
.loadmask > .brendpanel > div { .loadmask > .brendpanel > div {
display: flex; display: flex;
align-items: center; align-items: flex-start;
height: 100%; height: 100%;
} }
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 20px; height: 26px;
margin: 0 auto; margin: 0 auto;
margin-top: 12px;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
@ -64,12 +65,17 @@
} }
.loadmask > .brendpanel .circle { .loadmask > .brendpanel .circle {
vertical-align: middle;
width: 28px; width: 28px;
height: 28px; height: 28px;
border-radius: 14px; border-radius: 14px;
margin: 4px 10px; margin: 0 16px;
background: rgba(255, 255, 255, 0.2); margin-bottom: 10px;
align-self: flex-end;
background: rgba(255, 255, 255, 0.3);
}
.loadmask > .brendpanel.android .circle {
margin-bottom: 12px;
} }
.loadmask > .placeholder { .loadmask > .placeholder {
@ -119,7 +125,7 @@
</style> </style>
</head> </head>
<body> <body>
<div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="circle"></div><div class="loading-logo"><img src="../../common/mobile/resources/img/header/header-logo.png"></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div> <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="circle"></div><div class="loading-logo"><img src=""></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
<script type="text/javascript"> <script type="text/javascript">
function getUrlParams() { function getUrlParams() {
@ -146,7 +152,11 @@
var params = getUrlParams(), var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0], lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null; logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
logoOO = null;
if (!logo) {
logoOO = /Android/.test(navigator.userAgent) ? "../../common/mobile/resources/img/header/header-logo-android.png" : "../../common/mobile/resources/img/header/header-logo-ios.png";
}
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
@ -160,6 +170,7 @@
var elem = document.querySelector('.loading-logo img'); var elem = document.querySelector('.loading-logo img');
if (elem) { if (elem) {
logo && (elem.setAttribute('src', logo)); logo && (elem.setAttribute('src', logo));
logoOO && (elem.setAttribute('src', logoOO));
elem.style.opacity = 1; elem.style.opacity = 1;
} }
var placeholder = document.getElementsByClassName('placeholder')[0]; var placeholder = document.getElementsByClassName('placeholder')[0];

View file

@ -45,7 +45,7 @@
.loadmask > .brendpanel > div { .loadmask > .brendpanel > div {
display: flex; display: flex;
align-items: center; align-items: flex-start;
height: 100%; height: 100%;
} }
@ -53,6 +53,7 @@
max-width: 200px; max-width: 200px;
height: 20px; height: 20px;
margin: 0 auto; margin: 0 auto;
margin-top: 12px;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
@ -63,12 +64,17 @@
} }
.loadmask > .brendpanel .circle { .loadmask > .brendpanel .circle {
vertical-align: middle;
width: 28px; width: 28px;
height: 28px; height: 28px;
border-radius: 14px; border-radius: 14px;
margin: 4px 10px; margin: 0 16px;
background: rgba(255, 255, 255, 0.2); margin-bottom: 10px;
align-self: flex-end;
background: rgba(255, 255, 255, 0.3);
}
.loadmask > .brendpanel.android .circle {
margin-bottom: 12px;
} }
.loadmask > .placeholder { .loadmask > .placeholder {
@ -118,7 +124,7 @@
</style> </style>
</head> </head>
<body> <body>
<div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="circle"></div><div class="loading-logo"><img src="../../../apps/documenteditor/mobile/resources/img/header/header-logo.png"></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div> <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="circle"></div><div class="loading-logo"><img src=""></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
<script type="text/javascript"> <script type="text/javascript">
var ua = navigator.userAgent; var ua = navigator.userAgent;
@ -158,26 +164,31 @@
var params = getUrlParams(), var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0], lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null; logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
logoOO = null;
if (!logo) {
logoOO = /Android/.test(navigator.userAgent) ? "../../common/mobile/resources/img/header/header-logo-android.png" : "../../common/mobile/resources/img/header/header-logo-ios.png";
}
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
var brendpanel = document.getElementsByClassName('brendpanel')[0]; var brendpanel = document.getElementsByClassName('brendpanel')[0];
if (brendpanel) { if (brendpanel) {
if (/Android/.test(navigator.userAgent)) { if (/Android/.test(navigator.userAgent)) {
brendpanel.classList.add('android'); brendpanel.classList.add('android');
} }
brendpanel.classList.add('visible'); brendpanel.classList.add('visible');
var elem = document.querySelector('.loading-logo img'); var elem = document.querySelector('.loading-logo img');
if (elem) { if (elem) {
logo && (elem.setAttribute('src', logo)); logo && (elem.setAttribute('src', logo));
logoOO && (elem.setAttribute('src', logoOO));
elem.style.opacity = 1; elem.style.opacity = 1;
} }
var placeholder = document.getElementsByClassName('placeholder')[0]; var placeholder = document.getElementsByClassName('placeholder')[0];
if (placeholder && /Android/.test(navigator.userAgent)) { if (placeholder && /Android/.test(navigator.userAgent)) {
placeholder.classList.add('android'); placeholder.classList.add('android');
} }
} }
window.requireTimeourError = function(){ window.requireTimeourError = function(){