diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 79ad38996..da2a47368 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -16,6 +16,7 @@ position: relative; overflow: hidden; border-left: 1px solid @gray-dark; + line-height: 15px; } .settings-panel { diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index 37347ad5a..7c6898f9b 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -16,6 +16,7 @@ position: relative; overflow: hidden; border-left: 1px solid @gray-dark; + line-height: 15px; } .settings-panel { diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index b77340bb8..e35450eca 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -65,7 +65,7 @@ box-sizing: content-box; } - .loadmask > .sktoolbar ul { + .loadmask ul { margin: 0; padding: 0; white-space: nowrap; @@ -96,10 +96,42 @@ height: 44px; } + .loadmask > .skformula { + height: 24px; + background: #f1f1f1; + } + + .loadmask > .skformula ul { + list-style-type: none; + font-size: 0; + box-sizing: border-box; + border-style: solid; + border-width: 1px; + border-color: #e1e1e1 transparent; + } + + .loadmask > .skformula li { + display: inline-block; + box-sizing: border-box; + height: 19px; + width: 100%; + margin-left: 20px; + background: #f7f7f7; + border-style: solid; + border-width: 1px; + border-color: transparent #e1e1e1; + } + + .loadmask > .skformula li:first-child { + width: 100px; + margin-left: 0; + } + .loadmask > .placeholder { background: #fbfbfb; width: 100%; height: 100%; + font-size: 0; border: 1px solid #dfdfdf; white-space: nowrap; @@ -122,7 +154,7 @@ .loadmask > .placeholder > .columns:first-child { background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background-size: 20px 20px; - width: 35px; + width: 25px; } @keyframes flickerAnimation { @@ -204,6 +236,7 @@ +
@@ -214,6 +247,9 @@
+
+
+
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 9a2b64c74..b4ed29dc3 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -67,7 +67,7 @@ box-sizing: content-box; } - .loadmask > .sktoolbar ul { + .loadmask ul { margin: 0; padding: 0; white-space: nowrap; @@ -98,10 +98,42 @@ height: 44px; } + .loadmask>.skformula { + height: 24px; + background: #f1f1f1; + } + + .loadmask>.skformula ul { + list-style-type: none; + font-size: 0; + box-sizing: border-box; + border-style: solid; + border-width: 1px; + border-color: #e1e1e1 transparent; + } + + .loadmask>.skformula li { + display: inline-block; + box-sizing: border-box; + height: 19px; + width: 100%; + margin-left: 20px; + background: #f7f7f7; + border-style: solid; + border-width: 1px; + border-color: transparent #e1e1e1; + } + + .loadmask>.skformula li:first-child { + width: 100px; + margin-left: 0; + } + .loadmask > .placeholder { background: #fbfbfb; width: 100%; height: 100%; + font-size: 0; border: 1px solid #dfdfdf; white-space: nowrap; @@ -124,7 +156,7 @@ .loadmask > .placeholder > .columns:first-child { background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background-size: 20px 20px; - width: 35px; + width: 25px; } @keyframes flickerAnimation { @@ -226,6 +258,9 @@
+
+ +
diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 53f18b635..a289d44a8 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -16,6 +16,7 @@ position: relative; overflow: hidden; border-left: 1px solid @gray-dark; + line-height: 15px; } .settings-panel {