diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index 22702f8bc..15fffff40 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -1,36 +1,36 @@
- +
- +
- - + +
- +
-
+
- - + +
- - - + + +
- +
diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index a20d7e158..b59016d5d 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -4,15 +4,11 @@ .status-label { position: relative; - top: 1px; } #label-pages, #label-zoom { cursor: pointer; } - #label-pages, #label-action { - margin-top: 2px; - } #users-icon,#status-users-count { display: inline-block; @@ -41,11 +37,20 @@ .status-group { display: table-cell; white-space: nowrap; - padding-top: 3px; vertical-align: top; &.dropup { position: static; } + + .status-label.margin-top-large { + margin-top: 6px; + } + + button.margin-top-small, + .margin-top-small > button, + .margin-top-small > .btn-group { + margin-top: 3px; + } } .separator { @@ -53,7 +58,6 @@ &.short { height: 25px; - margin-top: -2px; } &.space { @@ -70,7 +74,8 @@ .cnt-zoom { display: inline-block; - + vertical-align: middle; + margin-top: 4px; .dropdown-menu { min-width: 80px; margin-left: -4px; diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 9231453f0..8df4781e6 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -1,10 +1,10 @@
-
+
- +
- +
- - + +
- +
- - - + + +
- +
diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index c12bf11f7..06767765a 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -4,17 +4,12 @@ .status-label { position: relative; - top: 1px; } #status-label-pages, #status-label-zoom { cursor: pointer; } - #status-label-pages, #status-label-action { - margin-top: 2px; - } - #status-users-icon, #status-users-count { display: inline-block; cursor: pointer; @@ -44,10 +39,19 @@ display: table-cell; white-space: nowrap; vertical-align: top; - padding-top: 3px; &.dropup { position: static; } + + .status-label.margin-top-large { + margin-top: 6px; + } + + button.margin-top-small, + .margin-top-small > button, + .margin-top-small > .btn-group { + margin-top: 3px; + } } .separator { @@ -55,7 +59,6 @@ &.short { height: 25px; - margin-top: -2px; } &.space { @@ -72,7 +75,8 @@ .cnt-zoom { display: inline-block; - + vertical-align: middle; + margin-top: 4px; .dropdown-menu { min-width: 80px; margin-left: -4px; diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 4e885adc4..544c36f48 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -368,7 +368,7 @@ .status-label { font-weight: bold; color: @text-normal; - margin-top: 5px; + margin-top: 6px; width: 100%; text-align: center; }