From 650db2c63f5d9653778eb865fab90214fd683aa7 Mon Sep 17 00:00:00 2001 From: evgenykatyshev Date: Fri, 12 Feb 2021 17:43:51 +0300 Subject: [PATCH 1/7] BorderSize sprite --- .../img/combo-border-size/BorderSize.png | Bin 254 -> 208 bytes .../img/combo-border-size/BorderSize@1.5x.png | Bin 0 -> 231 bytes .../img/combo-border-size/BorderSize@2x.png | Bin 275 -> 694 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize.png b/apps/common/main/resources/img/combo-border-size/BorderSize.png index b0312414f92e53f3848027d55b485ae8f82bceef..97152b1494b803abace283663bb3cf337c487bf1 100644 GIT binary patch delta 192 zcmeyzc!6<(L_HHT0|Ub&V~cY@iZj3`#1%+GKy&iT13(s2NswPKL)s-L&QKt)#M8ww zq=GR?B1b{wf}U&w0}r#Kh%EPuz@k$!sf?z}bF?NnWLqydW3I?B@2<1%aa)U%{vWnX ze~@l}@N!(!^1W{~Q{-1>Onl8$-FQ4EdEI8q_`CVF-?V>kd@P|XoVb6x#jcGr9-N3f ns&=>2ZPV|2`+lFjfB%o(V_RGHYT+PRki$G({an^LB{Ts5Th&Q5 delta 238 zcmcb>_>XadL_G&H0|Uc~W`%qp#ggvm>&U>cv7h@-A}f&3SRCZ;#IWw1%u67LGr%Xr z)xE$6$OHnhY|hC*im4>XFPI_ik`rerkk{(z;uunK>+N-Gt_A}E2gk4f+Qo8MTtDAT zikz$26ey;6)Ok8<)HR0X>?yaI=Ew!?N@Pms2st;Qjd6eO42CA2&~p=jq@~wjHK9C9^GfYIL2a>rXwG`^eyc^I^8UXS~dN g%+@>)d}OfYjn*Ea-zQFZO$WKt)78&qol`;+0MXe|oB#j- diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png b/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..293c5ab092a0a38236ea46701efe4aa689a81038 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^Q49=>hnSdwETI-NZXm@O;1l8sq#>X=`Q-s1i>V~Y zFPI_ik`rerkk{?$;uunK>+SXJf`<(RTrSS#j^tWB@h$sOgFQF3p6)fedH9d}`5%)R zTE0iwn+gX^oIi`DEYBgJqz2y)4 z#TvJL6QiZxOmV9YIy0 Z53lUA&D&qBeG~w4uBWS?%Q~loCICv4TFw9f literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize@2x.png b/apps/common/main/resources/img/combo-border-size/BorderSize@2x.png index c59d606eef2d78a7826ba2d945a0f581a8a73ed9..87d17d13cd258ec7803494b7296ef16db90a03e2 100644 GIT binary patch literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^6$}ha5gcql*2-|Dvp|Zoz$3Dlfk8|agc&`9R6YO& z8HhvRkn&JB$4xmp%7C9|LLyg9m$K>g?|~uUXFs6M@qOUf1WY$(@j@&J7oWF)TE# zBMZwmJ!0t-mVk*t>4aHR=UPb17BU^@lu<93a{x`6;qsf5qc>l42wV6)uxNY?G{C|y z0Yy!Nh_-d%J9emcxH%Ap0kTr|jhlp@=LO9|@^+eV(8C@_)i&Wmw3dIqrdPjCf>U+|-+&rR5%ew>!Z5AA0~YFf?RtH=D0z9WsB{ w{;%(4@Hy~J%3AAmQR~S0F3{M3+d1tQqyAGZk$vA*#)AUT)78&qol`;+0Ny&e`~Uy| delta 259 zcmdnSI+50*_@Ms6jMo%Uob=3B`3~MAa9nZi(^Q|t+zJ}`I-#`Tph39(f?ljHh9@a zj?P1RLat%wdNdsNFQ_)!!ZzL3=_XIWd5+W?;{#c-!LA8gjb2JE$X>;9YD>|~5Wy)Y z*K{@PFFqju>fzKgw>#G5?E9YA@c!M@m(z_8ye!YSee8w0d24#ZitNo|e?M>h#G@0t ztg=t?vqo{v8XIPn*y^v3CrmhH>~L@E_PRIqD_5N>xGB7Lr~Tu%3vT9u9PjDs=d#Wz Gp$PzdC2OMq From 6c5710506b42caba1bee0a26db18c0e786830a22 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 10:16:46 +0300 Subject: [PATCH 2/7] [common] fixed condition for pixel ratio --- apps/common/main/lib/util/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index de1210325..a63c375ac 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -141,7 +141,7 @@ Common.Utils = _.extend(new(function() { $root.removeClass('pixel-ratio__2'); $root.addClass('pixel-ratio__1_5'); } else - if ( scale.devicePixelRatio > 1.5 && scale.devicePixelRatio < 2 ) { + if ( scale.devicePixelRatio > 1.5 /*&& scale.devicePixelRatio <= 2*/ ) { $root.addClass('pixel-ratio__2'); $root.removeClass('pixel-ratio__1_5'); } else { From fcdb2ee89846afb1f2adf6cf5604b860a2dabfce Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 10:21:22 +0300 Subject: [PATCH 3/7] [dark theme] fix common styles for IE --- apps/common/main/lib/util/utils.js | 1 + .../img/toolbar/1.5x/big/.css.handlebars | 1 + .../img/toolbar/1.5x/huge/.css.handlebars | 1 + .../resources/img/toolbar/1x/.css.handlebars | 7 ++ .../img/toolbar/1x/big/.css.handlebars | 5 +- apps/common/main/resources/less/about.less | 6 ++ apps/common/main/resources/less/buttons.less | 64 +++++++++++++++++++ apps/common/main/resources/less/calendar.less | 1 + apps/common/main/resources/less/chat.less | 6 ++ apps/common/main/resources/less/checkbox.less | 5 ++ .../main/resources/less/colorpalette.less | 6 ++ .../resources/less/colors-table-ie-fix.less | 63 ++++++++++++++++++ .../main/resources/less/colors-table.less | 1 + .../main/resources/less/combo-dataview.less | 16 +++++ apps/common/main/resources/less/combobox.less | 10 +++ apps/common/main/resources/less/comments.less | 20 ++++++ apps/common/main/resources/less/common.less | 19 +++++- apps/common/main/resources/less/dataview.less | 6 ++ .../main/resources/less/dropdown-menu.less | 12 ++++ .../main/resources/less/dropdown-submenu.less | 1 + .../resources/less/extended-color-picker.less | 1 + apps/common/main/resources/less/header.less | 17 ++++- apps/common/main/resources/less/history.less | 15 +++++ .../main/resources/less/hsb-colorpicker.less | 6 ++ apps/common/main/resources/less/input.less | 9 +++ .../main/resources/less/language-dialog.less | 2 + apps/common/main/resources/less/layout.less | 5 ++ apps/common/main/resources/less/listview.less | 13 ++++ apps/common/main/resources/less/loadmask.less | 3 + .../main/resources/less/masked-field.less | 2 + .../resources/less/multislider-gradient.less | 13 ++++ .../main/resources/less/opendialog.less | 2 + apps/common/main/resources/less/plugins.less | 4 ++ apps/common/main/resources/less/radiobox.less | 3 + apps/common/main/resources/less/scroller.less | 12 ++++ .../common/main/resources/less/separator.less | 2 + apps/common/main/resources/less/spinner.less | 4 ++ apps/common/main/resources/less/switcher.less | 6 ++ .../main/resources/less/symboltable.less | 6 ++ .../main/resources/less/synchronize-tip.less | 4 ++ apps/common/main/resources/less/tabbar.less | 7 ++ .../resources/less/theme-colorpalette.less | 7 ++ apps/common/main/resources/less/toolbar.less | 38 +++++++++++ apps/common/main/resources/less/tooltip.less | 5 ++ apps/common/main/resources/less/treeview.less | 5 ++ apps/common/main/resources/less/window.less | 14 ++++ 46 files changed, 453 insertions(+), 3 deletions(-) create mode 100644 apps/common/main/resources/less/colors-table-ie-fix.less diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index a63c375ac..716c6e6d2 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -154,6 +154,7 @@ Common.Utils = _.extend(new(function() { me.zoom = 1; me.innerWidth = window.innerWidth; me.innerHeight = window.innerHeight; + if ( isIE ) $(document.body).addClass('ie'); checkSize(); $(window).on('resize', checkSize); diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars index a17594fdd..4d81da70c 100644 --- a/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars @@ -12,6 +12,7 @@ } .toolbar__icon.toolbar__icon-big { + background-size: 56px auto; background-size: var(--big-icon-background-image-width) auto; } {{/spritesheet}} diff --git a/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars index 1bb31ab87..ddb2130e0 100644 --- a/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars @@ -1,5 +1,6 @@ {{#spritesheet}} .options__icon.options__icon-huge { + background-size: 80px auto; background-size: var(--huge-icon-background-image-width) auto; } {{/spritesheet}} diff --git a/apps/common/main/resources/img/toolbar/1x/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/.css.handlebars index 38132ed40..73e7a0dc0 100644 --- a/apps/common/main/resources/img/toolbar/1x/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/.css.handlebars @@ -3,6 +3,9 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon { + @btn-active-icon-offset: 0; + background-position-x: @btn-active-icon-offset; + background-position-x: var(--button-small-active-icon-offset-x, 0); } } @@ -10,6 +13,7 @@ } .menu__icon { .no-checkmark.checked & { + background-position-x: 0; background-position-x: @menu-icon-item-checked-offset-x; } } @@ -19,6 +23,9 @@ {{/spritesheet}} {{#sprites}} {{#parselang name}}.{{name}}{{/parselang}} { + @btn-icon-offset: 0; + background-position: @btn-icon-offset {{px.offset_y}}; + background-position: var(--button-small-normal-icon-offset-x, 0) {{px.offset_y}}; } {{/sprites}} diff --git a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars index fd7b858a7..9348d8235 100644 --- a/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/big/.css.handlebars @@ -4,6 +4,7 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon { + background-position-x: 0; background-position-x: var(--button-huge-active-icon-offset-x,0); } } @@ -13,6 +14,7 @@ &.active, &:active { &:not(:disabled):not(.disabled) { .toolbar__icon.toolbar__icon-big { + background-position-x: 0; background-position-x: var(--button-huge-active-icon-offset-x,0); } } @@ -29,6 +31,7 @@ {{#parselang name}}.x-huge .{{name}}{{/parselang}}, .toolbar__icon-big.{{name}} { - background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}}; + background-position: 0 {{px.offset_y}}; + background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}}; } {{/sprites}} diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index f45c41727..84be73a77 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -23,6 +23,7 @@ margin: 0 30px; font: 12px Tahoma; letter-spacing: 1px; + color: @text-normal-ie; color: @text-normal; font-weight: bold; white-space: nowrap; @@ -30,11 +31,13 @@ .asc-about-version { font: 15px Tahoma; + color: @text-tertiary-ie; color: @text-tertiary; } .asc-about-companyname { font: bold 15px Tahoma; + color: @text-normal-ie; color: @text-normal; } @@ -43,10 +46,12 @@ &.asc-about-desc-name, &.asc-about-lic { font: 12px Tahoma; + color: @text-normal-ie; color: @text-normal; } &.asc-about-desc-name { + color: @text-normal-ie; color: @text-normal; white-space: pre; } @@ -59,6 +64,7 @@ a { font: 12px Tahoma; + color: @text-normal-ie; color: @text-normal; } diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index e417e0361..3c324c41c 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -4,7 +4,9 @@ .btn { border-radius: 1px; + color: @text-normal-ie; color: @text-normal; + border-width: @scaled-one-px-value-ie; border-width: @scaled-one-px-value; .btnsize(@value) { @@ -44,10 +46,12 @@ &:focus { outline: 0; outline-offset: 0; + color: @text-normal-ie; color: @text-normal; } &:hover { + color: @text-normal-ie; color: @text-normal; } @@ -59,6 +63,7 @@ .caret { width: 4px; height: 4px; + border: solid 1px @icon-normal-ie; border: solid 1px @icon-normal; border-bottom: none; border-right: none; @@ -104,6 +109,7 @@ &::after { content: ' '; position: absolute; + border: 1px solid @icon-notification-badge-ie; border: 1px solid @icon-notification-badge; border-left: 0 none; border-right: 0 none; @@ -119,6 +125,7 @@ width: 10px; height: 7px; bottom: 2px; + background-color: @background-notification-badge-ie; background-color: @background-notification-badge; border-radius: 2px; right: 0; @@ -135,6 +142,7 @@ width: 8px; height: 8px; background-color: transparent; + border: solid 1px @text-normal-ie; border: solid 1px @text-normal; border-bottom: none; border-right: none; @@ -167,6 +175,7 @@ &.active:not(.disabled) { .caret-up, .caret-down { &::after { + border-color: @background-normal-ie; border-color: @background-normal; } } @@ -296,6 +305,7 @@ .btn.small; &.bg-white { + background-color: @background-normal-ie; background-color: @background-normal; } @@ -307,13 +317,16 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &:active:not(.disabled), &.active:not(.disabled) { + color: @text-normal-ie; color: @text-normal; + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } @@ -373,6 +386,7 @@ height: 3px; background-color: red; &.bordered { + border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control; } @@ -395,12 +409,15 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &:active:not(.disabled), &.active:not(.disabled) { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; color: @text-normal-pressed; } @@ -512,6 +529,7 @@ &.over:not(.disabled), &.open { + box-shadow: inset 0 0 0 1px @highlight-button-hover-ie; box-shadow: inset 0 0 0 1px @highlight-button-hover; button:not(.active):not(.btn-text-split-default) { @@ -523,12 +541,14 @@ button { &:not(.active) { &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } } &:active, &:active:hover { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } } @@ -537,6 +557,7 @@ &.open { > button:not(.active) { &:last-of-type { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } } @@ -547,6 +568,7 @@ } button.active:not(.disabled) { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } @@ -559,7 +581,9 @@ .btn-color { width: 45px; height: 22px; + padding: @scaled-one-px-value-ie 11px @scaled-one-px-value-ie @scaled-one-px-value-ie; padding: @scaled-one-px-value 11px @scaled-one-px-value @scaled-one-px-value; + border:@scaled-one-px-value-ie solid @border-regular-control-ie; border:@scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -567,6 +591,7 @@ float: left; width: 100%; height: 100%; + border: @scaled-one-px-value-ie solid @border-color-shading-ie; border: @scaled-one-px-value solid @border-color-shading; background-color: transparent; } @@ -582,6 +607,7 @@ .over, &:active, &.active { + background: @background-normal-ie !important; background: @background-normal !important; .box-shadow(none) !important; } @@ -593,6 +619,7 @@ .color-transparent { &:before { + border-right: @scaled-one-px-value-ie solid red; border-right: @scaled-one-px-value solid red; height: 34px; transform: translate(16px, -9px) rotate(62deg); @@ -612,7 +639,9 @@ li > a.selected, li > a:hover { span.color-auto { + outline: @scaled-one-px-value-ie solid @border-regular-control-ie; outline: @scaled-one-px-value solid @border-regular-control; + border: @scaled-one-px-value-ie solid @background-normal-ie; border: @scaled-one-px-value solid @background-normal; } } @@ -627,6 +656,7 @@ background-color: transparent; &.bg-white { + background-color: @background-normal-ie; background-color: @background-normal; } @@ -641,16 +671,19 @@ background-repeat: no-repeat; } + box-shadow: inset 0 0 0 @scaled-one-px-value-ie @border-regular-control-ie; box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; .border-radius(@border-radius-small); &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &:active, &.active { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } } @@ -658,7 +691,9 @@ .btn-text-default { width: 75px; height: 22px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -670,13 +705,17 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie !important; background-color: @highlight-button-hover !important; } &:active:not(.disabled), &.active:not(.disabled) { + background-color: @highlight-button-pressed-ie !important; background-color: @highlight-button-pressed !important; + border-color: @highlight-button-pressed-ie; border-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; color: @text-normal-pressed; } @@ -689,7 +728,9 @@ .btn-text-menu-default { width: 100%; height: 22px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -705,11 +746,13 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie !important; background-color: @highlight-button-hover !important; } &:active:not(.disabled), &.active:not(.disabled) { + background-color: @highlight-button-pressed-ie !important; background-color: @highlight-button-pressed !important; color: white; } @@ -723,7 +766,9 @@ .btn-text-split-default { width: 75px; height: 22px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -737,13 +782,17 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie !important; background-color: @highlight-button-hover !important; } &:active:not(.disabled), &.active:not(.disabled) { + background-color: @highlight-button-pressed-ie !important; background-color: @highlight-button-pressed !important; + border-color: @highlight-button-pressed-ie; border-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; color: @text-normal-pressed; } @@ -756,7 +805,9 @@ .btn-icon-default { width: 45px; height: 22px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -775,11 +826,13 @@ &:hover:not(.disabled), .over:not(.disabled) { + background-color: @highlight-button-hover-ie !important; background-color: @highlight-button-hover !important; } &:active:not(.disabled), &.active:not(.disabled) { + background-color: @highlight-button-pressed-ie !important; background-color: @highlight-button-pressed !important; } @@ -796,7 +849,9 @@ padding: 2px; margin:0; box-shadow: none; + background-color: @background-normal-ie; background-color: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); @@ -822,6 +877,7 @@ margin-right: 3px; background-color: transparent; background-repeat: no-repeat; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; position: relative; } @@ -836,6 +892,7 @@ .over, &:active, &.active { + background-color: @background-normal-ie !important; background-color: @background-normal !important; } @@ -858,22 +915,29 @@ .dlg-btn { font-weight: bold; width: 86px; + color: @text-normal-ie; color: @text-normal; + background-color: @background-normal-ie; background-color: @background-normal; + border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control; &:hover:not(.disabled), &.hover:not(.disabled) { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.primary { + color: @text-inverse-ie; color: @text-inverse; + background-color: @background-primary-dialog-button-ie; background-color: @background-primary-dialog-button; border: 0 none; &:hover:not(.disabled), &.hover:not(.disabled) { + background-color: @highlight-primary-dialog-button-hover-ie; background-color: @highlight-primary-dialog-button-hover; } } diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 3458e77ef..b58b92c69 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -1,3 +1,4 @@ +@calendar-bg-color: @header-background-color-ie; @calendar-bg-color: @header-background-color; .calendar-window { diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index e9556645f..900c8118e 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -11,6 +11,7 @@ .area { position: absolute; + border-bottom: 1px solid @border-toolbar-ie; border-bottom: 1px solid @border-toolbar; overflow: hidden; } @@ -57,6 +58,7 @@ margin: 0 5px 3px 0; width: 12px; height: 12px; + border: 1px solid @border-toolbar-ie; border: 1px solid @border-toolbar; } @@ -101,6 +103,7 @@ } .user-name { + color: @text-normal-ie; color: @text-normal; font-size: 12px; font-weight: bold; @@ -112,6 +115,7 @@ .color { width: 12px; height: 12px; + border: 1px solid @border-toolbar-ie; border: 1px solid @border-toolbar; margin: 0 5px 3px 0; vertical-align: middle; @@ -143,10 +147,12 @@ height: 100%; resize: none; margin-bottom: 5px; + border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control; font-size: 12px; &:focus { + border-color: @border-preview-select-ie; border-color: @border-preview-select; } } diff --git a/apps/common/main/resources/less/checkbox.less b/apps/common/main/resources/less/checkbox.less index 831d94b93..9b8b8e320 100644 --- a/apps/common/main/resources/less/checkbox.less +++ b/apps/common/main/resources/less/checkbox.less @@ -12,7 +12,9 @@ + label { width: 14px; height: 14px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; border-radius: 2px; position: absolute; @@ -25,6 +27,7 @@ &::before { content: ''; position: absolute; + border: 2px solid @text-normal-ie; border: @scaled-two-px-value solid @text-normal; border-top: 0 none; border-left: 0 none; @@ -41,7 +44,9 @@ &::before { content: ''; position: absolute; + border: @scaled-one-px-value-ie solid @text-normal-ie; border: @scaled-one-px-value solid @text-normal; + background: @icon-normal-ie; background: @icon-normal; width: 8px; height: 8px; diff --git a/apps/common/main/resources/less/colorpalette.less b/apps/common/main/resources/less/colorpalette.less index 7805bbff7..0690da679 100644 --- a/apps/common/main/resources/less/colorpalette.less +++ b/apps/common/main/resources/less/colorpalette.less @@ -7,6 +7,7 @@ &:hover, &.selected { + .box-shadow(0 0 0 @scaled-one-px-value-ie @highlight-button-pressed-ie); .box-shadow(0 0 0 @scaled-one-px-value @highlight-button-pressed); } } @@ -26,6 +27,7 @@ padding: 10px; .palette-color-item { padding: 0; + border: @scaled-one-px-value-ie solid @background-normal-ie; border: @scaled-one-px-value solid @background-normal; display: inline-block; text-decoration: none; @@ -43,13 +45,16 @@ width: 12px; cursor: pointer; display: block; + border: @scaled-one-px-value-ie solid @border-color-shading-ie; border: @scaled-one-px-value solid @border-color-shading; } } &:hover, &.selected { + border-color: @icon-normal-ie; border-color: @icon-normal; em span { + border-color: @background-normal-ie; border-color: @background-normal; } } @@ -57,6 +62,7 @@ .color-transparent { em span { + border:solid @scaled-one-px-value-ie @border-color-shading-ie; border:solid @scaled-one-px-value @border-color-shading; } } diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less new file mode 100644 index 000000000..4891f7817 --- /dev/null +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -0,0 +1,63 @@ + +@toolbar-header-document-ie: #446995; +@toolbar-header-spreadsheet-ie: #40865c; +@toolbar-header-presentation-ie: #aa5252; + +@background-normal-ie: #fff; +@background-toolbar-ie: #f7f7f7; +@background-toolbar-additional-ie: #efefef; +@background-primary-dialog-button-ie: #444; +@background-tab-underline-ie: #444; +@background-notification-popover-ie: #fcfed7; +@background-notification-badge-ie: #ffd112; +@background-scrim-ie: fade(#000, 20%); +@background-loader-ie: fade(#181818, 90%); + +@highlight-button-hover-ie: #e0e0e0; +@highlight-button-pressed-ie: #ccc; +@highlight-button-pressed-hover-ie: #bababa; +@highlight-primary-dialog-button-hover-ie: #2b2b2b; +@highlight-header-button-hover-ie: fade(#fff, 20%); +@highlight-header-button-pressed-ie: fade(#fff, 25%); +@highlight-toolbar-tab-underline-ie: #444; +@highlight-text-select-ie: #3494fb; + +@border-toolbar-ie: #cbcbcb; +@border-divider-ie: #dfdfdf; +@border-regular-control-ie: #c0c0c0; +@border-toolbar-button-hover-ie: #e0e0e0; +@border-preview-select-ie: #aaa; +@border-control-focus-ie: #848484; +@border-color-shading-ie: fade(#000, 10%); +@border-error-ie: #f62211; + +@text-normal-ie: fade(#000, 80%); +@text-normal-pressed-ie: fade(#000, 80%); +@text-secondary-ie: fade(#000, 60%); +@text-tertiary-ie: fade(#000, 40%); +@text-link-ie: #445799; +@text-inverse-ie: #fff; +@text-toolbar-header-ie: #fff; +@text-contrast-background-ie: #fff; + +@icon-normal-ie: #444; +@icon-normal-pressed-ie: #444; +@icon-inverse-ie: #fff; +@icon-toolbar-header-ie: #fff; +@icon-notification-badge-ie: #000; +@icon-contrast-popover-ie: #fff; +@icon-success-ie: #090; + +@button-header-normal-icon-offset-x-ie: -20px; +@button-header-active-icon-offset-x-ie: -20px; +@scaled-one-px-value-ie: 1px; + +.ie { + .toolbar__icon.toolbar__icon-big { + @big-icon-background-image-ie: ~"url(@{app-image-const-path}/iconsbig.png)"; + background-image: @big-icon-background-image-ie; + } +} + +//@huge-icon-background-image-ie: ~"url(@{app-image-const-path}/iconshuge.png)"; + diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index e149e47c7..a42088daf 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -1,3 +1,4 @@ +@import "./colors-table-ie-fix.less"; // Brand colors // ------------------------- diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 64e886fcd..6d51e3362 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -10,7 +10,9 @@ width: @combo-dataview-width; height: 100%; .border-radius(@border-radius-small); + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; + background-color: @background-normal-ie; background-color: @background-normal; .dataview { @@ -24,7 +26,9 @@ button { border-radius:0 @border-radius-small @border-radius-small 0; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; + background-color: @background-normal-ie; background-color: @background-normal; &.dropdown-toggle { @@ -44,6 +48,7 @@ } .dropdown-menu { + border-color: @border-regular-control-ie; border-color: @border-regular-control; border-top-right-radius: 0; border-top-left-radius: 2px; @@ -85,19 +90,24 @@ .item { padding: 3px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .box-shadow(none); + @minus-px-ie: -1px; @minus-px: calc(-1px / @pixel-ratio-factor); + margin: 0 @minus-px-ie @minus-px-ie 0; margin: 0 @minus-px @minus-px 0; height: @combo-dataview-height; &:hover { + .box-inner-shadow(0 0 0 2px @border-regular-control-ie); .box-inner-shadow(0 0 0 @scaled-two-px-value @border-regular-control); } &.selected { + .box-inner-shadow(0 0 0 2px @border-preview-select-ie); .box-inner-shadow(0 0 0 @scaled-two-px-value @border-preview-select); } } @@ -129,6 +139,7 @@ width: auto; position: relative; border: none; + .box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie); .box-shadow(0 0 0 @scaled-one-px-value @background-normal); > div { @@ -152,6 +163,7 @@ width: 8px; height: 8px; background-color: transparent; + border: solid 1px @icon-normal-ie; border: solid 1px @icon-normal; border-bottom: none; border-right: none; @@ -201,6 +213,7 @@ &.disabled { .item { &:hover:not(.selected) { + .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); } } @@ -251,6 +264,7 @@ .item { &: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); } } @@ -278,12 +292,14 @@ .item { margin-left: 4px; + .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); } &.disabled { .item { &:hover:not(.selected) { + .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); } } diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index 8754ee532..371a71494 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -40,6 +40,7 @@ .btn { border-left: 0; + border-color: @border-regular-control-ie; border-color: @border-regular-control; background-color: transparent; margin-left: -1px; @@ -50,7 +51,9 @@ .btn-default:not(.disabled), &.open .dropdown-toggle.btn-default { + background-color: @background-normal-ie; background-color: @background-normal; + border-color: @border-regular-control-ie; border-color: @border-regular-control; padding-right: 4px; } @@ -58,6 +61,7 @@ .btn-default.disabled { &:hover, &:focus { background-color: transparent; + border-color: @border-regular-control-ie; border-color: @border-regular-control; } } @@ -65,6 +69,7 @@ &.input-group-nr.open:not(.no-highlighted) { & > .form-control, & > .btn { + border-color: @border-control-focus-ie; border-color: @border-control-focus; .caret { @@ -76,6 +81,7 @@ &.input-group-nr:not(.no-highlighted) > .form-control { &:focus, &:focus ~ button.dropdown-toggle { + border-color: @border-control-focus-ie; border-color: @border-control-focus; } } @@ -86,15 +92,18 @@ } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; a { + color: @text-normal-pressed-ie; color: @text-normal-pressed; &:hover, &.hover, &:focus, &.focus { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } } @@ -150,6 +159,7 @@ &.input-group-nr:not(.no-highlighted) { & > .form-control, & > .btn { + border-color: @border-control-focus-ie; border-color: @border-control-focus; } } diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 47cdf697d..5d5d92f25 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -14,6 +14,7 @@ right: 0; bottom: 45px; height: 300px; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; &.stretch { @@ -32,9 +33,11 @@ text-align: center; label { + color: @text-normal-ie; color: @text-normal; font: 12px arial; line-height: normal; + border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value dotted @text-normal; padding-top: 12px; outline: none; @@ -58,9 +61,11 @@ width: 100%; resize: none; margin-bottom: 5px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; height: 100%; &:focus { + border-color: @border-control-focus-ie; border-color: @border-control-focus; } } @@ -83,6 +88,7 @@ line-height: normal; position: relative; overflow: hidden; + color: @border-preview-select-ie; color: @border-preview-select; textarea { @@ -90,11 +96,14 @@ height: 50px; resize: none; margin-bottom: 5px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; word-break: break-all; line-height: 15px; + color: @text-normal-ie; color: @text-normal; &:focus { + border-color: @border-control-focus-ie; border-color: @border-control-focus; } } @@ -109,6 +118,7 @@ } .separator-cmt { + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; margin: 20px 0px 0px 0px; } @@ -119,6 +129,7 @@ } .user-name { + color: @text-normal-ie; color: @text-normal; font-size: 12px; font-weight: bold; @@ -133,6 +144,7 @@ .color { width: 12px; height: 12px; + border: @scaled-one-px-value-ie solid @border-toolbar-ie; border: @scaled-one-px-value solid @border-toolbar; margin: 0 5px 3px 0; vertical-align: middle; @@ -170,6 +182,7 @@ font-style: italic; margin-top: 10px; padding: 0px 5px 5px 5px; + border-left: @scaled-one-px-value-ie solid #939393; border-left: @scaled-one-px-value solid #939393; word-break: break-all; white-space: pre-wrap; @@ -177,6 +190,7 @@ } .user-message { + color: @text-normal-ie; color: @text-normal; padding: 9px 0px 0 0px; white-space: pre-wrap; @@ -200,10 +214,12 @@ } .user-reply { + color: @text-normal-ie; color: @text-normal; margin-top: 10px; white-space: pre-wrap; width: auto; + border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value dotted @text-normal; height: 16px; cursor: pointer; @@ -270,6 +286,7 @@ &:after { content: ''; position: absolute; + border: solid @text-normal-ie; border: solid @text-normal; border-width: 0 2px 2px 0; transform: rotate(40deg); @@ -281,6 +298,7 @@ &.comment-resolved { &:after { + border-color: @icon-success-ie; border-color: @icon-success; } } @@ -420,12 +438,14 @@ left: 2px; width: 15px; height: 15px; + background-color: @background-normal-ie; background-color: @background-normal; -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); -webkit-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); + border: solid @scaled-one-px-value-ie @border-toolbar-ie; border: solid @scaled-one-px-value @border-toolbar; } } diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 78796b74d..28a4086f2 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -1,5 +1,6 @@ label { &.link { + border-bottom: @scaled-one-px-value-ie dotted @text-secondary-ie; border-bottom: @scaled-one-px-value dotted @text-secondary; cursor: pointer; @@ -9,6 +10,7 @@ label { } &.link-solid { + border-bottom: @scaled-one-px-value-ie solid @text-secondary-ie; border-bottom: @scaled-one-px-value solid @text-secondary; cursor: pointer; @@ -46,6 +48,7 @@ label { overflow: hidden; .tool-menu-btns { + border-right: @scaled-one-px-value-ie solid @border-regular-control-ie; border-right: @scaled-one-px-value solid @border-regular-control; } } @@ -53,7 +56,9 @@ label { &.right { .tool-menu-btns { //position: absolute; + border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; border-left: @scaled-one-px-value solid @border-regular-control; + background-color: @background-toolbar-ie; background-color: @background-toolbar; right: 0; overflow: hidden; @@ -76,6 +81,7 @@ label { .left-panel { padding-left: 40px; height: 100%; + border-right: @scaled-one-px-value-ie solid @border-regular-control-ie; border-right: @scaled-one-px-value solid @border-regular-control; #left-panel-chat { @@ -94,17 +100,21 @@ label { padding: 0 10px 0 15px; position: relative; overflow: hidden; + border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; border-left: @scaled-one-px-value solid @border-regular-control; line-height: 15px; } .statusbar { height: 25px; + background-color: @background-toolbar-ie; background-color: @background-toolbar; + .box-inner-shadow(0 @scaled-one-px-value-ie 0 @border-regular-control-ie); .box-inner-shadow(0 @scaled-one-px-value 0 @border-regular-control); .status-label { font-weight: bold; + color: @text-normal-ie; color: @text-normal; white-space: nowrap; } @@ -118,12 +128,15 @@ label { .panel-menu { width: 260px; float: left; + border-right: @scaled-one-px-value-ie solid @border-regular-control-ie; border-right: @scaled-one-px-value solid @border-regular-control; + background-color: @background-toolbar-ie; background-color: @background-toolbar; } .flex-settings { &.bordered { + border-bottom: @scaled-one-px-value-ie solid @border-regular-control-ie; border-bottom: @scaled-one-px-value solid @border-regular-control; } overflow: hidden; @@ -182,6 +195,7 @@ label { width: 100%; resize: none; margin-bottom: 5px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; height: 100%; @@ -194,13 +208,16 @@ label { .dropdown-menu { > li > a { + color: @text-normal-ie; color: @text-normal; } } textarea { + background-color: @background-normal-ie; background-color: @background-normal; - color: @text-normal + color: @text-normal-ie; + color: @text-normal; } .btn-edit-table, diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index fac398098..3696c10f5 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -9,6 +9,7 @@ text-align: center; height: 100%; width: 100%; + color: @text-tertiary-ie; color: @text-tertiary; td { padding: 5px; @@ -22,10 +23,12 @@ margin: 4px; cursor: pointer; + .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-preview-select-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select); } } @@ -58,10 +61,12 @@ opacity: 0.5; } + .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:not(.disabled), &.selected:not(.disabled) { + .box-shadow(0 0 0 2px @highlight-button-pressed-ie); .box-shadow(0 0 0 @scaled-two-px-value @highlight-button-pressed); } } @@ -75,6 +80,7 @@ } &.bordered { + border: @scaled-one-px-value-ie solid @input-border; border: @scaled-one-px-value solid @input-border; .border-radius(@border-radius-small); } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 4390285f7..122ec59dd 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -3,8 +3,11 @@ } .dropdown-menu { + background-color: @background-normal-ie; background-color: @background-normal; + border-color: @border-regular-control-ie; border-color: @border-regular-control; + border-width: @scaled-one-px-value-ie; border-width: @scaled-one-px-value; &.scrollable-menu { @@ -34,6 +37,7 @@ & > a { padding: 5px 20px; cursor: pointer; + color: @text-normal-ie; color: @text-normal; &:focus, &.focus { @@ -47,17 +51,22 @@ } &:hover { + color: @text-normal-pressed-ie; color: @text-normal-pressed; + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } } &.over > a { text-decoration: none; + color: @text-normal-pressed-ie; color: @text-normal-pressed; + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; &:after { + border-left-color: @icon-normal-pressed-ie; border-left-color: @icon-normal-pressed; } } @@ -94,6 +103,7 @@ .no-checkmark.checked { .menu-item-icon { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; border-radius: 2px; } @@ -123,7 +133,9 @@ } .divider { + height: @scaled-one-px-value-ie; height: @scaled-one-px-value; + background-color: @border-divider-ie; background-color: @border-divider; } } \ No newline at end of file diff --git a/apps/common/main/resources/less/dropdown-submenu.less b/apps/common/main/resources/less/dropdown-submenu.less index b8114469a..375751540 100644 --- a/apps/common/main/resources/less/dropdown-submenu.less +++ b/apps/common/main/resources/less/dropdown-submenu.less @@ -23,6 +23,7 @@ border-color: transparent; border-style: solid; border-width: 3px 0 3px 3px; + border-left-color: @icon-normal-ie; border-left-color: @icon-normal; margin-top: 5px; margin-right: -10px; diff --git a/apps/common/main/resources/less/extended-color-picker.less b/apps/common/main/resources/less/extended-color-picker.less index 32bcfb550..1ae97ce1f 100644 --- a/apps/common/main/resources/less/extended-color-picker.less +++ b/apps/common/main/resources/less/extended-color-picker.less @@ -37,6 +37,7 @@ width: 63px; height: 20px; background-color: transparent; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; &.top { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 66f00ff4c..8e57409a1 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -29,6 +29,7 @@ .toolbar { .extra { svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; } @@ -57,11 +58,13 @@ } label { + color: @text-toolbar-header-ie; color: @text-toolbar-header; } .dropdown-menu { label { + color: @text-normal-ie; color: @text-normal; } } @@ -70,12 +73,14 @@ .btn-header { &:hover { &:not(.disabled):not(.icon) { + background-color: @highlight-header-button-hover-ie; background-color: @highlight-header-button-hover; } } &:active, &.active { &:not(.disabled):not(.icon) { + background-color: @highlight-header-button-pressed-ie; background-color: @highlight-header-button-pressed; } } @@ -98,6 +103,7 @@ min-width: 50px; text-align: center; + color: @text-toolbar-header-ie; color: @text-toolbar-header; background-color: transparent; border: 0 none; @@ -109,6 +115,7 @@ white-space: nowrap; &.locked { text-decoration: none; + color: @border-preview-select-ie; color: @border-preview-select; cursor: default; } @@ -179,6 +186,7 @@ padding: 0; &.icon--inverse { + background-position-x: @button-header-normal-icon-offset-x-ie; background-position-x: @button-header-normal-icon-offset-x; } } @@ -247,6 +255,7 @@ } label { + color: @text-normal-ie; color: @text-normal; } @@ -281,6 +290,7 @@ } .user-name { + color: @text-normal-ie; color: @text-normal; font-size: 12px; font-weight: bold; @@ -320,6 +330,7 @@ position: relative; &.icon--inverse { + background-position-x: @button-header-normal-icon-offset-x-ie; background-position-x: @button-header-normal-icon-offset-x; } } @@ -328,7 +339,7 @@ &:active, &.active { .icon.toolbar__icon { &.icon--inverse { - background-position-x: @button-header-active-icon-offset-x; + background-position-x: @button-header-active-icon-offset-x-ie; } } } @@ -353,6 +364,7 @@ &:hover { &:not(.disabled) { + background-color: @highlight-header-button-hover-ie; background-color: @highlight-header-button-hover; } } @@ -371,9 +383,11 @@ } #box-document-title { + background-color: @header-background-color-ie; background-color: @header-background-color; display: flex; height: 100%; + color: @text-toolbar-header-ie; color: @text-toolbar-header; position: relative; @@ -382,6 +396,7 @@ } svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; &.icon-save { diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 41eca7330..ea04bb557 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -1,5 +1,6 @@ #history-box { position: relative; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; } @@ -10,6 +11,7 @@ top: 0; right: 0; overflow: hidden; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; #history-btn-back { @@ -21,6 +23,7 @@ cursor: pointer; &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } } @@ -33,6 +36,7 @@ bottom: 0; right: 0; overflow: hidden; + border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value solid @border-toolbar; #history-btn-expand { @@ -44,6 +48,7 @@ cursor: pointer; &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } } @@ -64,14 +69,17 @@ &:hover:not(.selected), &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; .user-name, .user-date { + color: @text-normal-pressed-ie; color: @text-normal-pressed; } @@ -83,6 +91,7 @@ .history-item-wrap { padding: 10px 2px 15px 20px; + color: @text-normal-ie; color: @text-normal; text-overflow: ellipsis; @@ -99,11 +108,14 @@ display: inline-block; max-width: 60px; height: 18px; + color: @highlight-button-pressed-ie; color: @highlight-button-pressed; font-size: 10px; white-space: nowrap; overflow: hidden; + color: @text-tertiary-ie; color: @text-tertiary; + background-color: @background-normal-ie; background-color: @background-normal; text-align: center; padding: 1px 5px; @@ -124,6 +136,7 @@ .color { width: 12px; height: 12px; + border: @scaled-one-px-value-ie solid @border-toolbar-ie; border: @scaled-one-px-value solid @border-toolbar; margin: 0 5px 3px 0; vertical-align: middle; @@ -144,7 +157,9 @@ } .revision-restore { + color: @text-normal-ie; color: @text-normal; + border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value dotted @text-normal; height: 16px; margin-top: 5px; diff --git a/apps/common/main/resources/less/hsb-colorpicker.less b/apps/common/main/resources/less/hsb-colorpicker.less index 79206cb77..a6693567c 100644 --- a/apps/common/main/resources/less/hsb-colorpicker.less +++ b/apps/common/main/resources/less/hsb-colorpicker.less @@ -8,6 +8,7 @@ width: 22px; height: 22px; float: left; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; background-image: none; background-position: 0 -206px; @@ -22,6 +23,7 @@ } .color-text { + color: @text-normal-ie; color: @text-normal; height: 22px; padding: 4px 32px; @@ -34,6 +36,7 @@ width: 195px; height: 196px; position: relative; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; background-position: 0 0; } @@ -49,6 +52,7 @@ width: 10px; height: 100%; position: relative; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; background-position: -195px 0; } @@ -70,6 +74,7 @@ } .empty-color { + color: @text-normal-ie; color: @text-normal; height: 16px; margin: 5px 0; @@ -91,6 +96,7 @@ height: 10px; margin-right: 5px; margin-top: 1px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; } } diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index defb533f6..460422c33 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -1,13 +1,17 @@ .form-control { .border-radius(@border-radius-small); .box-shadow(none); + color: @text-normal-ie; color: @text-normal; .user-select(text); + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; + background-color: @background-normal-ie; background-color: @background-normal; &:focus { + border-color: @border-control-focus-ie; border-color: @border-control-focus; outline: 0; .box-shadow(none); @@ -16,11 +20,13 @@ .form-control[readonly] { cursor: pointer; + background-color: @background-normal-ie; background-color: @background-normal; } .form-control[disabled] { cursor: default; + background-color: @background-normal-ie; background-color: @background-normal; .user-select(none); } @@ -102,7 +108,9 @@ input[type="password"] { } input[type="text"]::selection, textarea::selection { + background: @highlight-text-select-ie; background: @highlight-text-select; + color: @text-inverse-ie; color: @text-inverse; } @@ -115,6 +123,7 @@ textarea.form-control:focus { .select-button { position: absolute; + right: @scaled-one-px-value-ie; right: @scaled-one-px-value; > .btn-toolbar { diff --git a/apps/common/main/resources/less/language-dialog.less b/apps/common/main/resources/less/language-dialog.less index 725c3899e..6b7791d4b 100644 --- a/apps/common/main/resources/less/language-dialog.less +++ b/apps/common/main/resources/less/language-dialog.less @@ -23,9 +23,11 @@ li { &:before { display: none; } + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; &, &:hover, &:focus { + color: @text-normal-pressed-ie; color: @text-normal-pressed; } } diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less index 85e4305f8..196182d88 100644 --- a/apps/common/main/resources/less/layout.less +++ b/apps/common/main/resources/less/layout.less @@ -17,6 +17,7 @@ .layout-resizer { z-index: @zindex-dropdown - 10; + background: @background-toolbar-ie; background: @background-toolbar; border: 0 none; @@ -36,7 +37,9 @@ cursor: row-resize; &.move { + border-top: solid @scaled-one-px-value-ie @border-toolbar-ie; border-top: solid @scaled-one-px-value @border-toolbar; + border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie; border-bottom: solid @scaled-one-px-value @border-toolbar; } } @@ -53,7 +56,9 @@ cursor: col-resize; &.move { + border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; border-left: solid @scaled-one-px-value @border-toolbar; + border-right: solid @scaled-one-px-value-ie @border-toolbar-ie; border-right: solid @scaled-one-px-value @border-toolbar; } } diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index fbb292894..6110d76a7 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -1,4 +1,5 @@ .listview { + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); line-height: 15px; @@ -14,6 +15,7 @@ text-align: center; width: 100%; height: 100%; + color: @text-tertiary-ie; color: @text-tertiary; td { padding: 5px; @@ -22,6 +24,7 @@ } &:not(.no-focus):focus { + border-color: @border-preview-select-ie; border-color: @border-preview-select; } @@ -32,26 +35,36 @@ cursor: pointer; white-space: pre-wrap; + background-color: @background-normal-ie; background-color: @background-normal; + border-color: @border-regular-control-ie; border-color: @border-regular-control; border-style: solid; + border-width: @scaled-one-px-value-ie 0; border-width: @scaled-one-px-value 0; border-top-color: transparent; } &:not(.disabled) > .item { &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; + border-color: @highlight-button-hover-ie; border-color: @highlight-button-hover; border-style: solid; + border-width: @scaled-one-px-value-ie 0; border-width: @scaled-one-px-value 0; } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; color: @text-normal-pressed; + border-color: @highlight-button-pressed-ie; border-color: @highlight-button-pressed; border-style: solid; + border-width: @scaled-one-px-value-ie 0; border-width: @scaled-one-px-value 0; } } diff --git a/apps/common/main/resources/less/loadmask.less b/apps/common/main/resources/less/loadmask.less index f3e13daea..3d7133631 100644 --- a/apps/common/main/resources/less/loadmask.less +++ b/apps/common/main/resources/less/loadmask.less @@ -22,7 +22,9 @@ line-height: @loadmask-image-height; border: none; background-image: none; + background-color: @background-loader-ie; background-color: @background-loader; + color: @text-contrast-background-ie; color: @text-contrast-background; .border-radius(@border-radius-large); @@ -52,6 +54,7 @@ .left-panel & { line-height: @loadmask-small-image-height; background-color: transparent; + color: @text-normal-ie; color: @text-normal; padding: 8px; top: 78px; diff --git a/apps/common/main/resources/less/masked-field.less b/apps/common/main/resources/less/masked-field.less index b1cf44339..cb7b58df6 100644 --- a/apps/common/main/resources/less/masked-field.less +++ b/apps/common/main/resources/less/masked-field.less @@ -1,10 +1,12 @@ .masked-field { text-align: right; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; border-radius: 2px; padding: 0 3px; &:focus { + border-color: @border-preview-select-ie; border-color: @border-preview-select; } } \ No newline at end of file diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less index 7fc604b15..c6c7fabf7 100644 --- a/apps/common/main/resources/less/multislider-gradient.less +++ b/apps/common/main/resources/less/multislider-gradient.less @@ -12,18 +12,23 @@ left: 2px; width: 9px; height: 9px; + background-color: @background-normal-ie; background-color: @background-normal; -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); -webkit-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); + border-top: solid @scaled-one-px-value-ie @border-regular-control-ie; border-top: solid @scaled-one-px-value @border-regular-control; + border-left: solid @scaled-one-px-value-ie @border-regular-control-ie; border-left: solid @scaled-one-px-value @border-regular-control; border-radius: 0 3px; box-sizing: content-box; .thumb-top-inner { + border-top: solid @scaled-one-px-value-ie @background-normal-ie; border-top: solid @scaled-one-px-value @background-normal; + border-left: solid @scaled-one-px-value-ie @background-normal-ie; border-left: solid @scaled-one-px-value @background-normal; height: 100%; } @@ -35,12 +40,15 @@ left: 1px; width: 10px; height: 9px; + background-color: @background-normal-ie; background-color: @background-normal; + border: solid @scaled-one-px-value-ie @border-regular-control-ie; border: solid @scaled-one-px-value @border-regular-control; border-top: none; border-radius: 2px; box-sizing: content-box; .thumb-bottom-inner { + border: solid @scaled-one-px-value-ie @border-regular-control-ie; border: solid @scaled-one-px-value @border-regular-control; border-top: none; height: 100%; @@ -49,10 +57,13 @@ &.active { .thumb-top { + border-top: solid @scaled-one-px-value-ie @border-regular-control-ie; border-top: solid @scaled-one-px-value @border-regular-control; + border-left: solid @scaled-one-px-value-ie @border-regular-control-ie; border-left: solid @scaled-one-px-value @border-regular-control; } .thumb-bottom { + border: solid @scaled-one-px-value-ie @border-control-focus-ie; border: solid @scaled-one-px-value @border-control-focus; border-top: none; } @@ -80,7 +91,9 @@ // filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#ffffff',GradientType=1 ); /* IE6-9 */ background-position: 0 0; + outline: @scaled-one-px-value-ie solid @border-control-focus-ie; outline: @scaled-one-px-value solid @border-control-focus; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; cursor: copy; } diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 93b704cb3..97cc5ec0b 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -43,6 +43,7 @@ height: 110px !important; position:relative; overflow:hidden; + border: @border-regular-control-ie solid @scaled-one-px-value-ie; border: @border-regular-control solid @scaled-one-px-value; } @@ -59,6 +60,7 @@ td { padding: 1px 8px 1px 0; + border-right: @border-regular-control-ie solid @scaled-one-px-value-ie; border-right: @border-regular-control solid @scaled-one-px-value; min-width: 30px; height: 17px; diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index ed569405f..070b9856f 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -26,10 +26,12 @@ &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; color: #fff; } @@ -82,6 +84,7 @@ width: 100%; height: 38px; padding: 10px 12px; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; label { @@ -118,6 +121,7 @@ width: 100%; height: 100%; opacity: 0.4; + background-color: @background-toolbar-ie; background-color: @background-toolbar; z-index: @zindex-tooltip + 1; } diff --git a/apps/common/main/resources/less/radiobox.less b/apps/common/main/resources/less/radiobox.less index ada744b2b..980de206d 100644 --- a/apps/common/main/resources/less/radiobox.less +++ b/apps/common/main/resources/less/radiobox.less @@ -18,7 +18,9 @@ width: 14px; height: 14px; + background: @background-normal-ie; background: @background-normal; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; border-radius: 50%; } @@ -28,6 +30,7 @@ &::before { content: ''; position: absolute; + background: @text-normal-ie; background: @text-normal; border-radius: 50%; width: 8px; diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less index c2d7f1ac4..18cb1de15 100644 --- a/apps/common/main/resources/less/scroller.less +++ b/apps/common/main/resources/less/scroller.less @@ -11,12 +11,14 @@ } .ps-scrollbar-x { + background-color: @background-toolbar-ie; background-color: @background-toolbar; &.always-visible-x { bottom: 0px; height: 9px; + background-color: @background-toolbar-ie; background-color: @background-toolbar; background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVChTY6AfOH/+/H9SaSYQg1RAlqZhCT5+/AgOSlJoOgY50DqSNZJhEwMDACkvNZLpune5AAAAAElFTkSuQmCC'); background-repeat: no-repeat; @@ -31,6 +33,7 @@ background-position: center 0; .border-radius(2px); + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; -o-transition: background-color .5s 0 linear; -webkit-transition: background-color .5s 0 linear; @@ -43,6 +46,7 @@ .hover { .ps-scrollbar-x { &.always-visible-x { + background-color: @border-regular-control-ie; background-color: @border-regular-control; background-position: center -7px; } @@ -52,7 +56,9 @@ &.in-scrolling { .ps-scrollbar-x { &.always-visible-x { + background-color: @border-regular-control-ie; background-color: @border-regular-control; + border-color: @border-regular-control-ie; border-color: @border-regular-control; background-position: center -7px; } @@ -72,12 +78,14 @@ } .ps-scrollbar-y { + background-color: @background-toolbar-ie; background-color: @background-toolbar; &.always-visible-y { right: 0px; width: 9px; + background-color: @background-toolbar-ie; background-color: @background-toolbar; .background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px); @@ -85,6 +93,7 @@ background-repeat: no-repeat; background-position: 0 center; .border-radius(2px); + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; -o-transition: background-color .5s 0 linear; -webkit-transition: background-color .5s 0 linear; @@ -97,6 +106,7 @@ .hover { .ps-scrollbar-y { &.always-visible-y { + background-color: @border-regular-control-ie; background-color: @border-regular-control; background-position: -7px center; } @@ -106,7 +116,9 @@ &.in-scrolling { .ps-scrollbar-y { &.always-visible-y { + background-color: @border-regular-control-ie; background-color: @border-regular-control; + border-color: @border-regular-control-ie; border-color: @border-regular-control; background-position: -7px center; } diff --git a/apps/common/main/resources/less/separator.less b/apps/common/main/resources/less/separator.less index 3fbf700be..d54ba5aed 100644 --- a/apps/common/main/resources/less/separator.less +++ b/apps/common/main/resources/less/separator.less @@ -9,6 +9,7 @@ .separator { display: inline-block; position: inherit; + border-left: @scaled-one-px-value-ie solid @border-divider-ie; border-left: @scaled-one-px-value solid @border-divider; vertical-align: top; padding: 0; @@ -20,6 +21,7 @@ border-left: none; border-right: none; + border-top: @scaled-one-px-value-ie solid @border-divider-ie; border-top: @scaled-one-px-value solid @border-divider; } } diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less index 7c5d13407..f64f479ff 100644 --- a/apps/common/main/resources/less/spinner.less +++ b/apps/common/main/resources/less/spinner.less @@ -39,7 +39,9 @@ position: absolute; top: 0; right: 1px; + border-top: @scaled-one-px-value-ie solid transparent; border-top: @scaled-one-px-value solid transparent; + border-bottom: @scaled-one-px-value-ie solid transparent; border-bottom: @scaled-one-px-value solid transparent; i { @@ -47,6 +49,7 @@ width: 4px; height: 4px; + border: solid @scaled-one-px-value-ie @icon-normal-ie; border: solid @scaled-one-px-value @icon-normal; border-bottom: none; border-right: none; @@ -58,6 +61,7 @@ } &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } } diff --git a/apps/common/main/resources/less/switcher.less b/apps/common/main/resources/less/switcher.less index 0fbe00a0b..c9900cd47 100644 --- a/apps/common/main/resources/less/switcher.less +++ b/apps/common/main/resources/less/switcher.less @@ -8,6 +8,7 @@ .sw-left { display: inline-block; height: 100%; + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; border-top-left-radius: 2px; border-bottom-left-radius: 2px; @@ -16,6 +17,7 @@ .sw-right { display: inline-block; height: 100%; + background-color: @border-regular-control-ie; background-color: @border-regular-control; border-top-right-radius: 2px; border-bottom-right-radius: 2px; @@ -27,7 +29,9 @@ right: auto; top: 0; height: 100%; + background-color: @background-normal-ie; background-color: @background-normal; + border: 1px solid @highlight-button-pressed-ie; border: 1px solid @highlight-button-pressed; border-radius: 3px; } @@ -43,10 +47,12 @@ cursor: default; .sw-left { + background-color: @border-regular-control-ie; background-color: @border-regular-control; } .thumb { + border-color: @border-regular-control-ie; border-color: @border-regular-control; } } diff --git a/apps/common/main/resources/less/symboltable.less b/apps/common/main/resources/less/symboltable.less index ae4d9366d..fbabd91f8 100644 --- a/apps/common/main/resources/less/symboltable.less +++ b/apps/common/main/resources/less/symboltable.less @@ -7,8 +7,11 @@ .cell{ width: 31px; height: 33px; + border-right: @scaled-one-px-value-ie solid @border-regular-control-ie; border-right: @scaled-one-px-value solid @border-regular-control; + border-bottom: @scaled-one-px-value-ie solid @border-regular-control-ie; border-bottom: @scaled-one-px-value solid @border-regular-control; + background: @background-normal-ie; background: @background-normal; align-content: center; vertical-align: middle; @@ -24,6 +27,7 @@ } .cell-selected{ + background-color: @border-preview-select-ie; background-color: @border-preview-select; color: white; } @@ -33,6 +37,7 @@ width: 100%; height: 32px; overflow: hidden; + border: @border-regular-control-ie solid @scaled-one-px-value-ie; border: @border-regular-control solid @scaled-one-px-value; } @@ -42,6 +47,7 @@ height: 132px; position:relative; overflow:hidden; + border: @border-regular-control-ie solid @scaled-one-px-value-ie; border: @border-regular-control solid @scaled-one-px-value; } diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 5146cd297..5c2cdc38a 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -99,6 +99,7 @@ .asc-synchronizetip { padding: 15px 8px 15px 15px; border-radius: 5px; + background-color: @background-notification-popover-ie; background-color: @background-notification-popover; overflow: visible; @@ -123,6 +124,7 @@ position: absolute; top: 5px; left: 8px; + background-color: @background-notification-popover-ie; background-color: @background-notification-popover; width: 15px; height: 15px; @@ -141,7 +143,9 @@ } .show-link label { + border-bottom: @scaled-one-px-value-ie dotted @text-link-ie; border-bottom: @scaled-one-px-value dotted @text-link; + color: @text-link-ie; color: @text-link; cursor: pointer; } diff --git a/apps/common/main/resources/less/tabbar.less b/apps/common/main/resources/less/tabbar.less index ef83e693a..20ef6a73f 100644 --- a/apps/common/main/resources/less/tabbar.less +++ b/apps/common/main/resources/less/tabbar.less @@ -8,8 +8,11 @@ &.active { > span, > span:hover, > span:focus { + background-color: @background-normal-ie; background-color: @background-normal; + color: @text-normal-ie; color: @text-normal; + border-color: @background-normal-ie; border-color: @background-normal; cursor: pointer; } @@ -21,7 +24,9 @@ > span { display: inline; + background-color: @background-toolbar-ie; background-color: @background-toolbar; + color: @text-secondary-ie; color: @text-secondary; padding-top: 0; @@ -36,7 +41,9 @@ } &:hover, &:focus { + background-color: @background-toolbar-ie; background-color: @background-toolbar; + border-color: @background-toolbar-ie; border-color: @background-toolbar; cursor: pointer; } diff --git a/apps/common/main/resources/less/theme-colorpalette.less b/apps/common/main/resources/less/theme-colorpalette.less index f54a10e4d..0ca52a67a 100644 --- a/apps/common/main/resources/less/theme-colorpalette.less +++ b/apps/common/main/resources/less/theme-colorpalette.less @@ -16,6 +16,7 @@ a { padding: 0; + border: @scaled-one-px-value-ie solid @background-normal-ie; border: @scaled-one-px-value solid @background-normal; float: left; text-decoration: none; @@ -24,24 +25,30 @@ cursor: pointer; em span { + border: @scaled-one-px-value-ie solid @border-color-shading-ie; border: @scaled-one-px-value solid @border-color-shading; } &:hover, &.selected { + border-color: @icon-normal-ie; border-color: @icon-normal; em span { + border-color: @background-normal-ie; border-color: @background-normal; } } } .dynamic-empty-color em span { + border:solid @scaled-one-px-value-ie @border-color-shading-ie; border:solid @scaled-one-px-value @border-color-shading; + background: @background-normal-ie; background: @background-normal; } .color-transparent { em span { + border:solid @scaled-one-px-value-ie @border-color-shading-ie; border:solid @scaled-one-px-value @border-color-shading; } } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 57010d6e8..51a6107bc 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -38,6 +38,7 @@ align-items: stretch; .extra { + background-color: @header-background-color-ie; background-color: @header-background-color; } @@ -54,6 +55,7 @@ .tabs { //flex-grow: 1; + background-color: @header-background-color-ie; background-color: @header-background-color; position: relative; overflow: hidden; @@ -74,10 +76,12 @@ height: 100%; &:hover { + background-color: @highlight-header-button-hover-ie; background-color: @highlight-header-button-hover; } &.active { + background-color: @background-toolbar-ie; background-color: @background-toolbar; } @@ -89,11 +93,13 @@ cursor: default; font-size: 12px; text-align: center; + color: @text-toolbar-header-ie; color: @text-toolbar-header; } &.active { > a { + color: @text-normal-ie; color: @text-normal; } } @@ -125,6 +131,7 @@ } &.left{ + box-shadow: 5px 0 20px 5px @header-background-color-ie; box-shadow: 5px 0 20px 5px @header-background-color; &:after { @@ -133,6 +140,7 @@ } } &.right{ + box-shadow: -5px 0 20px 5px @header-background-color-ie; box-shadow: -5px 0 20px 5px @header-background-color; &:after { @@ -191,8 +199,10 @@ /**/ } + background-color: @background-toolbar-ie; background-color: @background-toolbar; @minus-px: calc(-1 * @scaled-one-px-value); + .box-inner-shadow(0 -1px @border-toolbar-ie); .box-inner-shadow(0 @minus-px @border-toolbar); .group { @@ -251,6 +261,7 @@ } &.border { + border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control; .border-radius(1px); width: 22px; @@ -269,6 +280,7 @@ right: 0; bottom: 0; opacity: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; /* z-index: @zindex-tooltip + 1; */ } @@ -310,6 +322,7 @@ .tabs, .extra { background-color: transparent; + box-shadow: inset 0 -1px 0 0 @border-regular-control-ie; box-shadow: inset 0 -1px 0 0 @border-regular-control; } @@ -324,6 +337,7 @@ &:after { //transition: opacity .1s; //transition: bottom .1s; + border-top: @underscore_height solid @text-normal-ie; border-top: @underscore_height solid @text-normal; content: ''; position: absolute; @@ -347,6 +361,7 @@ } > a { + color: @text-normal-ie; color: @text-normal; &::after { @@ -373,14 +388,17 @@ .tabs .scroll { &.left { + box-shadow: 5px 0 20px 5px @background-toolbar-ie; box-shadow: 5px 0 20px 5px @background-toolbar; } &.right { + box-shadow: -5px 0 20px 5px @background-toolbar-ie; box-shadow: -5px 0 20px 5px @background-toolbar; } &:after { + border-color: @text-normal-ie; border-color: @text-normal; } } @@ -392,26 +410,32 @@ } svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; } .caption { + color: @text-normal-ie; color: @text-normal; } &:hover:not(.disabled) { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &:active, &.active { &:not(.disabled) { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; } .caption { + color: @text-inverse-ie; color: @text-inverse; } } @@ -424,16 +448,19 @@ } svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; } } #rib-doc-name { + color: @text-normal-ie; color: @text-normal; } &.editor-native-color { .tabs li:after { + border-color: @header-background-color-ie; border-color: @header-background-color; } } @@ -468,6 +495,7 @@ .btn-toolbar { &:active { svg.icon { + fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; } } @@ -475,14 +503,17 @@ svg.icon { background-image: none; + fill: @icon-normal-ie; fill: @icon-normal; } &.borders--small { border-radius: 2px; + background-color: @background-normal-ie; background-color: @background-normal; &:not(:active) { + box-shadow: inset 0 0 0 @scaled-one-px-value-ie @border-regular-control-ie; box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; } @@ -509,6 +540,7 @@ svg.icon { display: inline-block; vertical-align: middle; + fill: @icon-normal-ie; fill: @icon-normal; } @@ -517,6 +549,7 @@ } .item-equation { + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .equation-icon { @@ -554,6 +587,7 @@ svg.icon { display: inline-block; vertical-align: middle; + fill: @icon-normal-ie; fill: @icon-normal; } } @@ -570,6 +604,7 @@ width: 12px; height: 12px; margin-right: 2px; + border: @scaled-one-px-value-ie solid @border-color-shading-ie; border: @scaled-one-px-value solid @border-color-shading; vertical-align: middle; } @@ -583,9 +618,11 @@ display: none !important; } &, &:hover, &:focus { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; color: @dropdown-link-active-color; span.color { + border-color: @icon-normal-ie; border-color: @icon-normal; } } @@ -593,6 +630,7 @@ } .item-equation { + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .background-ximage-v2('toolbar/math.png', 1500px); } diff --git a/apps/common/main/resources/less/tooltip.less b/apps/common/main/resources/less/tooltip.less index b35084b76..45d4ae489 100644 --- a/apps/common/main/resources/less/tooltip.less +++ b/apps/common/main/resources/less/tooltip.less @@ -15,6 +15,7 @@ &.top-right .tooltip-arrow { bottom: 1px; border-width: 5px 5px 0; + border-top-color: @background-normal-ie; border-top-color: @background-normal; } @@ -32,15 +33,19 @@ &.bottom-right .tooltip-arrow { top: 1px; border-width: 0 5px 5px; + border-bottom-color: @background-normal-ie; border-bottom-color: @background-normal; } } .tooltip-inner { font-size: 11px; + background-color: @background-normal-ie; background-color: @background-normal; + color: @text-normal-ie; color: @text-normal; padding: 5px 12px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .box-shadow(0 6px 12px rgba(0, 0, 0, 0.175)); background-clip: padding-box; diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less index f27e0539d..cd7e0e002 100644 --- a/apps/common/main/resources/less/treeview.less +++ b/apps/common/main/resources/less/treeview.less @@ -12,6 +12,7 @@ text-align: center; height: 100%; width: 100%; + color: @text-tertiary-ie; color: @text-tertiary; td { padding: 5px; @@ -20,6 +21,7 @@ } &:focus { + border-color: @border-preview-select-ie; border-color: @border-preview-select; } @@ -31,10 +33,12 @@ &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.selected { + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } @@ -58,6 +62,7 @@ text-overflow: ellipsis; &.empty { + color: @text-tertiary-ie; color: @text-tertiary; font-style: italic; } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 3318e5c06..5f38f8609 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -30,7 +30,9 @@ z-index: @zindex-modal-background; box-shadow: 0 5px 15px rgba(0,0,0,0.2); border-radius: 5px; + background-color: @background-normal-ie; background-color: @background-normal; + border: solid @scaled-one-px-value-ie @border-toolbar-ie; border: solid @scaled-one-px-value @border-toolbar; left: 0; @@ -50,6 +52,7 @@ top: 0; text-overflow: ellipsis; + color: @text-normal-ie; color: @text-normal; text-align: center; font-size: 12px; @@ -57,7 +60,9 @@ vertical-align: bottom; line-height: 26px; + background: @background-toolbar-ie; background: @background-toolbar; + border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie; border-bottom: solid @scaled-one-px-value @border-toolbar; cursor: move; @@ -95,9 +100,12 @@ content: ' '; position: absolute; left: calc(7px/@pixel-ratio-factor); + top: @scaled-one-px-value-ie; top: @scaled-one-px-value; height: 14px; + width: @scaled-one-px-value-ie; width: @scaled-one-px-value; + background-color: @icon-normal-ie; background-color: @icon-normal; } @@ -116,6 +124,7 @@ line-height: 14px; font-size: 14px; font-weight: bold; + color: @text-normal-ie; color: @text-normal; opacity: 0.7; @@ -146,6 +155,7 @@ position: absolute; top: 34px; width: 100%; + background-color: @background-normal-ie; background-color: @background-normal; } @@ -209,9 +219,11 @@ a { text-decoration: underline; + color: @text-normal-ie; color: @text-normal; &:focus, &:hover { + color: @text-normal-ie; color: @text-normal; } } @@ -270,7 +282,9 @@ width: 5px; height: 5px; z-index: 1; + background: @background-toolbar-ie; background: @background-toolbar; + border: @scaled-one-px-value-ie none @border-toolbar-ie; border: @scaled-one-px-value none @border-toolbar; &.left { From f9c52cb25282588d27a4c9c602011bee9fbc01f2 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 10:22:48 +0300 Subject: [PATCH 4/7] [dark theme] fix DE styles for IE --- .../documenteditor/main/resources/less/filemenu.less | 12 ++++++++++++ apps/documenteditor/main/resources/less/layout.less | 2 ++ .../documenteditor/main/resources/less/leftmenu.less | 1 + .../main/resources/less/navigation.less | 1 + .../main/resources/less/rightmenu.less | 3 +++ .../main/resources/less/statusbar.less | 2 ++ apps/documenteditor/main/resources/less/toolbar.less | 12 ++++++++++++ .../main/resources/less/variables.less | 1 + 8 files changed, 34 insertions(+) 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 From 8847c328a6f3969edc90c7e2c1fc9980c68309a8 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 11:36:00 +0300 Subject: [PATCH 5/7] [dark theme] fix PE styles for IE --- .../main/resources/less/document-preview.less | 1 + .../presentationeditor/main/resources/less/layout.less | 2 ++ .../main/resources/less/leftmenu.less | 10 ++++++++++ .../main/resources/less/rightmenu.less | 3 +++ .../main/resources/less/statusbar.less | 1 + .../main/resources/less/toolbar.less | 3 +++ .../main/resources/less/variables.less | 1 + 7 files changed, 21 insertions(+) diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less index 80a151c48..96bdb1379 100644 --- a/apps/presentationeditor/main/resources/less/document-preview.less +++ b/apps/presentationeditor/main/resources/less/document-preview.less @@ -3,6 +3,7 @@ } .preview-controls { display: table; + background: @background-toolbar-ie; background: @background-toolbar; height: 35px; z-index: 10; diff --git a/apps/presentationeditor/main/resources/less/layout.less b/apps/presentationeditor/main/resources/less/layout.less index ad91dad2c..218dbbe1e 100644 --- a/apps/presentationeditor/main/resources/less/layout.less +++ b/apps/presentationeditor/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 { @@ -50,6 +51,7 @@ label { top:0; right: 0; bottom: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index df9d5d857..8ea247b1b 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -5,7 +5,9 @@ border-right: 0 none; &.move { + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; opacity: 0.4; } @@ -20,6 +22,7 @@ top: 0; position: absolute; z-index: @zindex-dropdown - 5; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } @@ -57,11 +60,13 @@ margin-bottom: 3px; &:hover { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } &.active { outline: 0; + background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; > a { @@ -115,6 +120,7 @@ .panel-context { width: 100%; padding-left: 260px; + background-color: @background-normal-ie; background-color: @background-normal; .content-box { @@ -259,6 +265,7 @@ &:hover, &.over { + background-color: @background-toolbar-ie; background-color: @background-toolbar; } @@ -300,6 +307,7 @@ } .dataview { + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { @@ -314,10 +322,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/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index b9349b5de..3f24d4c27 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -21,9 +21,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; } @@ -92,6 +94,7 @@ &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; .caret { diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index 380c861fe..fe9ae6203 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -167,6 +167,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/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index d8defcfda..5f5516b95 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -29,6 +29,7 @@ &:hover, &.selected { .layout > div:first-child { + .box-shadow(0 0 0 2px @highlight-button-pressed-ie); .box-shadow(0 0 0 2px @highlight-button-pressed); } } @@ -96,7 +97,9 @@ #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; } diff --git a/apps/presentationeditor/main/resources/less/variables.less b/apps/presentationeditor/main/resources/less/variables.less index 1529f99e9..7e1a0f43d 100644 --- a/apps/presentationeditor/main/resources/less/variables.less +++ b/apps/presentationeditor/main/resources/less/variables.less @@ -1,5 +1,6 @@ // Paths // ------------------------- +@header-background-color-ie: @toolbar-header-presentation-ie; @header-background-color: var(--toolbar-header-presentation); // Grays From 66ff7cf201f906502807fee379f9b28000a64a5e Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 11:37:33 +0300 Subject: [PATCH 6/7] [dark theme] fix SSE stylesheets for IE support --- .../resources/less/advanced-settings.less | 1 + .../main/resources/less/celleditor.less | 13 ++++++++++ .../main/resources/less/filterdialog.less | 6 +++++ .../main/resources/less/layout.less | 4 ++++ .../main/resources/less/leftmenu.less | 14 +++++++++++ .../main/resources/less/rightmenu.less | 3 +++ .../main/resources/less/spellcheck.less | 1 + .../main/resources/less/statusbar.less | 24 +++++++++++++++++++ .../main/resources/less/toolbar.less | 4 ++++ .../main/resources/less/variables.less | 1 + 10 files changed, 71 insertions(+) diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index 29b010977..42eebbcdb 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -92,6 +92,7 @@ .sort-dialog-btn-caret { display: inline-block; + border: @scaled-one-px-value-ie solid #cfcfcf; border: @scaled-one-px-value solid #cfcfcf; border-radius: 1px; } diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 135135a97..1cf73a6e6 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -1,13 +1,18 @@ #cell-editing-box { + border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie; border-bottom: solid @scaled-one-px-value @border-toolbar; + border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; border-left: solid @scaled-one-px-value @border-toolbar; min-height: 20px; + background-color: @background-normal-ie; background-color: @background-normal; .ce-group-name { float: left; height: 20px; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; + background-color: @background-toolbar-ie; background-color: @background-toolbar; #ce-cell-name { @@ -17,11 +22,13 @@ vertical-align: top; display: inline-block; border: 0 none; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; transition: none; -webkit-transition: none; &[disabled] { + color: @border-preview-select-ie; color: @border-preview-select; opacity: 0.5; } @@ -31,9 +38,11 @@ display: inline-block; position: absolute; left: 80px; + background-color: @background-toolbar-ie; background-color: @background-toolbar; button { + background-color: @background-normal-ie; background-color: @background-normal; height: 19px; @@ -75,6 +84,7 @@ padding-left: 1px; margin: 0 16px 0 120px; height: 100%; + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; #ce-cell-content { @@ -87,6 +97,7 @@ padding-bottom: 0; &[disabled] { + color: @border-preview-select-ie; color: @border-preview-select; opacity: 0.5; } @@ -102,7 +113,9 @@ border-bottom: 0 none; &.move { + border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value solid @border-toolbar; + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; opacity: 0.4; } diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index 0a359c598..f0cba4209 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -17,14 +17,19 @@ } .border-values { + border: @scaled-one-px-value-ie solid @input-border; border: @scaled-one-px-value solid @input-border; .item { &.selected { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; + border-color: @highlight-button-hover-ie; border-color: @highlight-button-hover; + color: @text-normal-ie; color: @text-normal; border-style: solid; + border-width: @scaled-one-px-value-ie 0; border-width: @scaled-one-px-value 0; } } @@ -94,6 +99,7 @@ } &.border { + border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(1px); width: 22px; diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less index a4fbc2a08..54b5f4216 100644 --- a/apps/spreadsheeteditor/main/resources/less/layout.less +++ b/apps/spreadsheeteditor/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 { @@ -33,6 +34,7 @@ label { top:0; right: 0; bottom: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } @@ -52,7 +54,9 @@ label { } #editor_sdk { + border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value solid @border-toolbar; + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; } diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 8b732e6dc..bc93138a4 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -5,7 +5,9 @@ border-right: 0 none; &.move { + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; opacity: 0.4; } @@ -20,6 +22,7 @@ top: 0; position: absolute; z-index: @zindex-dropdown - 5; + background-color: @background-toolbar-ie; background-color: @background-toolbar; overflow: hidden; } @@ -57,11 +60,13 @@ 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 { @@ -71,6 +76,7 @@ &.disabled > a { cursor: default; + color: @border-regular-control-ie; color: @border-regular-control; } } @@ -105,6 +111,7 @@ .panel-context { width: 100%; padding-left: 260px; + background-color: @background-normal-ie; background-color: @background-normal; .content-box { @@ -155,6 +162,7 @@ #id-settings-menu { .dataview { + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { @@ -178,10 +186,12 @@ &: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; @@ -323,6 +333,7 @@ &:hover, &.over { + background-color: @background-toolbar-ie; background-color: @background-toolbar; } @@ -364,6 +375,7 @@ } .dataview { + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { @@ -378,10 +390,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/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index a0d49f3f2..ebb997c02 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -15,9 +15,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; } @@ -162,6 +164,7 @@ &:hover, &.over { + background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; .caret { diff --git a/apps/spreadsheeteditor/main/resources/less/spellcheck.less b/apps/spreadsheeteditor/main/resources/less/spellcheck.less index a86131602..1582d2759 100644 --- a/apps/spreadsheeteditor/main/resources/less/spellcheck.less +++ b/apps/spreadsheeteditor/main/resources/less/spellcheck.less @@ -19,6 +19,7 @@ #spellcheck-suggestions-list { width: 100%; height: 116px; + background-color: @background-normal-ie; background-color: @background-normal; margin-bottom: 8px; } diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 0d5f76f26..180ddf70d 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -23,6 +23,7 @@ text-align: center; &.disabled { + color: @border-preview-select-ie; color: @border-preview-select; cursor: default; } @@ -93,6 +94,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; } @@ -111,7 +113,9 @@ #status-addtabs-box { float: left; padding: 3px 8px 0 8px; + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; height: 25px; } @@ -155,6 +159,7 @@ display: flex; > li { + background-color: @background-toolbar-ie; background-color: @background-toolbar; &:first-of-type { @@ -175,22 +180,31 @@ padding: 0 10px 0; line-height: 24px; margin-right: -1px; + background-color: @background-toolbar-additional-ie; background-color: @background-toolbar-additional; outline: none; + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; + border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value solid @border-toolbar; + border-top: @scaled-one-px-value-ie solid @border-toolbar-ie; border-top: @scaled-one-px-value solid @border-toolbar; &:hover { + border-top-color: @border-toolbar-ie; border-top-color: @border-toolbar; + border-bottom-color: @border-toolbar-ie; border-bottom-color: @border-toolbar; + color: @text-normal-ie !important; color: @text-normal !important; } } &.active { > span { + border-bottom-color: @background-toolbar-ie; border-bottom-color: @background-toolbar; + background-color: @background-toolbar-ie; background-color: @background-toolbar; outline: none; @@ -203,9 +217,12 @@ &.selected { > span { + border-bottom-color: @highlight-header-button-hover-ie; border-bottom-color: @highlight-header-button-hover; + background-color: @background-normal-ie; background-color: @background-normal; box-shadow: 0px 4px 0 #49795d inset; + color: @text-normal-ie; color: @text-normal; } } @@ -257,6 +274,7 @@ &:not(.active) { > span { + color: @text-secondary-ie; color: @text-secondary; } } @@ -270,13 +288,16 @@ } > span { + border-left: 2px solid @text-normal-ie; border-left: 2px solid @text-normal; padding-left: 9px; } &.right { > span { + border-left: @scaled-one-px-value-ie solid @border-toolbar-ie; border-left: @scaled-one-px-value solid @border-toolbar; + border-right: 2px solid @text-normal-ie; border-right: 2px solid @text-normal; padding-right: 9px; padding-left: 10px; @@ -295,10 +316,12 @@ } &.separator-item { margin-left: 20px; + width: @scaled-one-px-value-ie; width: @scaled-one-px-value; > span { padding: 0; margin: 0; + width: @scaled-one-px-value-ie; width: @scaled-one-px-value; &::after { content: none; @@ -390,6 +413,7 @@ width: 36px; height: 100%; opacity: 0; + background-color: @background-toolbar-ie; background-color: @background-toolbar; z-index: @zindex-modal - 1; } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 2818576b2..4f4345f59 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -106,7 +106,9 @@ #id-toolbar-menu-auto-fontcolor > a.selected, #id-toolbar-menu-auto-fontcolor > a:hover { span { + outline: @scaled-one-px-value-ie solid @border-regular-control-ie; outline: @scaled-one-px-value solid @border-regular-control; + border: @scaled-one-px-value-ie solid @background-normal-ie; border: @scaled-one-px-value solid @background-normal; } } @@ -115,7 +117,9 @@ #autocorrect-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; } diff --git a/apps/spreadsheeteditor/main/resources/less/variables.less b/apps/spreadsheeteditor/main/resources/less/variables.less index 596e73e46..bf8293b92 100644 --- a/apps/spreadsheeteditor/main/resources/less/variables.less +++ b/apps/spreadsheeteditor/main/resources/less/variables.less @@ -1,6 +1,7 @@ // // Variables // -------------------------------------------------- +@header-background-color-ie: @toolbar-header-spreadsheet-ie; @header-background-color: var(--toolbar-header-spreadsheet); // Active color From f34cb00e98f2c72e68b69345bc91db74b21dbd36 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 16 Feb 2021 15:08:39 +0300 Subject: [PATCH 7/7] [dark theme] hide theme's option for IE --- apps/common/main/lib/controller/Themes.js | 4 ++++ apps/documenteditor/main/app/controller/Main.js | 1 - apps/documenteditor/main/app/controller/Viewport.js | 2 +- apps/documenteditor/main/app/view/FileMenuPanels.js | 5 ++++- apps/presentationeditor/main/app/controller/Main.js | 1 - apps/presentationeditor/main/app/controller/Viewport.js | 2 +- apps/presentationeditor/main/app/view/FileMenuPanels.js | 6 +++++- apps/spreadsheeteditor/main/app/controller/Main.js | 1 - apps/spreadsheeteditor/main/app/controller/Viewport.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 6 +++++- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 722f42cf7..1f09cb8a1 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -39,6 +39,10 @@ define([ // getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); }, + available: function () { + return !Common.Utils.isIE; + }, + current: function () { return Common.localStorage.getItem('ui-theme', 'theme-light'); }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index bd3df33b7..e2a67324f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -387,7 +387,6 @@ define([ this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison"); this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-controls"); this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); - this.appOptions.canChangeUITheme = true; this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this)); diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index e3728a889..4262f468d 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -313,7 +313,7 @@ define([ cls : 'btn-toolbar' })).on('click', _on_btn_zoom.bind(me, 'up')); - if ( config.canChangeUITheme ) { + if ( Common.UI.Themes.available() ) { var mnuitemDarkTheme = new Common.UI.MenuItem({ caption: me.header.textDarkTheme, checked: Common.UI.Themes.isDarkTheme(), diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 15a47b721..757772616 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -244,7 +244,7 @@ define([ '', '','', /** coauthoring end **/ - '', + '', '', '', '','', @@ -535,6 +535,9 @@ define([ /** coauthoring end **/ $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); + if ( !Common.UI.Themes.available() ) { + $('tr.themes, tr.themes + tr.divider', this.el).hide(); + } }, setApi: function(o) { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index c005f1997..ef200e2b0 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -345,7 +345,6 @@ define([ this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures; this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings; this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); - this.appOptions.canChangeUITheme = true; this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this)); diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 1627ca698..57d6e7337 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -316,7 +316,7 @@ define([ cls : 'btn-toolbar' })).on('click', _on_btn_zoom.bind(me, 'up')); - if ( config.canChangeUITheme ) { + if ( Common.UI.Themes.available() ) { var mnuitemDarkTheme = new Common.UI.MenuItem({ caption: me.header.textDarkTheme, checked: Common.UI.Themes.isDarkTheme(), diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 6b6a3fbce..d11a5047d 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -214,7 +214,7 @@ define([ '', '','', /** coauthoring end **/ - '', + '', '', '', '','', @@ -471,6 +471,10 @@ define([ $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); /** coauthoring end **/ $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); + + if ( !Common.UI.Themes.available() ) { + $('tr.themes, tr.themes + tr.divider', this.el).hide(); + } }, setApi: function(o) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index d1e10747d..9303a01b3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -374,7 +374,6 @@ define([ this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink; this.appOptions.canFeaturePivot = true; this.appOptions.canFeatureViews = !!this.api.asc_isSupportFeature("sheet-views"); - this.appOptions.canChangeUITheme = true; if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge) Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this)); diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 3d2042754..e4fda19c3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -327,7 +327,7 @@ define([ cls : 'btn-toolbar' })).on('click', _on_btn_zoom.bind(me, 'up')); - if ( config.canChangeUITheme ) { + if ( Common.UI.Themes.available() ) { var mnuitemDarkTheme = new Common.UI.MenuItem({ caption: me.header.textDarkTheme, checked: Common.UI.Themes.isDarkTheme(), diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 91306012c..6223b070f 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -691,7 +691,7 @@ define([ '', '','', /** coauthoring end **/ - '', + '', '', '', '','', @@ -1080,6 +1080,10 @@ define([ $('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring? 'show' : 'hide'](); $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); + + if ( !Common.UI.Themes.available() ) { + $('tr.themes, tr.themes + tr.divider', this.el).hide(); + } }, setApi: function(api) {