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

Merge branch 'hotfix/v6.4.1' into fix/merge-hotfix

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-30 17:38:38 +03:00
parent 8bf0d510c1 35e4581405
commit 2b6807a5cf
9 changed files with 188 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/lib/controller/Themes.js
View file

@ -257,7 +257,13 @@ define([
!classname.startsWith('theme-type-') && themes_map[classname] ) !classname.startsWith('theme-type-') && themes_map[classname] )
{ {
theme_name = classname; theme_name = classname;
Common.localStorage.setItem('ui-theme-id', theme_name); // Common.localStorage.setItem('ui-theme-id', theme_name);
var theme_obj = {
id: theme_name,
type: themes_map[theme_name].type
};
Common.localStorage.setItem('ui-theme', JSON.stringify(theme_obj));
} }
}); });
} }

6
apps/common/main/lib/util/htmlutils.js
View file

@ -72,14 +72,14 @@ if ( !!params.uitheme && checkLocalStorage && !localStorage.getItem("ui-theme-id
if ( params.uitheme == 'default-light' ) if ( params.uitheme == 'default-light' )
params.uitheme = 'theme-classic-light'; params.uitheme = 'theme-classic-light';
localStorage.setItem("ui-theme-id", params.uitheme); localStorage.removeItem("ui-theme");
} }
var ui_theme_name = checkLocalStorage ? localStorage.getItem("ui-theme-id") : undefined; var ui_theme_name = checkLocalStorage && localStorage.getItem("ui-theme-id") ? localStorage.getItem("ui-theme-id") : params.uitheme;
if ( !ui_theme_name ) { if ( !ui_theme_name ) {
if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) { if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
ui_theme_name = 'theme-dark'; ui_theme_name = 'theme-dark';
checkLocalStorage && localStorage.setItem("ui-theme-id", ui_theme_name); checkLocalStorage && localStorage.removeItem("ui-theme");
} }
} }
if ( !!ui_theme_name ) { if ( !!ui_theme_name ) {

1
apps/common/main/resources/less/spinner.less
View file

@ -39,6 +39,7 @@
.spinner-buttons { .spinner-buttons {
position: absolute; position: absolute;
top: 0; top: 0;
right: 1px;
right: @scaled-one-px-value; right: @scaled-one-px-value;
border-top: @scaled-one-px-value-ie solid transparent; border-top: @scaled-one-px-value-ie solid transparent;
border-top: @scaled-one-px-value solid transparent; border-top: @scaled-one-px-value solid transparent;

45
apps/documenteditor/main/index_loader.html
View file

@ -10,6 +10,10 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -53,6 +57,12 @@
font-size: 16px; font-size: 16px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -99,8 +109,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -109,8 +119,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; }
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -119,9 +129,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -130,9 +140,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -141,19 +151,19 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #fff; top:0; opacity:0; } 25% { background: #fff; top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
@ -254,6 +264,7 @@
<!-- debug end --> <!-- debug end -->
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<div id="viewport"></div> <div id="viewport"></div>
<script src="../../../vendor/svg-injector/svg-injector.min.js"></script> <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>

49
apps/documenteditor/main/index_loader.html.deploy
View file

@ -11,6 +11,10 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -61,6 +65,14 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -111,8 +123,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -122,8 +134,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -133,9 +145,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -145,9 +157,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -157,10 +169,10 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -168,10 +180,10 @@
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -275,6 +287,7 @@
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<script> <script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){

46
apps/presentationeditor/main/index_loader.html
View file

@ -9,6 +9,9 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -52,6 +55,12 @@
font-size: 16px; font-size: 16px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -98,8 +107,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -108,8 +117,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -118,9 +127,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -129,9 +138,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -140,20 +149,20 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -245,6 +254,7 @@
<!-- debug end --> <!-- debug end -->
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<div id="viewport"></div> <div id="viewport"></div>
<script src="../../../vendor/svg-injector/svg-injector.min.js"></script> <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>

49
apps/presentationeditor/main/index_loader.html.deploy
View file

@ -11,6 +11,10 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -61,6 +65,14 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -111,8 +123,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -122,8 +134,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -133,9 +145,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -145,9 +157,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -157,10 +169,10 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -168,10 +180,10 @@
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -275,6 +287,7 @@
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<script> <script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){

47
apps/spreadsheeteditor/main/index_loader.html
View file

@ -8,6 +8,9 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -51,6 +54,12 @@
font-size: 16px; font-size: 16px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -97,8 +106,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -107,8 +116,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -117,9 +126,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -128,9 +137,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -139,20 +148,20 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -246,7 +255,7 @@
<!-- debug end --> <!-- debug end -->
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<div id="viewport"></div> <div id="viewport"></div>
<script src="../../../vendor/svg-injector/svg-injector.min.js"></script> <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>

49
apps/spreadsheeteditor/main/index_loader.html.deploy
View file

@ -10,6 +10,10 @@
<!-- splash --> <!-- splash -->
<style type="text/css"> <style type="text/css">
.theme-dark {
--romb-start-color: #555;
}
.loadmask { .loadmask {
left: 0; left: 0;
top: 0; top: 0;
@ -60,6 +64,14 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.theme-dark .loadmask {
background-color: #555;
}
.theme-dark .loader-page-text {
color: rgba(255, 255, 255, 0.8);
}
.romb { .romb {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -110,8 +122,8 @@
@-webkit-keyframes red { @-webkit-keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0;} 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -121,8 +133,8 @@
@keyframes red { @keyframes red {
0% { top:120px; background: #de7a59; } 0% { top:120px; background: #de7a59; }
10% { top:120px; background: #F2CBBF; } 10% { top:120px; background: #F2CBBF; }
14% { background: #f4f4f4; top:120px; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:120px; }
15% { background: #f4f4f4; top:0; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0;}
20% { background: #E6E4E4; } 20% { background: #E6E4E4; }
30% { background: #D2D2D2; } 30% { background: #D2D2D2; }
40% { top:120px; } 40% { top:120px; }
@ -132,9 +144,9 @@
@-webkit-keyframes green { @-webkit-keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -144,9 +156,9 @@
@keyframes green { @keyframes green {
0% { top:110px; background: #a1cb5c; opacity:1; } 0% { top:110px; background: #a1cb5c; opacity:1; }
10% { top:110px; background: #CBE0AC; opacity:1; } 10% { top:110px; background: #CBE0AC; opacity:1; }
14% { background: #f4f4f4; top:110px; opacity:1; } 14% { background: #f4f4f4; top:110px; background: var(--romb-start-color,#f4f4f4); opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; top:0; background: var(--romb-start-color,#f4f4f4); opacity:0; }
25% { background: #EFEFEF; top:0; opacity:1; } 25% { background: #EFEFEF; top:0; opacity:1; }
30% { background:#E6E4E4; } 30% { background:#E6E4E4; }
70% { top:110px; } 70% { top:110px; }
@ -156,10 +168,10 @@
@-webkit-keyframes blue { @-webkit-keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -167,10 +179,10 @@
@keyframes blue { @keyframes blue {
0% { top:100px; background: #55bce6; opacity:1; } 0% { top:100px; background: #55bce6; opacity:1; }
10% { top:100px; background: #BFE8F8; opacity:1; } 10% { top:100px; background: #BFE8F8; opacity:1; }
14% { background: #f4f4f4; top:100px; opacity:1; } 14% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:100px; opacity:1; }
15% { background: #f4f4f4; top:0; opacity:1; } 15% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:1; }
20% { background: #f4f4f4; top:0; opacity:0; } 20% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
25% { background: #f4f4f4; top:0; opacity:0; } 25% { background: #f4f4f4; background: var(--romb-start-color,#f4f4f4); top:0; opacity:0; }
45% { background: #EFEFEF; top:0; opacity:0.2; } 45% { background: #EFEFEF; top:0; opacity:0.2; }
100% { top:100px; background: #55bce6; } 100% { top:100px; background: #55bce6; }
} }
@ -275,6 +287,7 @@
<link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/spreadsheeteditor/main/resources/css/app.css">
</head> </head>
<body> <body>
<script src="../../common/main/lib/util/htmlutils.js"></script>
<script> <script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){
var reqerr; var reqerr;