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

Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile

Browse source 
# Conflicts:
#	apps/spreadsheeteditor/mobile/resources/css/app-ios.css
#	apps/spreadsheeteditor/mobile/resources/css/app-material.css
This commit is contained in:
Alexander Yuzhin 2017-01-18 17:43:55 +03:00
parent 03c65edcc9 9345ca25c6
commit bf03cc98de
7 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -167,7 +167,7 @@ define([
items = me._initMenu(me.api.asc_getCellInfo()); items = me._initMenu(me.api.asc_getCellInfo());
me.view.showMenu(items, posX + 200, posY + 100); me.view.showMenu(items, posX, posY);
}, },
onApiHidePopMenu: function() { onApiHidePopMenu: function() {

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
apps/spreadsheeteditor/mobile/resources/less/app-common.less
View file

@ -1,5 +1,6 @@
@appStatusbarHeight: 30px; @appStatusbarHeight: 30px;
@baseZIndex: 10;
.navbar-hidden + .navbar-through { .navbar-hidden + .navbar-through {
> .page.editor { > .page.editor {

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
apps/spreadsheeteditor/mobile/resources/less/statusbar.less
View file

@ -6,6 +6,7 @@
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
background-color: @gray-light; background-color: @gray-light;
z-index: @baseZIndex + 1;
* { * {
box-sizing: border-box; box-sizing: border-box;