Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'feature/new-loading-images' into develop

Browse source
This commit is contained in:
Maxim Kadushkin 2020-11-06 10:04:33 +03:00
parent 878aea27b2 eaea4059a7
commit c713710592
5 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/LoadMask.js
View file

@ -128,10 +128,6 @@ define([
ownerEl.append(maskeEl); ownerEl.append(maskeEl);
ownerEl.append(loaderEl); ownerEl.append(loaderEl);
loaderEl.css({
top : Math.round(ownerEl.height() / 2 - (loaderEl.height() + parseInt(loaderEl.css('padding-top')) + parseInt(loaderEl.css('padding-bottom'))) / 2) + 'px',
left: Math.round(ownerEl.width() / 2 - (loaderEl.width() + parseInt(loaderEl.css('padding-left')) + parseInt(loaderEl.css('padding-right'))) / 2) + 'px'
});
// if (ownerEl.height()<1 || ownerEl.width()<1) // if (ownerEl.height()<1 || ownerEl.width()<1)
// loaderEl.css({visibility: 'hidden'}); // loaderEl.css({visibility: 'hidden'});

5
apps/common/main/resources/img/load-mask/loading-small.svg Normal file
View file

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="20px" viewBox="0 0 20 20">
<circle cx="10" cy="10" fill="none" stroke="#444" stroke-width="1.5" r="7.25" stroke-dasharray="160%, 40%">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 10 10;360 10 10" keyTimes="0;1"/>
</circle>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 393 B

BIN
apps/common/main/resources/img/load-mask/loading.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.4 KiB

5
apps/common/main/resources/img/load-mask/loading.svg Normal file
View file

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="28px" height="28px" viewBox="0 0 28 28">
<circle cx="14" cy="14" fill="none" stroke="#fff" stroke-width="1.5" r="10.25" stroke-dasharray="160%, 40%">
<animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 14 14;360 14 14" keyTimes="0;1"/>
</circle>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 394 B

43
apps/common/main/resources/less/loadmask.less
View file

@ -1,4 +1,8 @@
@loadmask-zindex: @zindex-modal + 100; @loadmask-zindex: @zindex-modal + 100;
@loadmask-image-height: 28px;
@loadmask-image-width: 28px;
@loadmask-small-image-height: 20px;
@loadmask-small-image-width: 20px;
.asc-loadmask { .asc-loadmask {
position: absolute; position: absolute;
@ -14,30 +18,53 @@
.asc-loadmask-body { .asc-loadmask-body {
position: absolute; position: absolute;
z-index: @loadmask-zindex + 1; z-index: @loadmask-zindex + 1;
padding: 20px; padding: 24px;
line-height: 33px; line-height: @loadmask-image-height;
border: none; border: none;
background-image: none; background-image: none;
background-color: fade(darken(@gray-deep, 15%), 70%); background-color: fade(@black, 90%);
color: @gray-light; color: @gray-light;
.border-radius(@border-radius-large); .border-radius(@border-radius-large);
left: 50%;
top: 50%;
transform: translate(-50%);
& > div { & > div {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
.asc-loadmask-image { .asc-loadmask-image {
background-image: ~"url(@{common-image-const-path}/load-mask/loading.gif)"; background-image: ~"url(@{common-image-const-path}/load-mask/loading.svg)";
height: 33px; height: @loadmask-image-height;
width: 33px; width: @loadmask-image-width;
float: left; float: left;
margin-left: 20px; margin-left: 8px;
} }
.asc-loadmask-title { .asc-loadmask-title {
.fontsize(@font-size-large); .fontsize(@font-size-large);
margin: 0 20px; margin: 0 8px 0 12px;
}
.left-panel & {
line-height: @loadmask-small-image-height;
background-color: transparent;
color: @gray-deep;
padding: 8px;
top: 78px;
transform: translate(-50%, 0);
.asc-loadmask-image {
background-image: ~"url(@{common-image-const-path}/load-mask/loading-small.svg)";
height: @loadmask-small-image-height;
width: @loadmask-small-image-width;
}
.asc-loadmask-title {
margin: 0 8px;
}
} }
} }