diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index 873f281a5f..45e0be31c5 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -14,8 +14,11 @@ .menu-panel { width: 160px; + padding-top: @layout-padding-y-side-panel-ie; padding-top: @layout-padding-y-side-panel; + padding-right: @layout-padding-x-side-panel-ie; padding-right: @layout-padding-x-side-panel; + padding-left: @layout-padding-x-side-panel-ie; padding-left: @layout-padding-x-side-panel; .btn-category { diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index d34ccc191d..afaa832ca5 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -19,7 +19,7 @@ overflow: hidden; border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; - background-color: @background-pane-ie; + background-color: @background-toolbar-ie; background-color: @background-toolbar; label { diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index 5c28a14ff4..e9290c642e 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -93,6 +93,30 @@ @component-disabled-opacity-ie: .4; +// new +@border-sidemenu-ie: @scaled-one-px-value-ie solid @border-toolbar-ie; +@background-statusbar-ie: #f1f1f1; +@shadow-toolbar-ie: 0px 1px 0 0 @border-toolbar-ie; +@shadow-side-panel-ie: none; +@border-radius-toolbar-ie: 0; +@toolbar-tab-radius-ie: 0; +@toolbar-tab-line-radius-ie: 2px; +@toolbar-tab-line-height-ie: 2px; +@toolbar-tab-line-bottom-ie: 4px; +@toolbar-tab-text-margin-ie: 5px; +@layout-padding-toolbar-ie: 0; +@layout-padding-x-side-panel-ie: 0; +@layout-padding-y-side-panel-ie: 2px; +@layout-padding-right-panel-content-ie: 7px 10px 0 15px; +@layout-padding-right-panel-content-rtl-ie: 7px 15px 0 10px; +@layout-padding-right-panel-ie: 0; +@layout-padding-right-panel-rtl-ie: 0; +@layout-padding-left-panel-ie: 0 0 0 40px; +@layout-padding-left-panel-rtl-ie: 0 40px 0 0; + + + + // cell editor SSE @celleditor-height-ie: 24px; @celleditor-line-height-ie: 20px; diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 4a9bb40d19..fa6dd13931 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -60,11 +60,11 @@ label { overflow: hidden; .tool-menu-btns { - //border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; + border-right: @border-sidemenu-ie; border-right: @border-sidemenu; .rtl & { - //border-left: @scaled-one-px-value solid @border-toolbar; + border-left: @border-sidemenu-ie; border-left: @border-sidemenu; border-right: 0 none; } @@ -81,7 +81,7 @@ label { &.right { .tool-menu-btns { //position: absolute; - //border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; + border-left: @border-sidemenu-ie; border-left: @border-sidemenu; background-color: @background-pane-ie; background-color: @background-pane; @@ -92,7 +92,7 @@ label { left: 0; right: auto; - //border-right: @scaled-one-px-value solid @border-toolbar; + border-right: @border-sidemenu-ie; border-right: @border-sidemenu; border-left: 0 none; } @@ -106,11 +106,14 @@ label { display: inline-block; position: absolute; padding-top: 15px; + padding-right: @layout-padding-x-side-panel-ie; padding-right: @layout-padding-x-side-panel; + padding-left: @layout-padding-x-side-panel-ie; padding-left: @layout-padding-x-side-panel; button { margin-bottom: @category-btn-y-margin-large; + margin-bottom: @category-btn-y-margin-large-ie; } } @@ -127,14 +130,15 @@ label { .left-panel { height: 100%; + padding: @layout-padding-left-panel-ie; padding: @layout-padding-left-panel; - //border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; - //border-right: @scaled-one-px-value solid @border-toolbar; + border-right: @border-sidemenu-ie; border-right: @border-sidemenu; .rtl & { + padding: @layout-padding-left-panel-rtl-ie; padding: @layout-padding-left-panel-rtl; - //border-left: @scaled-one-px-value solid @border-toolbar; + border-left: @border-sidemenu-ie; border-left: @border-sidemenu; border-right: 0 none; } @@ -152,13 +156,17 @@ label { height: 100%; display: none; + padding: @layout-padding-left-panel-ie; padding: @layout-padding-left-panel; padding-left: 0; + border-right: @border-sidemenu-ie; border-right: @border-sidemenu; .rtl & { + padding: @layout-padding-left-panel-rtl-ie; padding: @layout-padding-left-panel-rtl; padding-right: 0; + border-left: @border-sidemenu-ie; border-left: @border-sidemenu; border-right: 0 none; } @@ -168,17 +176,16 @@ label { width: 220px; height: 100%; display: none; + padding: @layout-padding-right-panel-ie; padding: @layout-padding-right-panel; - //border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; - //border-left: @scaled-one-px-value solid @border-toolbar; - //line-height: 15px; + border-left: @border-sidemenu-ie; border-left: @border-sidemenu; .rtl & { - // border-right: @scaled-one-px-value solid @border-toolbar; - // border-left: 0 none; + padding: @layout-padding-right-panel-rtl-ie; padding: @layout-padding-right-panel-rtl; + border-right: @border-sidemenu-ie; border-right: @border-sidemenu; border-left: 0 none; } @@ -186,11 +193,11 @@ label { .content-box { height: 100%; width: 100%; - padding: 0 10px 0 15px; + padding: @layout-padding-right-panel-content-ie; padding: @layout-padding-right-panel-content; .rtl & { - padding: 0 15px 0 10px; + padding: @layout-padding-right-panel-content-rtl-ie; padding: @layout-padding-right-panel-content-rtl; } } diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 0f406924f1..dcac7ca872 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -1,6 +1,8 @@ #history-box { position: relative; + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; background: @background-toolbar-ie; background: @background-toolbar; diff --git a/apps/common/main/resources/less/statusbar.less b/apps/common/main/resources/less/statusbar.less index 037193d355..f8fe97fe35 100644 --- a/apps/common/main/resources/less/statusbar.less +++ b/apps/common/main/resources/less/statusbar.less @@ -6,7 +6,7 @@ .statusbar { height: 25px; height: @statusbar-height; - background-color: @background-pane-ie; + background-color: @background-statusbar-ie; background-color: @background-statusbar; .box-inner-shadow(0 @scaled-one-px-value-ie 0 @border-toolbar-ie); .box-inner-shadow(0 @scaled-one-px-value 0 @border-toolbar); diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index a7b6258da9..756a221fcb 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -1,43 +1,50 @@ @img-equition-filter: var(--image-border-types-filter); #toolbar { + padding: @layout-padding-toolbar-ie; padding: @layout-padding-toolbar; &:not(.style-off-tabs) { + background: @header-background-color-ie; background: @header-background-color; .toolbar { + background-color: @header-background-color-ie; background-color: @header-background-color; } } } .toolbar { .box-controls { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; background-color: @background-toolbar-ie; background-color: @background-toolbar; &:not(.z-clear *) { &:before { - //@flight-tb-shadow-color: @highlight-button-hover; content: ''; position: absolute; - //box-shadow: 0 0 0 0 @flight-tb-shadow-color, - // -3px 3px 5px -2px @flight-tb-shadow-color, 3px 3px 5px 0px @flight-tb-shadow-color; + box-shadow: @shadow-toolbar-ie; box-shadow: @shadow-toolbar; width: 100%; height: @toolbar-height-controls; bottom: 0; + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; } } } .box-tabs { + padding-left: @border-radius-toolbar-ie; padding-left: @border-radius-toolbar; + padding-right: @border-radius-toolbar-ie; padding-right: @border-radius-toolbar; } .ribtab { + border-top-left-radius: @toolbar-tab-radius-ie; border-top-left-radius: @toolbar-tab-radius; + border-top-right-radius: @toolbar-tab-radius-ie; border-top-right-radius: @toolbar-tab-radius; } } @@ -147,6 +154,7 @@ > a { display: inline-block; padding: 0 12px; + margin-bottom: @toolbar-tab-text-margin-ie; margin-bottom: @toolbar-tab-text-margin; text-decoration: none; cursor: default; @@ -772,17 +780,20 @@ &:after { border-top-style: solid; + border-top-width: @toolbar-tab-line-height-ie; border-top-width: @toolbar-tab-line-height; content: ''; position: absolute; .margin-left-7(); width: calc(100% - 14px); + bottom: calc(-1 * @toolbar-tab-line-height-ie); bottom: calc(-1 * @toolbar-tab-line-height); opacity: 0; .tab-header-color(); .style-off-tabs& { .tab-toolbar-color(); } + border-radius: @toolbar-tab-line-radius-ie; border-radius: @toolbar-tab-line-radius; transition: margin-left .05s ease-in-out, width .05s ease-in-out, opacity .1s ease-in-out; } @@ -796,6 +807,7 @@ &.active { &:after { opacity: 1; + bottom: @toolbar-tab-line-bottom-ie; bottom: @toolbar-tab-line-bottom; } } @@ -803,6 +815,7 @@ &:hover:not(.active) { &:after { opacity: 0.4; + bottom: @toolbar-tab-line-bottom-ie; bottom: @toolbar-tab-line-bottom; } } @@ -828,6 +841,7 @@ &.short { li { &:after { + bottom: @toolbar-tab-line-bottom-ie; bottom: @toolbar-tab-line-bottom; } } diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less index 080eccbefc..6fc2a2bc56 100644 --- a/apps/documenteditor/main/resources/less/leftmenu.less +++ b/apps/documenteditor/main/resources/less/leftmenu.less @@ -1,8 +1,11 @@ .side-panel { .content-box { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; + background: @background-toolbar-ie; background: @background-toolbar; position: relative; overflow: hidden; diff --git a/apps/pdfeditor/main/resources/less/leftmenu.less b/apps/pdfeditor/main/resources/less/leftmenu.less index ccb0e70ca8..5e1d9630d8 100644 --- a/apps/pdfeditor/main/resources/less/leftmenu.less +++ b/apps/pdfeditor/main/resources/less/leftmenu.less @@ -1,7 +1,10 @@ .side-panel { .content-box { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; + background: @background-toolbar-ie; background: @background-toolbar; position: relative; overflow: hidden; diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 588cb0303b..be3429ac27 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -1,7 +1,10 @@ .side-panel { .content-box { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; + background: @background-toolbar-ie; background: @background-toolbar; position: relative; overflow: hidden; diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 0279a8b79b..74064152d4 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -1,7 +1,10 @@ .side-panel { .content-box { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; + background: @background-toolbar-ie; background: @background-toolbar; position: relative; overflow: hidden; diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index c60aa98da5..383ff45308 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -578,6 +578,6 @@ padding-right: 0; } #statusbar { - background-color: @background-pane-ie; + background-color: @background-statusbar-ie; background-color: @background-statusbar; } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 550ee35b5c..0df70ff28e 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -78,7 +78,7 @@ //position: relative; //--toolbar-tabs-scroller-height: 38px; - background-color: #f1f1f1; + background-color: @background-pane-ie; background-color: @background-pane; //-webkit-box-shadow: inset 0 -1px #cbcbcb; //box-shadow: inset 0 -1px #cbcbcb; diff --git a/apps/visioeditor/main/resources/less/leftmenu.less b/apps/visioeditor/main/resources/less/leftmenu.less index 291bb834da..934763818e 100644 --- a/apps/visioeditor/main/resources/less/leftmenu.less +++ b/apps/visioeditor/main/resources/less/leftmenu.less @@ -1,7 +1,10 @@ .side-panel { .content-box { + border-radius: @border-radius-toolbar-ie; border-radius: @border-radius-toolbar; + box-shadow: @shadow-side-panel-ie; box-shadow: @shadow-side-panel; + background: @background-toolbar-ie; background: @background-toolbar; position: relative; overflow: hidden; diff --git a/apps/visioeditor/main/resources/less/statusbar.less b/apps/visioeditor/main/resources/less/statusbar.less index a68fa19aa8..55e4e7e957 100644 --- a/apps/visioeditor/main/resources/less/statusbar.less +++ b/apps/visioeditor/main/resources/less/statusbar.less @@ -379,6 +379,6 @@ padding-right: 0; } #statusbar { - background-color: @background-pane-ie; + background-color: @background-statusbar-ie; background-color: @background-statusbar; } \ No newline at end of file