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

[mobile] Add logo

Browse source
This commit is contained in:
Julia Svinareva 2020-01-16 11:08:38 +03:00 committed by Alexey Golubev
parent 90265d873a
commit c754b4dd53
36 changed files with 280 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -773,6 +773,11 @@ define([
me.hidePreloader(); me.hidePreloader();
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} }
if (me.appOptions.canBrandingExt && (me.editorConfig.customization && (me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))) {
$('#editor-navbar #navbar-logo').hide();
$('#editor-navbar').removeClass('logo-navbar');
$('#editor_sdk').removeClass('with-logo');
}
}, },
applyModeCommonElements: function() { applyModeCommonElements: function() {

2
apps/documenteditor/mobile/app/template/Editor.template
View file

@ -2,7 +2,7 @@
<div class="view view-main"> <div class="view view-main">
<div class="pages navbar-through"> <div class="pages navbar-through">
<div data-page="index" class="page"> <div data-page="index" class="page">
<div id="editor-container" class="page-content no-fastclick"><div id="editor_sdk" class="no-fastclick"></div></div> <div id="editor-container" class="page-content no-fastclick"><div id="editor_sdk" class="no-fastclick with-logo"></div></div>
</div> </div>
</div> </div>
</div> </div>

3
apps/documenteditor/mobile/app/template/Toolbar.template
View file

@ -1,4 +1,5 @@
<div class="navbar" id="editor-navbar"> <div class="navbar logo-navbar" id="editor-navbar">
<div id="navbar-logo" style="padding-top: 12px;display: flex;justify-content: center;"><i class="icon icon-logo"></i></div>
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left"> <div class="left">
<a id="document-back" href="#" class="link" style="min-width: 22px; display: none;"> <a id="document-back" href="#" class="link" style="min-width: 22px; display: none;">

5
apps/documenteditor/mobile/app/view/Search.js
View file

@ -155,6 +155,11 @@ define([
searchBar = $$('.searchbar.document'); searchBar = $$('.searchbar.document');
if ($('.logo-navbar').length > 0) {
var top = Common.SharedSettings.get('android') ? '80px' : '68px';
$('.navbar-through .page > .searchbar').css('top', top);
}
_.defer(function() { _.defer(function() {
uiApp.showNavbar(searchBar); uiApp.showNavbar(searchBar);

14
apps/documenteditor/mobile/index.html
View file

@ -30,7 +30,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -40,7 +40,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #446995; background: #446995;
} }
@ -76,7 +76,11 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 56px; padding-top: 65px;
}
.loadmask > .placeholder.android {
padding-top: 75px;
} }
.loadmask > .placeholder > .line { .loadmask > .placeholder > .line {
@ -158,6 +162,10 @@
logo && (elem.setAttribute('src', logo)); logo && (elem.setAttribute('src', logo));
elem.style.opacity = 1; elem.style.opacity = 1;
} }
var placeholder = document.getElementsByClassName('placeholder')[0];
if (placeholder && /Android/.test(navigator.userAgent)) {
placeholder.classList.add('android');
}
} }
</script> </script>

14
apps/documenteditor/mobile/index.html.deploy
View file

@ -29,7 +29,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -39,7 +39,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #446995; background: #446995;
} }
@ -75,7 +75,11 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 56px; padding-top: 65px;
}
.loadmask > .placeholder.android {
padding-top: 75px;
} }
.loadmask > .placeholder > .line { .loadmask > .placeholder > .line {
@ -170,6 +174,10 @@
logo && (elem.setAttribute('src', logo)); logo && (elem.setAttribute('src', logo));
elem.style.opacity = 1; elem.style.opacity = 1;
} }
var placeholder = document.getElementsByClassName('placeholder')[0];
if (placeholder && /Android/.test(navigator.userAgent)) {
placeholder.classList.add('android');
}
} }
window.requireTimeourError = function(){ window.requireTimeourError = function(){

15
apps/documenteditor/mobile/resources/css/app-ios.css
View file

File diff suppressed because one or more lines are too long

15
apps/documenteditor/mobile/resources/css/app-material.css
View file

File diff suppressed because one or more lines are too long

11
apps/documenteditor/mobile/resources/less/app-ios.less
View file

@ -63,6 +63,14 @@ input, textarea {
} }
} }
.logo-navbar {
height: 68px;
.navbar-inner {
top: 24px;
height: 44px;
}
}
@import url('../../../../common/mobile/resources/less/_mixins.less'); @import url('../../../../common/mobile/resources/less/_mixins.less');
@import url('../../../../common/mobile/resources/less/ios/_container.less'); @import url('../../../../common/mobile/resources/less/ios/_container.less');
@import url('../../../../common/mobile/resources/less/ios/_dataview.less'); @import url('../../../../common/mobile/resources/less/ios/_dataview.less');
@ -94,6 +102,9 @@ input, textarea {
overflow: hidden; overflow: hidden;
.transition(300ms); .transition(300ms);
} }
#editor_sdk.with-logo {
top: 68px;
}
// Add Container // Add Container

11
apps/documenteditor/mobile/resources/less/app-material.less
View file

@ -81,6 +81,14 @@ input, textarea {
padding: 0 13px; padding: 0 13px;
} }
.logo-navbar {
height: 80px;
.navbar-inner {
top: 24px;
height: 56px;
}
}
// Top offset // Top offset
#editor_sdk { #editor_sdk {
@ -93,6 +101,9 @@ input, textarea {
overflow: hidden; overflow: hidden;
.transition(300ms); .transition(300ms);
} }
#editor_sdk.with-logo {
top: 80px;
}
// Add Container // Add Container

5
apps/documenteditor/mobile/resources/less/ios/_icons.less
View file

File diff suppressed because one or more lines are too long

5
apps/documenteditor/mobile/resources/less/material/_icons.less
View file

File diff suppressed because one or more lines are too long

6
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -699,6 +699,12 @@ define([
me.hidePreloader(); me.hidePreloader();
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} }
if (me.appOptions.canBrandingExt && (me.editorConfig.customization && (me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))) {
$('#editor-navbar #navbar-logo').hide();
$('#editor-navbar').removeClass('logo-navbar');
$('#editor_sdk').removeClass('with-logo');
}
}, },
applyModeCommonElements: function() { applyModeCommonElements: function() {

2
apps/presentationeditor/mobile/app/template/Editor.template
View file

@ -3,7 +3,7 @@
<div class="view view-main"> <div class="view view-main">
<div class="pages navbar-through"> <div class="pages navbar-through">
<div data-page="index" class="page"> <div data-page="index" class="page">
<div id="editor_sdk" class="page-content no-fastclick"></div> <div id="editor_sdk" class="page-content no-fastclick with-logo"></div>
</div> </div>
</div> </div>
</div> </div>

3
apps/presentationeditor/mobile/app/template/Toolbar.template
View file

@ -1,4 +1,5 @@
<div class="navbar" id="editor-navbar"> <div class="navbar logo-navbar" id="editor-navbar">
<div id="navbar-logo" style="padding-top: 12px;display: flex;justify-content: center;"><i class="icon icon-logo"></i></div>
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left"> <div class="left">
<a id="document-back" href="#" class="link" style="min-width: 22px; display: none;"> <a id="document-back" href="#" class="link" style="min-width: 22px; display: none;">

5
apps/presentationeditor/mobile/app/view/Search.js
View file

@ -155,6 +155,11 @@ define([
searchBar = $$('.searchbar.document'); searchBar = $$('.searchbar.document');
if ($('.logo-navbar').length > 0) {
var top = Common.SharedSettings.get('android') ? '80px' : '68px';
$('.navbar-through .page > .searchbar').css('top', top);
}
_.defer(function() { _.defer(function() {
uiApp.showNavbar(searchBar); uiApp.showNavbar(searchBar);

8
apps/presentationeditor/mobile/index.html
View file

@ -30,7 +30,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -40,7 +40,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #aa5252; background: #aa5252;
} }
@ -76,11 +76,11 @@
background: #f5f5f5; background: #f5f5f5;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 56px; padding-top: 40px;
} }
.loadmask > .placeholder.android { .loadmask > .placeholder.android {
padding-top: 70px; padding-top: 50px;
} }
.loadmask > .placeholder .slide-h { .loadmask > .placeholder .slide-h {

8
apps/presentationeditor/mobile/index.html.deploy
View file

@ -29,7 +29,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -39,7 +39,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #aa5252; background: #aa5252;
} }
@ -75,11 +75,11 @@
background: #f5f5f5; background: #f5f5f5;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 56px; padding-top: 40px;
} }
.loadmask > .placeholder.android { .loadmask > .placeholder.android {
padding-top: 70px; padding-top: 50px;
} }
.loadmask > .placeholder .slide-h { .loadmask > .placeholder .slide-h {

15
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

File diff suppressed because one or more lines are too long

15
apps/presentationeditor/mobile/resources/css/app-material.css
View file

File diff suppressed because one or more lines are too long

12
apps/presentationeditor/mobile/resources/less/app-ios.less
View file

@ -63,6 +63,14 @@ input, textarea {
} }
} }
.logo-navbar {
height: 68px;
.navbar-inner {
top: 24px;
height: 44px;
}
}
@import url('../../../../common/mobile/resources/less/_mixins.less'); @import url('../../../../common/mobile/resources/less/_mixins.less');
@import url('../../../../common/mobile/resources/less/ios/_container.less'); @import url('../../../../common/mobile/resources/less/ios/_container.less');
@import url('../../../../common/mobile/resources/less/ios/_dataview.less'); @import url('../../../../common/mobile/resources/less/ios/_dataview.less');
@ -94,6 +102,10 @@ input, textarea {
.transition(300ms); .transition(300ms);
} }
#editor_sdk.with-logo {
top: 68px;
}
// Add Container // Add Container
#add-table, #add-table,

12
apps/presentationeditor/mobile/resources/less/app-material.less
View file

@ -72,6 +72,10 @@
overflow: hidden; overflow: hidden;
.transition(300ms); .transition(300ms);
} }
#editor_sdk.with-logo {
top: 80px;
}
// Disable text select // Disable text select
* { * {
@ -94,6 +98,14 @@ input, textarea {
padding: 0 13px; padding: 0 13px;
} }
.logo-navbar {
height: 80px;
.navbar-inner {
top: 24px;
height: 56px;
}
}
// Add Container // Add Container
#add-table, #add-table,

5
apps/presentationeditor/mobile/resources/less/ios/_icons.less
View file

File diff suppressed because one or more lines are too long

5
apps/presentationeditor/mobile/resources/less/material/_icons.less
View file

File diff suppressed because one or more lines are too long

6
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -727,6 +727,12 @@ define([
me.hidePreloader(); me.hidePreloader();
me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
} }
if (me.appOptions.canBrandingExt && (me.editorConfig.customization && (me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))) {
$('#editor-navbar #navbar-logo').hide();
$('#editor-navbar').removeClass('logo-navbar');
$('#editor_sdk').removeClass('with-logo');
}
}, },
applyModeCommonElements: function() { applyModeCommonElements: function() {

2
apps/spreadsheeteditor/mobile/app/template/Editor.template
View file

@ -1,7 +1,7 @@
<div class="views"> <div class="views">
<div class="view view-main"> <div class="view view-main">
<div class="pages navbar-through"> <div class="pages navbar-through">
<div data-page="index" class="page editor flex-horizontal"> <div data-page="index" class="page editor flex-horizontal with-logo">
<div id="editor_sdk" class="page-content no-fastclick"> <div id="editor_sdk" class="page-content no-fastclick">
</div> </div>
</div> </div>

3
apps/spreadsheeteditor/mobile/app/template/Toolbar.template
View file

@ -1,4 +1,5 @@
<div class="navbar" id="editor-navbar"> <div class="navbar logo-navbar" id="editor-navbar">
<div id="navbar-logo" style="padding-top: 12px;display: flex;justify-content: center;"><i class="icon icon-logo"></i></div>
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left"> <div class="left">
<a id="document-back" href="#" class="link" style="min-width: 22px; display: none;"> <a id="document-back" href="#" class="link" style="min-width: 22px; display: none;">

5
apps/spreadsheeteditor/mobile/app/view/Search.js
View file

@ -170,6 +170,11 @@ define([
searchBar = $$('.searchbar.document'); searchBar = $$('.searchbar.document');
if ($('.logo-navbar').length > 0) {
var top = Common.SharedSettings.get('android') ? '110px' : '98px';
$('.navbar-through .page > .searchbar').css('top', top);
}
_.defer(function() { _.defer(function() {
uiApp.showNavbar(searchBar); uiApp.showNavbar(searchBar);

8
apps/spreadsheeteditor/mobile/index.html
View file

@ -31,7 +31,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -41,7 +41,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #40865c; background: #40865c;
} }
@ -80,11 +80,11 @@
font-size: 0; font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 43px; padding-top: 67px;
} }
.loadmask > .placeholder.android { .loadmask > .placeholder.android {
padding-top: 56px; padding-top: 79px;
} }
.loadmask > .placeholder > .columns { .loadmask > .placeholder > .columns {

8
apps/spreadsheeteditor/mobile/index.html.deploy
View file

@ -27,7 +27,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
position: absolute; position: absolute;
height: 44px; height: 68px;
background-color: #e2e2e2; background-color: #e2e2e2;
opacity: 0; opacity: 0;
} }
@ -37,7 +37,7 @@
} }
.loadmask > .brendpanel.android { .loadmask > .brendpanel.android {
height: 56px; height: 80px;
background: #40865c; background: #40865c;
} }
@ -76,11 +76,11 @@
font-size: 0; font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 43px; padding-top: 67px;
} }
.loadmask > .placeholder.android { .loadmask > .placeholder.android {
padding-top: 56px; padding-top: 79px;
} }
.loadmask > .placeholder > .columns { .loadmask > .placeholder > .columns {

18
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

File diff suppressed because one or more lines are too long

18
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

File diff suppressed because one or more lines are too long

14
apps/spreadsheeteditor/mobile/resources/less/app-ios.less
View file

@ -83,6 +83,20 @@ input, textarea {
@import url('statusbar'); @import url('statusbar');
@import url('ios/_search.less'); @import url('ios/_search.less');
.logo-navbar {
height: 68px;
.navbar-inner {
top: 24px;
height: 44px;
}
}
.navbar-through > .page.editor.with-logo {
padding-top: 68px;
}
.navbar-hidden + .navbar-through > .page.editor.with-logo {
padding-top: 0;
}
.label-switch input[type="checkbox"]:checked + .checkbox { .label-switch input[type="checkbox"]:checked + .checkbox {
background: @themeColor; background: @themeColor;
} }

15
apps/spreadsheeteditor/mobile/resources/less/app-material.less
View file

@ -86,6 +86,21 @@ input, textarea {
padding: 0 13px; padding: 0 13px;
} }
.logo-navbar {
height: 80px;
.navbar-inner {
top: 24px;
height: 56px;
}
}
.navbar-through > .page.editor.with-logo {
padding-top: 80px;
}
.navbar-hidden + .navbar-through > .page.editor.with-logo {
padding-top: 0;
}
// Add Container // Add Container
#add-table, #add-table,

5
apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
View file

File diff suppressed because one or more lines are too long

5
apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
View file

File diff suppressed because one or more lines are too long