From e42c7b2bfd2202f4fffcb02ab0d2d25136f5b17b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 May 2019 13:55:06 +0300 Subject: [PATCH 1/3] [SSE mobile] Fix Bug 41677 (#178) --- apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js index eb052fa1a..55e365117 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -105,8 +105,6 @@ define([ // Handlers onInsertImage: function (args) { - SSE.getController('AddContainer').hideModal(); - if ( !args.islocal ) { var me = this; var url = args.url; @@ -124,6 +122,7 @@ define([ uiApp.alert(me.textEmptyImgUrl); } } else { + SSE.getController('AddContainer').hideModal(); this.api.asc_addImage(); } }, From a078c0ccd69abb95c8d6a9a6dbfc5c86ab50551c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 5 Jun 2019 12:04:35 +0300 Subject: [PATCH 2/3] Change style for toolbar and status bar --- apps/common/main/resources/less/toolbar.less | 6 +++++- apps/spreadsheeteditor/main/resources/less/statusbar.less | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index fc5f96878..4960bf58a 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -301,7 +301,7 @@ .style-off-tabs { .toolbar { - @underscore_height: 2px; + @underscore_height: 3px; .tabs, .extra { background-color: transparent; @@ -334,6 +334,10 @@ opacity: 1; bottom: 0; } + + > a { + font-weight: bold; + } } &:hover:not(.active) { diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index bbee52d60..da2c0b79d 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -188,8 +188,9 @@ background-color: @body-bg; outline: none; - box-shadow: 0px 3px 0 @primary inset; + box-shadow: 0px 2px 0 @gray-deep inset; border-top-width: 0; + font-weight: bold; } } From 4a6f8b4950e67842387059189babed3ff4dc8e70 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 5 Jun 2019 13:47:23 +0300 Subject: [PATCH 3/3] Fix active toolbar tabs --- apps/common/main/resources/less/toolbar.less | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 4960bf58a..c6634e8eb 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -329,15 +329,12 @@ &.active { background-color: transparent; + font-weight: bold; &:after { opacity: 1; bottom: 0; } - - > a { - font-weight: bold; - } } &:hover:not(.active) { @@ -347,6 +344,17 @@ > a { color: @gray-deep; + + &::after { + display:block; + content:attr(data-title); + font-weight:bold; + height:1px; + color:transparent; + overflow:hidden; + visibility:hidden; + margin-bottom:-1px; + } } } }