diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index f9621b3d0..b9b8eba6d 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -10,20 +10,24 @@ margin-bottom: 3px; &:hover:not(.disabled) { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.active:not(.disabled) { outline: 0; + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; > a { + color: @text-normal-pressed-ie; color: @text-normal-pressed; } } &.disabled > a { cursor: default; + color: @border-regular-control-ie; color: @border-regular-control; } @@ -59,6 +63,7 @@ .panel-context { width: 100%; padding-left: 260px; + background-color: @background-normal-ie; background-color: @background-normal; .content-box { @@ -154,6 +159,7 @@ h3 { margin: 0; font-size: 10pt; + color: @text-normal-ie; color: @text-normal; font-weight: bold; padding: 0 0 10px 10px; @@ -188,6 +194,7 @@ hr { margin: 0; border-bottom: none; + border-color: @border-toolbar-ie; border-color: @border-toolbar; } @@ -227,6 +234,7 @@ &:hover, &.over { + background-color: @background-toolbar-ie; background-color: @background-toolbar; } @@ -249,6 +257,7 @@ } .file-info { + color: @text-secondary-ie; color: @text-secondary; } } @@ -266,6 +275,7 @@ } .dataview { + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; & > .item { @@ -280,10 +290,12 @@ &:not(.header-name) { &:hover, &.over { + background-color: @background-toolbar-ie; background-color: @background-toolbar; } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; color: @dropdown-link-active-color; } diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 12153b738..b7e06902d 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -2,6 +2,7 @@ body { width: 100%; height: 100%; .user-select(none); + color: @text-normal-ie; color: @text-normal; &.safari { @@ -39,6 +40,7 @@ label { top:0; right: 0; bottom: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } diff --git a/apps/documenteditor/main/resources/less/leftmenu.less b/apps/documenteditor/main/resources/less/leftmenu.less index 6e1e17538..6f2b7e151 100644 --- a/apps/documenteditor/main/resources/less/leftmenu.less +++ b/apps/documenteditor/main/resources/less/leftmenu.less @@ -13,6 +13,7 @@ top: 0; position: absolute; z-index: @zindex-dropdown - 5; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less index ac9a53a94..0a3726fad 100644 --- a/apps/documenteditor/main/resources/less/navigation.less +++ b/apps/documenteditor/main/resources/less/navigation.less @@ -11,6 +11,7 @@ width: 100%; font-weight: bold; padding: 10px 12px; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; } diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 4554547ed..c84c57c44 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -85,9 +85,11 @@ .combo-dataview-menu { .form-control { cursor: pointer; + background-color: @background-normal-ie; background-color: @background-normal; &.text { + background: @background-normal-ie; background: @background-normal; vertical-align: bottom; } @@ -157,6 +159,7 @@ &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; .caret { diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 67b8c5a9c..6400575ed 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -69,6 +69,7 @@ .cnt-lang { display: inline-block; cursor: pointer; + color: @text-normal-ie; color: @text-normal; margin-left: 6px; @@ -175,6 +176,7 @@ height: 12px; display: inline-block; vertical-align: middle; + border: @scaled-one-px-value-ie solid @border-toolbar-ie; border: @scaled-one-px-value solid @border-toolbar; } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index a76ab5b44..414a07141 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -27,6 +27,7 @@ right: 0; bottom: 0; opacity: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; z-index: @zindex-tooltip + 1; } @@ -48,10 +49,12 @@ width: 246px; height: @contents-menu-item-height; + .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); &:hover, &.selected { + .box-shadow(0 0 0 2px @border-control-focus-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); } } @@ -60,6 +63,7 @@ background-color: transparent; div { + .box-shadow(0 0 0 2px @border-control-focus-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); } } @@ -91,6 +95,7 @@ opacity: 0.5; &:hover { + .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); } } @@ -142,7 +147,9 @@ #watermark-auto-color > a.selected, #watermark-auto-color > a:hover { span { + outline: @scaled-one-px-value-ie solid @icon-normal-ie; outline: @scaled-one-px-value solid @icon-normal; + border: @scaled-one-px-value-ie solid @background-normal-ie; border: @scaled-one-px-value solid @background-normal; } } @@ -151,11 +158,14 @@ cursor: default; position: relative; padding: 14px 11px; + border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; border-left: @scaled-one-px-value solid @border-regular-control; + border-top: @scaled-one-px-value-ie solid @border-regular-control-ie; border-top: @scaled-one-px-value solid @border-regular-control; } .save-style-link { + border-bottom: @scaled-one-px-value-ie dotted @text-secondary-ie; border-bottom: @scaled-one-px-value dotted @text-secondary; cursor: pointer; margin-left: 22px; @@ -200,6 +210,8 @@ #special-paste-container { position: absolute; z-index: @zindex-dropdown - 20; + background-color: @background-toolbar-ie; background-color: @background-toolbar; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; } \ No newline at end of file diff --git a/apps/documenteditor/main/resources/less/variables.less b/apps/documenteditor/main/resources/less/variables.less index 7421dacd8..4c45439f5 100644 --- a/apps/documenteditor/main/resources/less/variables.less +++ b/apps/documenteditor/main/resources/less/variables.less @@ -1,6 +1,7 @@ // // Variables // -------------------------------------------------- +@header-background-color-ie: @toolbar-header-document-ie; @header-background-color: var(--toolbar-header-document); // Active color