Merge pull request #1519 from ONLYOFFICE/feature/fix-bug-reactjs

Feature/fix bug reactjs

apps/common/mobile/resources/less/common.less

@@ -909,15 +909,6 @@ input[type="number"]::-webkit-inner-spin-button {
                     }
                 }
             }
-            .function-info {
-                p {
-                    color: @text-secondary;
-                }
-                h3 {
-                    font-weight: 500;
-                    color: @text-normal;
-                }
-            }
         }
     }
 }

apps/spreadsheeteditor/mobile/src/less/app.less

@@ -54,13 +54,21 @@
     //--f7-page-content-extra-padding-top: 37px;
 }
 
-.function-info {
-    padding: 0 15px;
-}
 .page-function-info {
     &.page-content, .page-content {
         background-color: @background-primary;
     }
+
+    .function-info {
+        padding: 0 15px;
+        h3 {
+            color: @text-normal;
+        }
+    
+        p {
+            color: @text-secondary;
+        }
+    }
 }
 
 .username-tip.active {

apps/spreadsheeteditor/mobile/src/less/statusbar.less

@@ -61,14 +61,18 @@
         }
     }
 
+    .tab {
         i.icon {
-        width: 22px;
-        height: 22px;
-        &.icon-plus {
+            width: 18px;
+            height: 18px;
+            &.icon-plus.bold{
+                
                 // @source: '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>';
                 // .encoded-svg-mask(@source, @fontColor);
                 // background-image: none;
-            .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>')
+                .encoded-svg-mask('<svg viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M16 9.98658H9.98658V16H8.01342V9.98658H2V8.01342H8.01342V2H9.98658V8.01342H16V9.98658Z" fill="black"/></svg>')
             }
         }
     }
+    
+}

apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx

@@ -73,7 +73,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
                 {isEdit &&
                     <div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}>
                         <Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook  ? ' disabled' : ''}`} onClick={props.onAddTabClicked}>
-                            <Icon className="icon icon-plus" />
+                            <Icon className={`icon icon-plus ${isAndroid ? 'bold' : ''}`}/>
                         </Link>
                     </div>
                 }

apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx

@@ -44,6 +44,7 @@ const EditCell = props => {
                     onFontSize: props.onFontSize,
                     onFontClick: props.onFontClick
                 }}/>
+            </List>
                 {!wsProps.FormatCells && 
                 <>
                     <List>
@@ -128,7 +129,6 @@ const EditCell = props => {
                         </Swiper>
                     ) : null}
                 </>}    
-            </List>    
         </Fragment>
     )
 };