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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2021-02-13 19:00:14 +03:00
parent a1bb6737dc c7e6a7a316
commit b84b3ccbdd
6 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/main/app.js
View file

@ -207,7 +207,6 @@ require([
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Themes' ,'common/main/lib/controller/Themes'
,'common/main/lib/controller/Desktop' ,'common/main/lib/controller/Desktop'
,'../../../../sdkjs/common/device_scale'
], function() { ], function() {
app.start(); app.start();
}); });

1
apps/documenteditor/main/index.html.deploy
View file

@ -305,6 +305,7 @@
<inline src="resources/img/recent-file.svg" /> <inline src="resources/img/recent-file.svg" />
<inline src="resources/img/file-template.svg" /> <inline src="resources/img/file-template.svg" />
<inline src="resources/img/blank.svg" /> <inline src="resources/img/blank.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body> </body>

1
apps/presentationeditor/main/app.js
View file

@ -191,7 +191,6 @@ require([
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Themes' ,'common/main/lib/controller/Themes'
,'common/main/lib/controller/Desktop' ,'common/main/lib/controller/Desktop'
,'../../../../sdkjs/common/device_scale'
], function() { ], function() {
app.start(); app.start();
}); });

1
apps/presentationeditor/main/index.html.deploy
View file

@ -360,6 +360,7 @@
<inline src="resources/img/recent-file.svg" /> <inline src="resources/img/recent-file.svg" />
<inline src="resources/img/file-template.svg" /> <inline src="resources/img/file-template.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body> </body>

1
apps/spreadsheeteditor/main/app.js
View file

@ -203,7 +203,6 @@ require([
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Themes' ,'common/main/lib/controller/Themes'
,'common/main/lib/controller/Desktop' ,'common/main/lib/controller/Desktop'
,'../../../../sdkjs/common/device_scale'
], function() { ], function() {
app.start(); app.start();
}); });

1
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -365,6 +365,7 @@
<inline src="resources/img/recent-file.svg" /> <inline src="resources/img/recent-file.svg" />
<inline src="resources/img/file-template.svg" /> <inline src="resources/img/file-template.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body> </body>
</html> </html>