+
diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less
index df197f0b28..c60aa98da5 100644
--- a/apps/spreadsheeteditor/main/resources/less/statusbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less
@@ -1,4 +1,3 @@
-@statusbar-height: var(--statusbar-height, 25px);
@status-scroll-padding-left: 12px;
@statusb-scroll-padding-right: 10px;
@status-scroll-width: calc(2*@x-small-btn-size + @status-scroll-padding-left + @statusb-scroll-padding-right);
@@ -46,7 +45,6 @@
}
}
-
#status-tabs-scroll {
width: @status-scroll-width;
padding: 0 @status-scroll-padding-left 0 @statusb-scroll-padding-right;
@@ -54,7 +52,7 @@
float: left;
.rtl-sheet& {
- padding: calc(@statusbar-height - @x-small-btn-size) @statusb-scroll-padding-right 0 @status-scroll-padding-left;
+ padding: 0 @statusb-scroll-padding-right 0 @status-scroll-padding-left;
float: right;
}
}
@@ -63,10 +61,6 @@
position: absolute;
height: @statusbar-height;
- .separator {
- margin-top: calc(-1*(@statusbar-height - @x-small-btn-size));
- }
-
#status-label-zoom {
cursor: pointer;
text-align: center;
@@ -174,12 +168,10 @@
#status-math-box,
#status-filtered-box {
- padding-top: 6px;
position: absolute;
height: @statusbar-height;
.separator {
position: relative;
- margin-top: -6px;
}
}
@@ -241,7 +233,7 @@
display: inline-block;
.border-radius(0);
padding: 0 10px 0;
- line-height: 24px;
+ line-height: @statusbar-height;
background-color: @background-pane-additional-ie;
background-color: @background-pane-additional;
outline: none;
@@ -418,6 +410,7 @@
.color-tab {
.border-radius(4px);
margin-top: -25px;
+ margin-top: calc(-1 * @statusbar-height);
}
}
@@ -583,4 +576,8 @@
.rtl-sheet .nav {
padding-right: 0;
+}
+#statusbar {
+ background-color: @background-pane-ie;
+ background-color: @background-statusbar;
}
\ No newline at end of file
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-ic-zoomtoslide.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-ic-zoomtoslide.png
new file mode 100644
index 0000000000..43e6d4c218
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-ic-zoomtoslide.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-menu-thumbs.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-menu-thumbs.png
new file mode 100644
index 0000000000..053d25f757
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-menu-thumbs.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-sheet-list.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-sheet-list.png
new file mode 100644
index 0000000000..86bd31234d
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.25x/btn-sheet-list.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-ic-zoomtoslide.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-ic-zoomtoslide.png
new file mode 100644
index 0000000000..fb98ed2f1b
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-ic-zoomtoslide.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-menu-thumbs.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-menu-thumbs.png
new file mode 100644
index 0000000000..1295680ba9
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-menu-thumbs.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-sheet-list.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-sheet-list.png
new file mode 100644
index 0000000000..0b2fa28741
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.5x/btn-sheet-list.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-ic-zoomtoslide.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-ic-zoomtoslide.png
new file mode 100644
index 0000000000..93b5e3ec30
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-ic-zoomtoslide.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-menu-thumbs.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-menu-thumbs.png
new file mode 100644
index 0000000000..f29ecabfc0
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-menu-thumbs.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-sheet-list.png b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-sheet-list.png
new file mode 100644
index 0000000000..29a4b6d6a4
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1.75x/btn-sheet-list.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-ic-zoomtoslide.png b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-ic-zoomtoslide.png
new file mode 100644
index 0000000000..b68e8971bb
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-ic-zoomtoslide.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-menu-thumbs.png b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-menu-thumbs.png
new file mode 100644
index 0000000000..2d85fd5f79
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-menu-thumbs.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-sheet-list.png b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-sheet-list.png
new file mode 100644
index 0000000000..f8c71ec836
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/1x/btn-sheet-list.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-ic-zoomtoslide.svg b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-ic-zoomtoslide.svg
new file mode 100644
index 0000000000..43c2641fdc
--- /dev/null
+++ b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-ic-zoomtoslide.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-menu-thumbs.svg b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-menu-thumbs.svg
new file mode 100644
index 0000000000..bb975eb2aa
--- /dev/null
+++ b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-menu-thumbs.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-sheet-list.svg b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-sheet-list.svg
new file mode 100644
index 0000000000..33fc4c4b39
--- /dev/null
+++ b/apps/visioeditor/main/resources/img/toolbar/v2/2.5x/btn-sheet-list.svg
@@ -0,0 +1,3 @@
+
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-ic-zoomtoslide.png b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-ic-zoomtoslide.png
new file mode 100644
index 0000000000..933b2ed815
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-ic-zoomtoslide.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-menu-thumbs.png b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-menu-thumbs.png
new file mode 100644
index 0000000000..254c8eb74d
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-menu-thumbs.png differ
diff --git a/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-sheet-list.png b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-sheet-list.png
new file mode 100644
index 0000000000..2b308c2aaa
Binary files /dev/null and b/apps/visioeditor/main/resources/img/toolbar/v2/2x/btn-sheet-list.png differ
diff --git a/apps/visioeditor/main/resources/less/statusbar.less b/apps/visioeditor/main/resources/less/statusbar.less
index 46cc92e7f1..a68fa19aa8 100644
--- a/apps/visioeditor/main/resources/less/statusbar.less
+++ b/apps/visioeditor/main/resources/less/statusbar.less
@@ -1,4 +1,3 @@
-@statusbar-height: var(--statusbar-height, 25px);
.statusbar {
padding: 0 2px 0;
z-index: 500;
@@ -190,7 +189,7 @@
display: inline-block;
.border-radius(0);
padding: 0 10px 0;
- line-height: 24px;
+ line-height: @statusbar-height;
background-color: @background-pane-additional-ie;
background-color: @background-pane-additional;
outline: none;
@@ -381,5 +380,5 @@
}
#statusbar {
background-color: @background-pane-ie;
- background-color: @background-pane;
+ background-color: @background-statusbar;
}
\ No newline at end of file