Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/pe-slide-size

Browse source
This commit is contained in:
Julia Radzhabova 2021-02-16 15:28:45 +03:00
parent 36856e2e20 f21961a015
commit 7bca00ebc5
84 changed files with 601 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/Themes.js
View file

@ -39,6 +39,10 @@ define([
// getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); // getComputedStyle(document.documentElement).getPropertyValue('--background-normal');
}, },
available: function () {
return !Common.Utils.isIE;
},
current: function () { current: function () {
return Common.localStorage.getItem('ui-theme', 'theme-light'); return Common.localStorage.getItem('ui-theme', 'theme-light');
}, },

3
apps/common/main/lib/util/utils.js
View file

@ -141,7 +141,7 @@ Common.Utils = _.extend(new(function() {
$root.removeClass('pixel-ratio__2'); $root.removeClass('pixel-ratio__2');
$root.addClass('pixel-ratio__1_5'); $root.addClass('pixel-ratio__1_5');
} else } else
if ( scale.devicePixelRatio > 1.5 && scale.devicePixelRatio < 2 ) { if ( scale.devicePixelRatio > 1.5 /*&& scale.devicePixelRatio <= 2*/ ) {
$root.addClass('pixel-ratio__2'); $root.addClass('pixel-ratio__2');
$root.removeClass('pixel-ratio__1_5'); $root.removeClass('pixel-ratio__1_5');
} else { } else {
@ -154,6 +154,7 @@ Common.Utils = _.extend(new(function() {
me.zoom = 1; me.zoom = 1;
me.innerWidth = window.innerWidth; me.innerWidth = window.innerWidth;
me.innerHeight = window.innerHeight; me.innerHeight = window.innerHeight;
if ( isIE ) $(document.body).addClass('ie');
checkSize(); checkSize();
$(window).on('resize', checkSize); $(window).on('resize', checkSize);

BIN
apps/common/main/resources/img/combo-border-size/BorderSize.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 208 B

BIN
apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 231 B

BIN
apps/common/main/resources/img/combo-border-size/BorderSize@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 694 B

1
apps/common/main/resources/img/toolbar/1.5x/big/.css.handlebars
View file

@ -12,6 +12,7 @@
} }
.toolbar__icon.toolbar__icon-big { .toolbar__icon.toolbar__icon-big {
background-size: 56px auto;
background-size: var(--big-icon-background-image-width) auto; background-size: var(--big-icon-background-image-width) auto;
} }
{{/spritesheet}} {{/spritesheet}}

1
apps/common/main/resources/img/toolbar/1.5x/huge/.css.handlebars
View file

@ -1,5 +1,6 @@
{{#spritesheet}} {{#spritesheet}}
.options__icon.options__icon-huge { .options__icon.options__icon-huge {
background-size: 80px auto;
background-size: var(--huge-icon-background-image-width) auto; background-size: var(--huge-icon-background-image-width) auto;
} }
{{/spritesheet}} {{/spritesheet}}

7
apps/common/main/resources/img/toolbar/1x/.css.handlebars
View file

@ -3,6 +3,9 @@
&.active, &:active { &.active, &:active {
&:not(:disabled):not(.disabled) { &:not(:disabled):not(.disabled) {
.toolbar__icon { .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); background-position-x: var(--button-small-active-icon-offset-x, 0);
} }
} }
@ -10,6 +13,7 @@
} }
.menu__icon { .menu__icon {
.no-checkmark.checked & { .no-checkmark.checked & {
background-position-x: 0;
background-position-x: @menu-icon-item-checked-offset-x; background-position-x: @menu-icon-item-checked-offset-x;
} }
} }
@ -19,6 +23,9 @@
{{/spritesheet}} {{/spritesheet}}
{{#sprites}} {{#sprites}}
{{#parselang name}}.{{name}}{{/parselang}} { {{#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}}; background-position: var(--button-small-normal-icon-offset-x, 0) {{px.offset_y}};
} }
{{/sprites}} {{/sprites}}

3
apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
View file

@ -4,6 +4,7 @@
&.active, &:active { &.active, &:active {
&:not(:disabled):not(.disabled) { &:not(:disabled):not(.disabled) {
.toolbar__icon { .toolbar__icon {
background-position-x: 0;
background-position-x: var(--button-huge-active-icon-offset-x,0); background-position-x: var(--button-huge-active-icon-offset-x,0);
} }
} }
@ -13,6 +14,7 @@
&.active, &:active { &.active, &:active {
&:not(:disabled):not(.disabled) { &:not(:disabled):not(.disabled) {
.toolbar__icon.toolbar__icon-big { .toolbar__icon.toolbar__icon-big {
background-position-x: 0;
background-position-x: var(--button-huge-active-icon-offset-x,0); background-position-x: var(--button-huge-active-icon-offset-x,0);
} }
} }
@ -29,6 +31,7 @@
{{#parselang name}}.x-huge .{{name}}{{/parselang}}, {{#parselang name}}.x-huge .{{name}}{{/parselang}},
.toolbar__icon-big.{{name}} .toolbar__icon-big.{{name}}
{ {
background-position: 0 {{px.offset_y}};
background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}}; background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}};
} }
{{/sprites}} {{/sprites}}

6
apps/common/main/resources/less/about.less
View file

@ -23,6 +23,7 @@
margin: 0 30px; margin: 0 30px;
font: 12px Tahoma; font: 12px Tahoma;
letter-spacing: 1px; letter-spacing: 1px;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
@ -30,11 +31,13 @@
.asc-about-version { .asc-about-version {
font: 15px Tahoma; font: 15px Tahoma;
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
} }
.asc-about-companyname { .asc-about-companyname {
font: bold 15px Tahoma; font: bold 15px Tahoma;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
@ -43,10 +46,12 @@
&.asc-about-desc-name, &.asc-about-desc-name,
&.asc-about-lic { &.asc-about-lic {
font: 12px Tahoma; font: 12px Tahoma;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
&.asc-about-desc-name { &.asc-about-desc-name {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
white-space: pre; white-space: pre;
} }
@ -59,6 +64,7 @@
a { a {
font: 12px Tahoma; font: 12px Tahoma;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }

64
apps/common/main/resources/less/buttons.less
View file

@ -4,7 +4,9 @@
.btn { .btn {
border-radius: 1px; border-radius: 1px;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
border-width: @scaled-one-px-value-ie;
border-width: @scaled-one-px-value; border-width: @scaled-one-px-value;
.btnsize(@value) { .btnsize(@value) {
@ -44,10 +46,12 @@
&:focus { &:focus {
outline: 0; outline: 0;
outline-offset: 0; outline-offset: 0;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
&:hover { &:hover {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
@ -59,6 +63,7 @@
.caret { .caret {
width: 4px; width: 4px;
height: 4px; height: 4px;
border: solid 1px @icon-normal-ie;
border: solid 1px @icon-normal; border: solid 1px @icon-normal;
border-bottom: none; border-bottom: none;
border-right: none; border-right: none;
@ -104,6 +109,7 @@
&::after { &::after {
content: ' '; content: ' ';
position: absolute; position: absolute;
border: 1px solid @icon-notification-badge-ie;
border: 1px solid @icon-notification-badge; border: 1px solid @icon-notification-badge;
border-left: 0 none; border-left: 0 none;
border-right: 0 none; border-right: 0 none;
@ -119,6 +125,7 @@
width: 10px; width: 10px;
height: 7px; height: 7px;
bottom: 2px; bottom: 2px;
background-color: @background-notification-badge-ie;
background-color: @background-notification-badge; background-color: @background-notification-badge;
border-radius: 2px; border-radius: 2px;
right: 0; right: 0;
@ -135,6 +142,7 @@
width: 8px; width: 8px;
height: 8px; height: 8px;
background-color: transparent; background-color: transparent;
border: solid 1px @text-normal-ie;
border: solid 1px @text-normal; border: solid 1px @text-normal;
border-bottom: none; border-bottom: none;
border-right: none; border-right: none;
@ -167,6 +175,7 @@
&.active:not(.disabled) { &.active:not(.disabled) {
.caret-up, .caret-down { .caret-up, .caret-down {
&::after { &::after {
border-color: @background-normal-ie;
border-color: @background-normal; border-color: @background-normal;
} }
} }
@ -296,6 +305,7 @@
.btn.small; .btn.small;
&.bg-white { &.bg-white {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
} }
@ -307,13 +317,16 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
@ -373,6 +386,7 @@
height: 3px; height: 3px;
background-color: red; background-color: red;
&.bordered { &.bordered {
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control; border: 1px solid @border-regular-control;
} }
@ -395,12 +409,15 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
@ -512,6 +529,7 @@
&.over:not(.disabled), &.over:not(.disabled),
&.open { &.open {
box-shadow: inset 0 0 0 1px @highlight-button-hover-ie;
box-shadow: inset 0 0 0 1px @highlight-button-hover; box-shadow: inset 0 0 0 1px @highlight-button-hover;
button:not(.active):not(.btn-text-split-default) { button:not(.active):not(.btn-text-split-default) {
@ -523,12 +541,14 @@
button { button {
&:not(.active) { &:not(.active) {
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
} }
&:active, &:active,
&:active:hover { &:active:hover {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
} }
@ -537,6 +557,7 @@
&.open { &.open {
> button:not(.active) { > button:not(.active) {
&:last-of-type { &:last-of-type {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
} }
@ -547,6 +568,7 @@
} }
button.active:not(.disabled) { button.active:not(.disabled) {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
@ -559,7 +581,9 @@
.btn-color { .btn-color {
width: 45px; width: 45px;
height: 22px; 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; 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:@scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -567,6 +591,7 @@
float: left; float: left;
width: 100%; width: 100%;
height: 100%; height: 100%;
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading; border: @scaled-one-px-value solid @border-color-shading;
background-color: transparent; background-color: transparent;
} }
@ -582,6 +607,7 @@
.over, .over,
&:active, &:active,
&.active { &.active {
background: @background-normal-ie !important;
background: @background-normal !important; background: @background-normal !important;
.box-shadow(none) !important; .box-shadow(none) !important;
} }
@ -593,6 +619,7 @@
.color-transparent { .color-transparent {
&:before { &:before {
border-right: @scaled-one-px-value-ie solid red;
border-right: @scaled-one-px-value solid red; border-right: @scaled-one-px-value solid red;
height: 34px; height: 34px;
transform: translate(16px, -9px) rotate(62deg); transform: translate(16px, -9px) rotate(62deg);
@ -612,7 +639,9 @@
li > a.selected, li > a.selected,
li > a:hover { li > a:hover {
span.color-auto { span.color-auto {
outline: @scaled-one-px-value-ie solid @border-regular-control-ie;
outline: @scaled-one-px-value solid @border-regular-control; 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; border: @scaled-one-px-value solid @background-normal;
} }
} }
@ -627,6 +656,7 @@
background-color: transparent; background-color: transparent;
&.bg-white { &.bg-white {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
} }
@ -641,16 +671,19 @@
background-repeat: no-repeat; 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; box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&:active, &:active,
&.active { &.active {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
} }
@ -658,7 +691,9 @@
.btn-text-default { .btn-text-default {
width: 75px; width: 75px;
height: 22px; height: 22px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -670,13 +705,17 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie !important;
background-color: @highlight-button-hover !important; background-color: @highlight-button-hover !important;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
background-color: @highlight-button-pressed-ie !important;
background-color: @highlight-button-pressed !important; background-color: @highlight-button-pressed !important;
border-color: @highlight-button-pressed-ie;
border-color: @highlight-button-pressed; border-color: @highlight-button-pressed;
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
@ -689,7 +728,9 @@
.btn-text-menu-default { .btn-text-menu-default {
width: 100%; width: 100%;
height: 22px; height: 22px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -705,11 +746,13 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie !important;
background-color: @highlight-button-hover !important; background-color: @highlight-button-hover !important;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
background-color: @highlight-button-pressed-ie !important;
background-color: @highlight-button-pressed !important; background-color: @highlight-button-pressed !important;
color: white; color: white;
} }
@ -723,7 +766,9 @@
.btn-text-split-default { .btn-text-split-default {
width: 75px; width: 75px;
height: 22px; height: 22px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -737,13 +782,17 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie !important;
background-color: @highlight-button-hover !important; background-color: @highlight-button-hover !important;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
background-color: @highlight-button-pressed-ie !important;
background-color: @highlight-button-pressed !important; background-color: @highlight-button-pressed !important;
border-color: @highlight-button-pressed-ie;
border-color: @highlight-button-pressed; border-color: @highlight-button-pressed;
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
@ -756,7 +805,9 @@
.btn-icon-default { .btn-icon-default {
width: 45px; width: 45px;
height: 22px; height: 22px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -775,11 +826,13 @@
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @highlight-button-hover-ie !important;
background-color: @highlight-button-hover !important; background-color: @highlight-button-hover !important;
} }
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled) { &.active:not(.disabled) {
background-color: @highlight-button-pressed-ie !important;
background-color: @highlight-button-pressed !important; background-color: @highlight-button-pressed !important;
} }
@ -796,7 +849,9 @@
padding: 2px; padding: 2px;
margin:0; margin:0;
box-shadow: none; box-shadow: none;
background-color: @background-normal-ie;
background-color: @background-normal; 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: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
@ -822,6 +877,7 @@
margin-right: 3px; margin-right: 3px;
background-color: transparent; background-color: transparent;
background-repeat: no-repeat; background-repeat: no-repeat;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
position: relative; position: relative;
} }
@ -836,6 +892,7 @@
.over, .over,
&:active, &:active,
&.active { &.active {
background-color: @background-normal-ie !important;
background-color: @background-normal !important; background-color: @background-normal !important;
} }
@ -858,22 +915,29 @@
.dlg-btn { .dlg-btn {
font-weight: bold; font-weight: bold;
width: 86px; width: 86px;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control; border: 1px solid @border-regular-control;
&:hover:not(.disabled), &:hover:not(.disabled),
&.hover:not(.disabled) { &.hover:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.primary { &.primary {
color: @text-inverse-ie;
color: @text-inverse; color: @text-inverse;
background-color: @background-primary-dialog-button-ie;
background-color: @background-primary-dialog-button; background-color: @background-primary-dialog-button;
border: 0 none; border: 0 none;
&:hover:not(.disabled), &:hover:not(.disabled),
&.hover:not(.disabled) { &.hover:not(.disabled) {
background-color: @highlight-primary-dialog-button-hover-ie;
background-color: @highlight-primary-dialog-button-hover; background-color: @highlight-primary-dialog-button-hover;
} }
} }

1
apps/common/main/resources/less/calendar.less
View file

@ -1,3 +1,4 @@
@calendar-bg-color: @header-background-color-ie;
@calendar-bg-color: @header-background-color; @calendar-bg-color: @header-background-color;
.calendar-window { .calendar-window {

6
apps/common/main/resources/less/chat.less
View file

@ -11,6 +11,7 @@
.area { .area {
position: absolute; position: absolute;
border-bottom: 1px solid @border-toolbar-ie;
border-bottom: 1px solid @border-toolbar; border-bottom: 1px solid @border-toolbar;
overflow: hidden; overflow: hidden;
} }
@ -57,6 +58,7 @@
margin: 0 5px 3px 0; margin: 0 5px 3px 0;
width: 12px; width: 12px;
height: 12px; height: 12px;
border: 1px solid @border-toolbar-ie;
border: 1px solid @border-toolbar; border: 1px solid @border-toolbar;
} }
@ -101,6 +103,7 @@
} }
.user-name { .user-name {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
@ -112,6 +115,7 @@
.color { .color {
width: 12px; width: 12px;
height: 12px; height: 12px;
border: 1px solid @border-toolbar-ie;
border: 1px solid @border-toolbar; border: 1px solid @border-toolbar;
margin: 0 5px 3px 0; margin: 0 5px 3px 0;
vertical-align: middle; vertical-align: middle;
@ -143,10 +147,12 @@
height: 100%; height: 100%;
resize: none; resize: none;
margin-bottom: 5px; margin-bottom: 5px;
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control; border: 1px solid @border-regular-control;
font-size: 12px; font-size: 12px;
&:focus { &:focus {
border-color: @border-preview-select-ie;
border-color: @border-preview-select; border-color: @border-preview-select;
} }
} }

5
apps/common/main/resources/less/checkbox.less
View file

@ -12,7 +12,9 @@
+ label { + label {
width: 14px; width: 14px;
height: 14px; height: 14px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
border-radius: 2px; border-radius: 2px;
position: absolute; position: absolute;
@ -25,6 +27,7 @@
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
border: 2px solid @text-normal-ie;
border: @scaled-two-px-value solid @text-normal; border: @scaled-two-px-value solid @text-normal;
border-top: 0 none; border-top: 0 none;
border-left: 0 none; border-left: 0 none;
@ -41,7 +44,9 @@
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
border: @scaled-one-px-value-ie solid @text-normal-ie;
border: @scaled-one-px-value solid @text-normal; border: @scaled-one-px-value solid @text-normal;
background: @icon-normal-ie;
background: @icon-normal; background: @icon-normal;
width: 8px; width: 8px;
height: 8px; height: 8px;

6
apps/common/main/resources/less/colorpalette.less
View file

@ -7,6 +7,7 @@
&:hover, &:hover,
&.selected { &.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); .box-shadow(0 0 0 @scaled-one-px-value @highlight-button-pressed);
} }
} }
@ -26,6 +27,7 @@
padding: 10px; padding: 10px;
.palette-color-item { .palette-color-item {
padding: 0; padding: 0;
border: @scaled-one-px-value-ie solid @background-normal-ie;
border: @scaled-one-px-value solid @background-normal; border: @scaled-one-px-value solid @background-normal;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
@ -43,13 +45,16 @@
width: 12px; width: 12px;
cursor: pointer; cursor: pointer;
display: block; display: block;
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading; border: @scaled-one-px-value solid @border-color-shading;
} }
} }
&:hover, &.selected { &:hover, &.selected {
border-color: @icon-normal-ie;
border-color: @icon-normal; border-color: @icon-normal;
em span { em span {
border-color: @background-normal-ie;
border-color: @background-normal; border-color: @background-normal;
} }
} }
@ -57,6 +62,7 @@
.color-transparent { .color-transparent {
em span { em span {
border:solid @scaled-one-px-value-ie @border-color-shading-ie;
border:solid @scaled-one-px-value @border-color-shading; border:solid @scaled-one-px-value @border-color-shading;
} }
} }

63
apps/common/main/resources/less/colors-table-ie-fix.less Normal file
View file

@ -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)";

1
apps/common/main/resources/less/colors-table.less
View file

@ -1,3 +1,4 @@
@import "./colors-table-ie-fix.less";
// Brand colors // Brand colors
// ------------------------- // -------------------------

16
apps/common/main/resources/less/combo-dataview.less
View file

@ -10,7 +10,9 @@
width: @combo-dataview-width; width: @combo-dataview-width;
height: 100%; height: 100%;
.border-radius(@border-radius-small); .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; border: @scaled-one-px-value solid @border-regular-control;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.dataview { .dataview {
@ -24,7 +26,9 @@
button { button {
border-radius:0 @border-radius-small @border-radius-small 0; 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; border: @scaled-one-px-value solid @border-regular-control;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&.dropdown-toggle { &.dropdown-toggle {
@ -44,6 +48,7 @@
} }
.dropdown-menu { .dropdown-menu {
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 2px; border-top-left-radius: 2px;
@ -85,19 +90,24 @@
.item { .item {
padding: 3px; padding: 3px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.box-shadow(none); .box-shadow(none);
@minus-px-ie: -1px;
@minus-px: calc(-1px / @pixel-ratio-factor); @minus-px: calc(-1px / @pixel-ratio-factor);
margin: 0 @minus-px-ie @minus-px-ie 0;
margin: 0 @minus-px @minus-px 0; margin: 0 @minus-px @minus-px 0;
height: @combo-dataview-height; height: @combo-dataview-height;
&:hover { &: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); .box-inner-shadow(0 0 0 @scaled-two-px-value @border-regular-control);
} }
&.selected { &.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); .box-inner-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
} }
} }
@ -129,6 +139,7 @@
width: auto; width: auto;
position: relative; position: relative;
border: none; 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); .box-shadow(0 0 0 @scaled-one-px-value @background-normal);
> div { > div {
@ -152,6 +163,7 @@
width: 8px; width: 8px;
height: 8px; height: 8px;
background-color: transparent; background-color: transparent;
border: solid 1px @icon-normal-ie;
border: solid 1px @icon-normal; border: solid 1px @icon-normal;
border-bottom: none; border-bottom: none;
border-right: none; border-right: none;
@ -201,6 +213,7 @@
&.disabled { &.disabled {
.item { .item {
&:hover:not(.selected) { &: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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
} }
} }
@ -251,6 +264,7 @@
.item { .item {
&:hover { &: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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
} }
} }
@ -278,12 +292,14 @@
.item { .item {
margin-left: 4px; 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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
} }
&.disabled { &.disabled {
.item { .item {
&:hover:not(.selected) { &: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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
} }
} }

10
apps/common/main/resources/less/combobox.less
View file

@ -40,6 +40,7 @@
.btn { .btn {
border-left: 0; border-left: 0;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
background-color: transparent; background-color: transparent;
margin-left: -1px; margin-left: -1px;
@ -50,7 +51,9 @@
.btn-default:not(.disabled), .btn-default:not(.disabled),
&.open .dropdown-toggle.btn-default { &.open .dropdown-toggle.btn-default {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
padding-right: 4px; padding-right: 4px;
} }
@ -58,6 +61,7 @@
.btn-default.disabled { .btn-default.disabled {
&:hover, &:focus { &:hover, &:focus {
background-color: transparent; background-color: transparent;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
} }
} }
@ -65,6 +69,7 @@
&.input-group-nr.open:not(.no-highlighted) { &.input-group-nr.open:not(.no-highlighted) {
& > .form-control, & > .form-control,
& > .btn { & > .btn {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
.caret { .caret {
@ -76,6 +81,7 @@
&.input-group-nr:not(.no-highlighted) > .form-control { &.input-group-nr:not(.no-highlighted) > .form-control {
&:focus, &:focus,
&:focus ~ button.dropdown-toggle { &:focus ~ button.dropdown-toggle {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
} }
} }
@ -86,15 +92,18 @@
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
a { a {
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
&:hover, &:hover,
&.hover, &.hover,
&:focus, &:focus,
&.focus { &.focus {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
} }
@ -150,6 +159,7 @@
&.input-group-nr:not(.no-highlighted) { &.input-group-nr:not(.no-highlighted) {
& > .form-control, & > .form-control,
& > .btn { & > .btn {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
} }
} }

20
apps/common/main/resources/less/comments.less
View file

@ -14,6 +14,7 @@
right: 0; right: 0;
bottom: 45px; bottom: 45px;
height: 300px; height: 300px;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
&.stretch { &.stretch {
@ -32,9 +33,11 @@
text-align: center; text-align: center;
label { label {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font: 12px arial; font: 12px arial;
line-height: normal; line-height: normal;
border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
border-bottom: @scaled-one-px-value dotted @text-normal; border-bottom: @scaled-one-px-value dotted @text-normal;
padding-top: 12px; padding-top: 12px;
outline: none; outline: none;
@ -58,9 +61,11 @@
width: 100%; width: 100%;
resize: none; resize: none;
margin-bottom: 5px; margin-bottom: 5px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
height: 100%; height: 100%;
&:focus { &:focus {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
} }
} }
@ -83,6 +88,7 @@
line-height: normal; line-height: normal;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
color: @border-preview-select-ie;
color: @border-preview-select; color: @border-preview-select;
textarea { textarea {
@ -90,11 +96,14 @@
height: 50px; height: 50px;
resize: none; resize: none;
margin-bottom: 5px; margin-bottom: 5px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
word-break: break-all; word-break: break-all;
line-height: 15px; line-height: 15px;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&:focus { &:focus {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
} }
} }
@ -109,6 +118,7 @@
} }
.separator-cmt { .separator-cmt {
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
margin: 20px 0px 0px 0px; margin: 20px 0px 0px 0px;
} }
@ -119,6 +129,7 @@
} }
.user-name { .user-name {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
@ -133,6 +144,7 @@
.color { .color {
width: 12px; width: 12px;
height: 12px; height: 12px;
border: @scaled-one-px-value-ie solid @border-toolbar-ie;
border: @scaled-one-px-value solid @border-toolbar; border: @scaled-one-px-value solid @border-toolbar;
margin: 0 5px 3px 0; margin: 0 5px 3px 0;
vertical-align: middle; vertical-align: middle;
@ -170,6 +182,7 @@
font-style: italic; font-style: italic;
margin-top: 10px; margin-top: 10px;
padding: 0px 5px 5px 5px; padding: 0px 5px 5px 5px;
border-left: @scaled-one-px-value-ie solid #939393;
border-left: @scaled-one-px-value solid #939393; border-left: @scaled-one-px-value solid #939393;
word-break: break-all; word-break: break-all;
white-space: pre-wrap; white-space: pre-wrap;
@ -177,6 +190,7 @@
} }
.user-message { .user-message {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
padding: 9px 0px 0 0px; padding: 9px 0px 0 0px;
white-space: pre-wrap; white-space: pre-wrap;
@ -200,10 +214,12 @@
} }
.user-reply { .user-reply {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
margin-top: 10px; margin-top: 10px;
white-space: pre-wrap; white-space: pre-wrap;
width: auto; width: auto;
border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
border-bottom: @scaled-one-px-value dotted @text-normal; border-bottom: @scaled-one-px-value dotted @text-normal;
height: 16px; height: 16px;
cursor: pointer; cursor: pointer;
@ -270,6 +286,7 @@
&:after { &:after {
content: ''; content: '';
position: absolute; position: absolute;
border: solid @text-normal-ie;
border: solid @text-normal; border: solid @text-normal;
border-width: 0 2px 2px 0; border-width: 0 2px 2px 0;
transform: rotate(40deg); transform: rotate(40deg);
@ -281,6 +298,7 @@
&.comment-resolved { &.comment-resolved {
&:after { &:after {
border-color: @icon-success-ie;
border-color: @icon-success; border-color: @icon-success;
} }
} }
@ -420,12 +438,14 @@
left: 2px; left: 2px;
width: 15px; width: 15px;
height: 15px; height: 15px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-o-transform: rotate(45deg); -o-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
border: solid @scaled-one-px-value-ie @border-toolbar-ie;
border: solid @scaled-one-px-value @border-toolbar; border: solid @scaled-one-px-value @border-toolbar;
} }
} }

19
apps/common/main/resources/less/common.less
View file

@ -1,5 +1,6 @@
label { label {
&.link { &.link {
border-bottom: @scaled-one-px-value-ie dotted @text-secondary-ie;
border-bottom: @scaled-one-px-value dotted @text-secondary; border-bottom: @scaled-one-px-value dotted @text-secondary;
cursor: pointer; cursor: pointer;
@ -9,6 +10,7 @@ label {
} }
&.link-solid { &.link-solid {
border-bottom: @scaled-one-px-value-ie solid @text-secondary-ie;
border-bottom: @scaled-one-px-value solid @text-secondary; border-bottom: @scaled-one-px-value solid @text-secondary;
cursor: pointer; cursor: pointer;
@ -46,6 +48,7 @@ label {
overflow: hidden; overflow: hidden;
.tool-menu-btns { .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; border-right: @scaled-one-px-value solid @border-regular-control;
} }
} }
@ -53,7 +56,9 @@ label {
&.right { &.right {
.tool-menu-btns { .tool-menu-btns {
//position: absolute; //position: absolute;
border-left: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-left: @scaled-one-px-value solid @border-regular-control; border-left: @scaled-one-px-value solid @border-regular-control;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
@ -76,6 +81,7 @@ label {
.left-panel { .left-panel {
padding-left: 40px; padding-left: 40px;
height: 100%; height: 100%;
border-right: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-right: @scaled-one-px-value solid @border-regular-control; border-right: @scaled-one-px-value solid @border-regular-control;
#left-panel-chat { #left-panel-chat {
@ -94,17 +100,21 @@ label {
padding: 0 10px 0 15px; padding: 0 10px 0 15px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
border-left: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-left: @scaled-one-px-value solid @border-regular-control; border-left: @scaled-one-px-value solid @border-regular-control;
line-height: 15px; line-height: 15px;
} }
.statusbar { .statusbar {
height: 25px; height: 25px;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; 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); .box-inner-shadow(0 @scaled-one-px-value 0 @border-regular-control);
.status-label { .status-label {
font-weight: bold; font-weight: bold;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
white-space: nowrap; white-space: nowrap;
} }
@ -118,12 +128,15 @@ label {
.panel-menu { .panel-menu {
width: 260px; width: 260px;
float: left; float: left;
border-right: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-right: @scaled-one-px-value solid @border-regular-control; border-right: @scaled-one-px-value solid @border-regular-control;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
.flex-settings { .flex-settings {
&.bordered { &.bordered {
border-bottom: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-bottom: @scaled-one-px-value solid @border-regular-control; border-bottom: @scaled-one-px-value solid @border-regular-control;
} }
overflow: hidden; overflow: hidden;
@ -182,6 +195,7 @@ label {
width: 100%; width: 100%;
resize: none; resize: none;
margin-bottom: 5px; margin-bottom: 5px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
height: 100%; height: 100%;
@ -194,13 +208,16 @@ label {
.dropdown-menu { .dropdown-menu {
> li > a { > li > a {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
} }
textarea { textarea {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
color: @text-normal color: @text-normal-ie;
color: @text-normal;
} }
.btn-edit-table, .btn-edit-table,

6
apps/common/main/resources/less/dataview.less
View file

@ -9,6 +9,7 @@
text-align: center; text-align: center;
height: 100%; height: 100%;
width: 100%; width: 100%;
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
td { td {
padding: 5px; padding: 5px;
@ -22,10 +23,12 @@
margin: 4px; margin: 4px;
cursor: pointer; 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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
&:hover, &:hover,
&.selected { &.selected {
.box-shadow(0 0 0 2px @border-preview-select-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-preview-select); .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
} }
} }
@ -58,10 +61,12 @@
opacity: 0.5; 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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
&:hover:not(.disabled), &:hover:not(.disabled),
&.selected: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); .box-shadow(0 0 0 @scaled-two-px-value @highlight-button-pressed);
} }
} }
@ -75,6 +80,7 @@
} }
&.bordered { &.bordered {
border: @scaled-one-px-value-ie solid @input-border;
border: @scaled-one-px-value solid @input-border; border: @scaled-one-px-value solid @input-border;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
} }

12
apps/common/main/resources/less/dropdown-menu.less
View file

@ -3,8 +3,11 @@
} }
.dropdown-menu { .dropdown-menu {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
border-width: @scaled-one-px-value-ie;
border-width: @scaled-one-px-value; border-width: @scaled-one-px-value;
&.scrollable-menu { &.scrollable-menu {
@ -34,6 +37,7 @@
& > a { & > a {
padding: 5px 20px; padding: 5px 20px;
cursor: pointer; cursor: pointer;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&:focus, &.focus { &:focus, &.focus {
@ -47,17 +51,22 @@
} }
&:hover { &:hover {
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
} }
&.over > a { &.over > a {
text-decoration: none; text-decoration: none;
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
&:after { &:after {
border-left-color: @icon-normal-pressed-ie;
border-left-color: @icon-normal-pressed; border-left-color: @icon-normal-pressed;
} }
} }
@ -94,6 +103,7 @@
.no-checkmark.checked { .no-checkmark.checked {
.menu-item-icon { .menu-item-icon {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
border-radius: 2px; border-radius: 2px;
} }
@ -123,7 +133,9 @@
} }
.divider { .divider {
height: @scaled-one-px-value-ie;
height: @scaled-one-px-value; height: @scaled-one-px-value;
background-color: @border-divider-ie;
background-color: @border-divider; background-color: @border-divider;
} }
} }

1
apps/common/main/resources/less/dropdown-submenu.less
View file

@ -23,6 +23,7 @@
border-color: transparent; border-color: transparent;
border-style: solid; border-style: solid;
border-width: 3px 0 3px 3px; border-width: 3px 0 3px 3px;
border-left-color: @icon-normal-ie;
border-left-color: @icon-normal; border-left-color: @icon-normal;
margin-top: 5px; margin-top: 5px;
margin-right: -10px; margin-right: -10px;

1
apps/common/main/resources/less/extended-color-picker.less
View file

@ -37,6 +37,7 @@
width: 63px; width: 63px;
height: 20px; height: 20px;
background-color: transparent; background-color: transparent;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
&.top { &.top {

17
apps/common/main/resources/less/header.less
View file

@ -29,6 +29,7 @@
.toolbar { .toolbar {
.extra { .extra {
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
} }
@ -57,11 +58,13 @@
} }
label { label {
color: @text-toolbar-header-ie;
color: @text-toolbar-header; color: @text-toolbar-header;
} }
.dropdown-menu { .dropdown-menu {
label { label {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
} }
@ -70,12 +73,14 @@
.btn-header { .btn-header {
&:hover { &:hover {
&:not(.disabled):not(.icon) { &:not(.disabled):not(.icon) {
background-color: @highlight-header-button-hover-ie;
background-color: @highlight-header-button-hover; background-color: @highlight-header-button-hover;
} }
} }
&:active, &.active { &:active, &.active {
&:not(.disabled):not(.icon) { &:not(.disabled):not(.icon) {
background-color: @highlight-header-button-pressed-ie;
background-color: @highlight-header-button-pressed; background-color: @highlight-header-button-pressed;
} }
} }
@ -98,6 +103,7 @@
min-width: 50px; min-width: 50px;
text-align: center; text-align: center;
color: @text-toolbar-header-ie;
color: @text-toolbar-header; color: @text-toolbar-header;
background-color: transparent; background-color: transparent;
border: 0 none; border: 0 none;
@ -109,6 +115,7 @@
white-space: nowrap; white-space: nowrap;
&.locked { &.locked {
text-decoration: none; text-decoration: none;
color: @border-preview-select-ie;
color: @border-preview-select; color: @border-preview-select;
cursor: default; cursor: default;
} }
@ -179,6 +186,7 @@
padding: 0; padding: 0;
&.icon--inverse { &.icon--inverse {
background-position-x: @button-header-normal-icon-offset-x-ie;
background-position-x: @button-header-normal-icon-offset-x; background-position-x: @button-header-normal-icon-offset-x;
} }
} }
@ -247,6 +255,7 @@
} }
label { label {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
@ -281,6 +290,7 @@
} }
.user-name { .user-name {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
@ -320,6 +330,7 @@
position: relative; position: relative;
&.icon--inverse { &.icon--inverse {
background-position-x: @button-header-normal-icon-offset-x-ie;
background-position-x: @button-header-normal-icon-offset-x; background-position-x: @button-header-normal-icon-offset-x;
} }
} }
@ -328,7 +339,7 @@
&:active, &.active { &:active, &.active {
.icon.toolbar__icon { .icon.toolbar__icon {
&.icon--inverse { &.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 { &:hover {
&:not(.disabled) { &:not(.disabled) {
background-color: @highlight-header-button-hover-ie;
background-color: @highlight-header-button-hover; background-color: @highlight-header-button-hover;
} }
} }
@ -371,9 +383,11 @@
} }
#box-document-title { #box-document-title {
background-color: @header-background-color-ie;
background-color: @header-background-color; background-color: @header-background-color;
display: flex; display: flex;
height: 100%; height: 100%;
color: @text-toolbar-header-ie;
color: @text-toolbar-header; color: @text-toolbar-header;
position: relative; position: relative;
@ -382,6 +396,7 @@
} }
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
&.icon-save { &.icon-save {

15
apps/common/main/resources/less/history.less
View file

@ -1,5 +1,6 @@
#history-box { #history-box {
position: relative; position: relative;
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
} }
@ -10,6 +11,7 @@
top: 0; top: 0;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
#history-btn-back { #history-btn-back {
@ -21,6 +23,7 @@
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
} }
@ -33,6 +36,7 @@
bottom: 0; bottom: 0;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-top: @scaled-one-px-value solid @border-toolbar; border-top: @scaled-one-px-value solid @border-toolbar;
#history-btn-expand { #history-btn-expand {
@ -44,6 +48,7 @@
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
} }
@ -64,14 +69,17 @@
&:hover:not(.selected), &:hover:not(.selected),
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
.user-name, .user-name,
.user-date { .user-date {
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
@ -83,6 +91,7 @@
.history-item-wrap { .history-item-wrap {
padding: 10px 2px 15px 20px; padding: 10px 2px 15px 20px;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -99,11 +108,14 @@
display: inline-block; display: inline-block;
max-width: 60px; max-width: 60px;
height: 18px; height: 18px;
color: @highlight-button-pressed-ie;
color: @highlight-button-pressed; color: @highlight-button-pressed;
font-size: 10px; font-size: 10px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
text-align: center; text-align: center;
padding: 1px 5px; padding: 1px 5px;
@ -124,6 +136,7 @@
.color { .color {
width: 12px; width: 12px;
height: 12px; height: 12px;
border: @scaled-one-px-value-ie solid @border-toolbar-ie;
border: @scaled-one-px-value solid @border-toolbar; border: @scaled-one-px-value solid @border-toolbar;
margin: 0 5px 3px 0; margin: 0 5px 3px 0;
vertical-align: middle; vertical-align: middle;
@ -144,7 +157,9 @@
} }
.revision-restore { .revision-restore {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
border-bottom: @scaled-one-px-value dotted @text-normal; border-bottom: @scaled-one-px-value dotted @text-normal;
height: 16px; height: 16px;
margin-top: 5px; margin-top: 5px;

6
apps/common/main/resources/less/hsb-colorpicker.less
View file

@ -8,6 +8,7 @@
width: 22px; width: 22px;
height: 22px; height: 22px;
float: left; float: left;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
background-image: none; background-image: none;
background-position: 0 -206px; background-position: 0 -206px;
@ -22,6 +23,7 @@
} }
.color-text { .color-text {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
height: 22px; height: 22px;
padding: 4px 32px; padding: 4px 32px;
@ -34,6 +36,7 @@
width: 195px; width: 195px;
height: 196px; height: 196px;
position: relative; position: relative;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
background-position: 0 0; background-position: 0 0;
} }
@ -49,6 +52,7 @@
width: 10px; width: 10px;
height: 100%; height: 100%;
position: relative; position: relative;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
background-position: -195px 0; background-position: -195px 0;
} }
@ -70,6 +74,7 @@
} }
.empty-color { .empty-color {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
height: 16px; height: 16px;
margin: 5px 0; margin: 5px 0;
@ -91,6 +96,7 @@
height: 10px; height: 10px;
margin-right: 5px; margin-right: 5px;
margin-top: 1px; margin-top: 1px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
} }
} }

9
apps/common/main/resources/less/input.less
View file

@ -1,13 +1,17 @@
.form-control { .form-control {
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
.box-shadow(none); .box-shadow(none);
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
.user-select(text); .user-select(text);
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&:focus { &:focus {
border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
outline: 0; outline: 0;
.box-shadow(none); .box-shadow(none);
@ -16,11 +20,13 @@
.form-control[readonly] { .form-control[readonly] {
cursor: pointer; cursor: pointer;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
} }
.form-control[disabled] { .form-control[disabled] {
cursor: default; cursor: default;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.user-select(none); .user-select(none);
} }
@ -102,7 +108,9 @@ input[type="password"] {
} }
input[type="text"]::selection, textarea::selection { input[type="text"]::selection, textarea::selection {
background: @highlight-text-select-ie;
background: @highlight-text-select; background: @highlight-text-select;
color: @text-inverse-ie;
color: @text-inverse; color: @text-inverse;
} }
@ -115,6 +123,7 @@ textarea.form-control:focus {
.select-button { .select-button {
position: absolute; position: absolute;
right: @scaled-one-px-value-ie;
right: @scaled-one-px-value; right: @scaled-one-px-value;
> .btn-toolbar { > .btn-toolbar {

2
apps/common/main/resources/less/language-dialog.less
View file

@ -23,9 +23,11 @@ li {
&:before { &:before {
display: none; display: none;
} }
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
&, &:hover, &:focus { &, &:hover, &:focus {
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
} }

5
apps/common/main/resources/less/layout.less
View file

@ -17,6 +17,7 @@
.layout-resizer { .layout-resizer {
z-index: @zindex-dropdown - 10; z-index: @zindex-dropdown - 10;
background: @background-toolbar-ie;
background: @background-toolbar; background: @background-toolbar;
border: 0 none; border: 0 none;
@ -36,7 +37,9 @@
cursor: row-resize; cursor: row-resize;
&.move { &.move {
border-top: solid @scaled-one-px-value-ie @border-toolbar-ie;
border-top: solid @scaled-one-px-value @border-toolbar; 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; border-bottom: solid @scaled-one-px-value @border-toolbar;
} }
} }
@ -53,7 +56,9 @@
cursor: col-resize; cursor: col-resize;
&.move { &.move {
border-left: solid @scaled-one-px-value-ie @border-toolbar-ie;
border-left: solid @scaled-one-px-value @border-toolbar; 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; border-right: solid @scaled-one-px-value @border-toolbar;
} }
} }

13
apps/common/main/resources/less/listview.less
View file

@ -1,4 +1,5 @@
.listview { .listview {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
line-height: 15px; line-height: 15px;
@ -14,6 +15,7 @@
text-align: center; text-align: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
td { td {
padding: 5px; padding: 5px;
@ -22,6 +24,7 @@
} }
&:not(.no-focus):focus { &:not(.no-focus):focus {
border-color: @border-preview-select-ie;
border-color: @border-preview-select; border-color: @border-preview-select;
} }
@ -32,26 +35,36 @@
cursor: pointer; cursor: pointer;
white-space: pre-wrap; white-space: pre-wrap;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
border-style: solid; border-style: solid;
border-width: @scaled-one-px-value-ie 0;
border-width: @scaled-one-px-value 0; border-width: @scaled-one-px-value 0;
border-top-color: transparent; border-top-color: transparent;
} }
&:not(.disabled) > .item { &:not(.disabled) > .item {
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
border-color: @highlight-button-hover-ie;
border-color: @highlight-button-hover; border-color: @highlight-button-hover;
border-style: solid; border-style: solid;
border-width: @scaled-one-px-value-ie 0;
border-width: @scaled-one-px-value 0; border-width: @scaled-one-px-value 0;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
border-color: @highlight-button-pressed-ie;
border-color: @highlight-button-pressed; border-color: @highlight-button-pressed;
border-style: solid; border-style: solid;
border-width: @scaled-one-px-value-ie 0;
border-width: @scaled-one-px-value 0; border-width: @scaled-one-px-value 0;
} }
} }

3
apps/common/main/resources/less/loadmask.less
View file

@ -22,7 +22,9 @@
line-height: @loadmask-image-height; line-height: @loadmask-image-height;
border: none; border: none;
background-image: none; background-image: none;
background-color: @background-loader-ie;
background-color: @background-loader; background-color: @background-loader;
color: @text-contrast-background-ie;
color: @text-contrast-background; color: @text-contrast-background;
.border-radius(@border-radius-large); .border-radius(@border-radius-large);
@ -52,6 +54,7 @@
.left-panel & { .left-panel & {
line-height: @loadmask-small-image-height; line-height: @loadmask-small-image-height;
background-color: transparent; background-color: transparent;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
padding: 8px; padding: 8px;
top: 78px; top: 78px;

2
apps/common/main/resources/less/masked-field.less
View file

@ -1,10 +1,12 @@
.masked-field { .masked-field {
text-align: right; text-align: right;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
border-radius: 2px; border-radius: 2px;
padding: 0 3px; padding: 0 3px;
&:focus { &:focus {
border-color: @border-preview-select-ie;
border-color: @border-preview-select; border-color: @border-preview-select;
} }
} }

13
apps/common/main/resources/less/multislider-gradient.less
View file

@ -12,18 +12,23 @@
left: 2px; left: 2px;
width: 9px; width: 9px;
height: 9px; height: 9px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-o-transform: rotate(45deg); -o-transform: rotate(45deg);
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-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-left: solid @scaled-one-px-value @border-regular-control;
border-radius: 0 3px; border-radius: 0 3px;
box-sizing: content-box; box-sizing: content-box;
.thumb-top-inner { .thumb-top-inner {
border-top: solid @scaled-one-px-value-ie @background-normal-ie;
border-top: solid @scaled-one-px-value @background-normal; 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; border-left: solid @scaled-one-px-value @background-normal;
height: 100%; height: 100%;
} }
@ -35,12 +40,15 @@
left: 1px; left: 1px;
width: 10px; width: 10px;
height: 9px; height: 9px;
background-color: @background-normal-ie;
background-color: @background-normal; 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: solid @scaled-one-px-value @border-regular-control;
border-top: none; border-top: none;
border-radius: 2px; border-radius: 2px;
box-sizing: content-box; box-sizing: content-box;
.thumb-bottom-inner { .thumb-bottom-inner {
border: solid @scaled-one-px-value-ie @border-regular-control-ie;
border: solid @scaled-one-px-value @border-regular-control; border: solid @scaled-one-px-value @border-regular-control;
border-top: none; border-top: none;
height: 100%; height: 100%;
@ -49,10 +57,13 @@
&.active { &.active {
.thumb-top { .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-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-left: solid @scaled-one-px-value @border-regular-control;
} }
.thumb-bottom { .thumb-bottom {
border: solid @scaled-one-px-value-ie @border-control-focus-ie;
border: solid @scaled-one-px-value @border-control-focus; border: solid @scaled-one-px-value @border-control-focus;
border-top: none; border-top: none;
} }
@ -80,7 +91,9 @@
// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#ffffff',GradientType=1 ); /* IE6-9 */ // filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#ffffff',GradientType=1 ); /* IE6-9 */
background-position: 0 0; background-position: 0 0;
outline: @scaled-one-px-value-ie solid @border-control-focus-ie;
outline: @scaled-one-px-value solid @border-control-focus; 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; border: @scaled-one-px-value solid @border-regular-control;
cursor: copy; cursor: copy;
} }

2
apps/common/main/resources/less/opendialog.less
View file

@ -43,6 +43,7 @@
height: 110px !important; height: 110px !important;
position:relative; position:relative;
overflow:hidden; overflow:hidden;
border: @border-regular-control-ie solid @scaled-one-px-value-ie;
border: @border-regular-control solid @scaled-one-px-value; border: @border-regular-control solid @scaled-one-px-value;
} }
@ -59,6 +60,7 @@
td { td {
padding: 1px 8px 1px 0; 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; border-right: @border-regular-control solid @scaled-one-px-value;
min-width: 30px; min-width: 30px;
height: 17px; height: 17px;

4
apps/common/main/resources/less/plugins.less
View file

@ -26,10 +26,12 @@
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: #fff; color: #fff;
} }
@ -82,6 +84,7 @@
width: 100%; width: 100%;
height: 38px; height: 38px;
padding: 10px 12px; padding: 10px 12px;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
label { label {
@ -118,6 +121,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.4; opacity: 0.4;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
z-index: @zindex-tooltip + 1; z-index: @zindex-tooltip + 1;
} }

3
apps/common/main/resources/less/radiobox.less
View file

@ -18,7 +18,9 @@
width: 14px; width: 14px;
height: 14px; height: 14px;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
border-radius: 50%; border-radius: 50%;
} }
@ -28,6 +30,7 @@
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
background: @text-normal-ie;
background: @text-normal; background: @text-normal;
border-radius: 50%; border-radius: 50%;
width: 8px; width: 8px;

12
apps/common/main/resources/less/scroller.less
View file

@ -11,12 +11,14 @@
} }
.ps-scrollbar-x { .ps-scrollbar-x {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
&.always-visible-x { &.always-visible-x {
bottom: 0px; bottom: 0px;
height: 9px; height: 9px;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVChTY6AfOH/+/H9SaSYQg1RAlqZhCT5+/AgOSlJoOgY50DqSNZJhEwMDACkvNZLpune5AAAAAElFTkSuQmCC'); background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVChTY6AfOH/+/H9SaSYQg1RAlqZhCT5+/AgOSlJoOgY50DqSNZJhEwMDACkvNZLpune5AAAAAElFTkSuQmCC');
background-repeat: no-repeat; background-repeat: no-repeat;
@ -31,6 +33,7 @@
background-position: center 0; background-position: center 0;
.border-radius(2px); .border-radius(2px);
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
-o-transition: background-color .5s 0 linear; -o-transition: background-color .5s 0 linear;
-webkit-transition: background-color .5s 0 linear; -webkit-transition: background-color .5s 0 linear;
@ -43,6 +46,7 @@
.hover { .hover {
.ps-scrollbar-x { .ps-scrollbar-x {
&.always-visible-x { &.always-visible-x {
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
background-position: center -7px; background-position: center -7px;
} }
@ -52,7 +56,9 @@
&.in-scrolling { &.in-scrolling {
.ps-scrollbar-x { .ps-scrollbar-x {
&.always-visible-x { &.always-visible-x {
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
background-position: center -7px; background-position: center -7px;
} }
@ -72,12 +78,14 @@
} }
.ps-scrollbar-y { .ps-scrollbar-y {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
&.always-visible-y { &.always-visible-y {
right: 0px; right: 0px;
width: 9px; width: 9px;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
.background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC', .background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC',
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px); 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px);
@ -85,6 +93,7 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 0 center; background-position: 0 center;
.border-radius(2px); .border-radius(2px);
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
-o-transition: background-color .5s 0 linear; -o-transition: background-color .5s 0 linear;
-webkit-transition: background-color .5s 0 linear; -webkit-transition: background-color .5s 0 linear;
@ -97,6 +106,7 @@
.hover { .hover {
.ps-scrollbar-y { .ps-scrollbar-y {
&.always-visible-y { &.always-visible-y {
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
background-position: -7px center; background-position: -7px center;
} }
@ -106,7 +116,9 @@
&.in-scrolling { &.in-scrolling {
.ps-scrollbar-y { .ps-scrollbar-y {
&.always-visible-y { &.always-visible-y {
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
background-position: -7px center; background-position: -7px center;
} }

2
apps/common/main/resources/less/separator.less
View file

@ -9,6 +9,7 @@
.separator { .separator {
display: inline-block; display: inline-block;
position: inherit; position: inherit;
border-left: @scaled-one-px-value-ie solid @border-divider-ie;
border-left: @scaled-one-px-value solid @border-divider; border-left: @scaled-one-px-value solid @border-divider;
vertical-align: top; vertical-align: top;
padding: 0; padding: 0;
@ -20,6 +21,7 @@
border-left: none; border-left: none;
border-right: none; border-right: none;
border-top: @scaled-one-px-value-ie solid @border-divider-ie;
border-top: @scaled-one-px-value solid @border-divider; border-top: @scaled-one-px-value solid @border-divider;
} }
} }

4
apps/common/main/resources/less/spinner.less
View file

@ -39,7 +39,9 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 1px; right: 1px;
border-top: @scaled-one-px-value-ie solid transparent;
border-top: @scaled-one-px-value 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; border-bottom: @scaled-one-px-value solid transparent;
i { i {
@ -47,6 +49,7 @@
width: 4px; width: 4px;
height: 4px; height: 4px;
border: solid @scaled-one-px-value-ie @icon-normal-ie;
border: solid @scaled-one-px-value @icon-normal; border: solid @scaled-one-px-value @icon-normal;
border-bottom: none; border-bottom: none;
border-right: none; border-right: none;
@ -58,6 +61,7 @@
} }
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
} }

6
apps/common/main/resources/less/switcher.less
View file

@ -8,6 +8,7 @@
.sw-left { .sw-left {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
border-top-left-radius: 2px; border-top-left-radius: 2px;
border-bottom-left-radius: 2px; border-bottom-left-radius: 2px;
@ -16,6 +17,7 @@
.sw-right { .sw-right {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
border-top-right-radius: 2px; border-top-right-radius: 2px;
border-bottom-right-radius: 2px; border-bottom-right-radius: 2px;
@ -27,7 +29,9 @@
right: auto; right: auto;
top: 0; top: 0;
height: 100%; height: 100%;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border: 1px solid @highlight-button-pressed-ie;
border: 1px solid @highlight-button-pressed; border: 1px solid @highlight-button-pressed;
border-radius: 3px; border-radius: 3px;
} }
@ -43,10 +47,12 @@
cursor: default; cursor: default;
.sw-left { .sw-left {
background-color: @border-regular-control-ie;
background-color: @border-regular-control; background-color: @border-regular-control;
} }
.thumb { .thumb {
border-color: @border-regular-control-ie;
border-color: @border-regular-control; border-color: @border-regular-control;
} }
} }

6
apps/common/main/resources/less/symboltable.less
View file

@ -7,8 +7,11 @@
.cell{ .cell{
width: 31px; width: 31px;
height: 33px; 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-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; border-bottom: @scaled-one-px-value solid @border-regular-control;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
align-content: center; align-content: center;
vertical-align: middle; vertical-align: middle;
@ -24,6 +27,7 @@
} }
.cell-selected{ .cell-selected{
background-color: @border-preview-select-ie;
background-color: @border-preview-select; background-color: @border-preview-select;
color: white; color: white;
} }
@ -33,6 +37,7 @@
width: 100%; width: 100%;
height: 32px; height: 32px;
overflow: hidden; overflow: hidden;
border: @border-regular-control-ie solid @scaled-one-px-value-ie;
border: @border-regular-control solid @scaled-one-px-value; border: @border-regular-control solid @scaled-one-px-value;
} }
@ -42,6 +47,7 @@
height: 132px; height: 132px;
position:relative; position:relative;
overflow:hidden; overflow:hidden;
border: @border-regular-control-ie solid @scaled-one-px-value-ie;
border: @border-regular-control solid @scaled-one-px-value; border: @border-regular-control solid @scaled-one-px-value;
} }

4
apps/common/main/resources/less/synchronize-tip.less
View file

@ -99,6 +99,7 @@
.asc-synchronizetip { .asc-synchronizetip {
padding: 15px 8px 15px 15px; padding: 15px 8px 15px 15px;
border-radius: 5px; border-radius: 5px;
background-color: @background-notification-popover-ie;
background-color: @background-notification-popover; background-color: @background-notification-popover;
overflow: visible; overflow: visible;
@ -123,6 +124,7 @@
position: absolute; position: absolute;
top: 5px; top: 5px;
left: 8px; left: 8px;
background-color: @background-notification-popover-ie;
background-color: @background-notification-popover; background-color: @background-notification-popover;
width: 15px; width: 15px;
height: 15px; height: 15px;
@ -141,7 +143,9 @@
} }
.show-link label { .show-link label {
border-bottom: @scaled-one-px-value-ie dotted @text-link-ie;
border-bottom: @scaled-one-px-value dotted @text-link; border-bottom: @scaled-one-px-value dotted @text-link;
color: @text-link-ie;
color: @text-link; color: @text-link;
cursor: pointer; cursor: pointer;
} }

7
apps/common/main/resources/less/tabbar.less
View file

@ -8,8 +8,11 @@
&.active { &.active {
> span, > span:hover, > span:focus { > span, > span:hover, > span:focus {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
border-color: @background-normal-ie;
border-color: @background-normal; border-color: @background-normal;
cursor: pointer; cursor: pointer;
} }
@ -21,7 +24,9 @@
> span { > span {
display: inline; display: inline;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
color: @text-secondary-ie;
color: @text-secondary; color: @text-secondary;
padding-top: 0; padding-top: 0;
@ -36,7 +41,9 @@
} }
&:hover, &:focus { &:hover, &:focus {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
border-color: @background-toolbar-ie;
border-color: @background-toolbar; border-color: @background-toolbar;
cursor: pointer; cursor: pointer;
} }

7
apps/common/main/resources/less/theme-colorpalette.less
View file

@ -16,6 +16,7 @@
a { a {
padding: 0; padding: 0;
border: @scaled-one-px-value-ie solid @background-normal-ie;
border: @scaled-one-px-value solid @background-normal; border: @scaled-one-px-value solid @background-normal;
float: left; float: left;
text-decoration: none; text-decoration: none;
@ -24,24 +25,30 @@
cursor: pointer; cursor: pointer;
em span { em span {
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading; border: @scaled-one-px-value solid @border-color-shading;
} }
&:hover, &.selected { &:hover, &.selected {
border-color: @icon-normal-ie;
border-color: @icon-normal; border-color: @icon-normal;
em span { em span {
border-color: @background-normal-ie;
border-color: @background-normal; border-color: @background-normal;
} }
} }
} }
.dynamic-empty-color em span { .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; border:solid @scaled-one-px-value @border-color-shading;
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
} }
.color-transparent { .color-transparent {
em span { em span {
border:solid @scaled-one-px-value-ie @border-color-shading-ie;
border:solid @scaled-one-px-value @border-color-shading; border:solid @scaled-one-px-value @border-color-shading;
} }
} }

38
apps/common/main/resources/less/toolbar.less
View file

@ -38,6 +38,7 @@
align-items: stretch; align-items: stretch;
.extra { .extra {
background-color: @header-background-color-ie;
background-color: @header-background-color; background-color: @header-background-color;
} }
@ -54,6 +55,7 @@
.tabs { .tabs {
//flex-grow: 1; //flex-grow: 1;
background-color: @header-background-color-ie;
background-color: @header-background-color; background-color: @header-background-color;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -74,10 +76,12 @@
height: 100%; height: 100%;
&:hover { &:hover {
background-color: @highlight-header-button-hover-ie;
background-color: @highlight-header-button-hover; background-color: @highlight-header-button-hover;
} }
&.active { &.active {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
@ -89,11 +93,13 @@
cursor: default; cursor: default;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
color: @text-toolbar-header-ie;
color: @text-toolbar-header; color: @text-toolbar-header;
} }
&.active { &.active {
> a { > a {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
} }
@ -125,6 +131,7 @@
} }
&.left{ &.left{
box-shadow: 5px 0 20px 5px @header-background-color-ie;
box-shadow: 5px 0 20px 5px @header-background-color; box-shadow: 5px 0 20px 5px @header-background-color;
&:after { &:after {
@ -133,6 +140,7 @@
} }
} }
&.right{ &.right{
box-shadow: -5px 0 20px 5px @header-background-color-ie;
box-shadow: -5px 0 20px 5px @header-background-color; box-shadow: -5px 0 20px 5px @header-background-color;
&:after { &:after {
@ -191,8 +199,10 @@
/**/ /**/
} }
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
@minus-px: calc(-1 * @scaled-one-px-value); @minus-px: calc(-1 * @scaled-one-px-value);
.box-inner-shadow(0 -1px @border-toolbar-ie);
.box-inner-shadow(0 @minus-px @border-toolbar); .box-inner-shadow(0 @minus-px @border-toolbar);
.group { .group {
@ -251,6 +261,7 @@
} }
&.border { &.border {
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control; border: 1px solid @border-regular-control;
.border-radius(1px); .border-radius(1px);
width: 22px; width: 22px;
@ -269,6 +280,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
opacity: 0; opacity: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
/* z-index: @zindex-tooltip + 1; */ /* z-index: @zindex-tooltip + 1; */
} }
@ -310,6 +322,7 @@
.tabs, .extra { .tabs, .extra {
background-color: transparent; background-color: transparent;
box-shadow: inset 0 -1px 0 0 @border-regular-control-ie;
box-shadow: inset 0 -1px 0 0 @border-regular-control; box-shadow: inset 0 -1px 0 0 @border-regular-control;
} }
@ -324,6 +337,7 @@
&:after { &:after {
//transition: opacity .1s; //transition: opacity .1s;
//transition: bottom .1s; //transition: bottom .1s;
border-top: @underscore_height solid @text-normal-ie;
border-top: @underscore_height solid @text-normal; border-top: @underscore_height solid @text-normal;
content: ''; content: '';
position: absolute; position: absolute;
@ -347,6 +361,7 @@
} }
> a { > a {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&::after { &::after {
@ -373,14 +388,17 @@
.tabs .scroll { .tabs .scroll {
&.left { &.left {
box-shadow: 5px 0 20px 5px @background-toolbar-ie;
box-shadow: 5px 0 20px 5px @background-toolbar; box-shadow: 5px 0 20px 5px @background-toolbar;
} }
&.right { &.right {
box-shadow: -5px 0 20px 5px @background-toolbar-ie;
box-shadow: -5px 0 20px 5px @background-toolbar; box-shadow: -5px 0 20px 5px @background-toolbar;
} }
&:after { &:after {
border-color: @text-normal-ie;
border-color: @text-normal; border-color: @text-normal;
} }
} }
@ -392,26 +410,32 @@
} }
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
} }
.caption { .caption {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
&:hover:not(.disabled) { &:hover:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&:active, &.active { &:active, &.active {
&:not(.disabled) { &:not(.disabled) {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
} }
.caption { .caption {
color: @text-inverse-ie;
color: @text-inverse; color: @text-inverse;
} }
} }
@ -424,16 +448,19 @@
} }
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
} }
} }
#rib-doc-name { #rib-doc-name {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
&.editor-native-color { &.editor-native-color {
.tabs li:after { .tabs li:after {
border-color: @header-background-color-ie;
border-color: @header-background-color; border-color: @header-background-color;
} }
} }
@ -468,6 +495,7 @@
.btn-toolbar { .btn-toolbar {
&:active { &:active {
svg.icon { svg.icon {
fill: @icon-toolbar-header-ie;
fill: @icon-toolbar-header; fill: @icon-toolbar-header;
} }
} }
@ -475,14 +503,17 @@
svg.icon { svg.icon {
background-image: none; background-image: none;
fill: @icon-normal-ie;
fill: @icon-normal; fill: @icon-normal;
} }
&.borders--small { &.borders--small {
border-radius: 2px; border-radius: 2px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&:not(:active) { &: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; box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control;
} }
@ -509,6 +540,7 @@
svg.icon { svg.icon {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
fill: @icon-normal-ie;
fill: @icon-normal; fill: @icon-normal;
} }
@ -517,6 +549,7 @@
} }
.item-equation { .item-equation {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.equation-icon { .equation-icon {
@ -554,6 +587,7 @@
svg.icon { svg.icon {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
fill: @icon-normal-ie;
fill: @icon-normal; fill: @icon-normal;
} }
} }
@ -570,6 +604,7 @@
width: 12px; width: 12px;
height: 12px; height: 12px;
margin-right: 2px; margin-right: 2px;
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading; border: @scaled-one-px-value solid @border-color-shading;
vertical-align: middle; vertical-align: middle;
} }
@ -583,9 +618,11 @@
display: none !important; display: none !important;
} }
&, &:hover, &:focus { &, &:hover, &:focus {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
span.color { span.color {
border-color: @icon-normal-ie;
border-color: @icon-normal; border-color: @icon-normal;
} }
} }
@ -593,6 +630,7 @@
} }
.item-equation { .item-equation {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.background-ximage-v2('toolbar/math.png', 1500px); .background-ximage-v2('toolbar/math.png', 1500px);
} }

5
apps/common/main/resources/less/tooltip.less
View file

@ -15,6 +15,7 @@
&.top-right .tooltip-arrow { &.top-right .tooltip-arrow {
bottom: 1px; bottom: 1px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: @background-normal-ie;
border-top-color: @background-normal; border-top-color: @background-normal;
} }
@ -32,15 +33,19 @@
&.bottom-right .tooltip-arrow { &.bottom-right .tooltip-arrow {
top: 1px; top: 1px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: @background-normal-ie;
border-bottom-color: @background-normal; border-bottom-color: @background-normal;
} }
} }
.tooltip-inner { .tooltip-inner {
font-size: 11px; font-size: 11px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
padding: 5px 12px; padding: 5px 12px;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.box-shadow(0 6px 12px rgba(0, 0, 0, 0.175)); .box-shadow(0 6px 12px rgba(0, 0, 0, 0.175));
background-clip: padding-box; background-clip: padding-box;

5
apps/common/main/resources/less/treeview.less
View file

@ -12,6 +12,7 @@
text-align: center; text-align: center;
height: 100%; height: 100%;
width: 100%; width: 100%;
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
td { td {
padding: 5px; padding: 5px;
@ -20,6 +21,7 @@
} }
&:focus { &:focus {
border-color: @border-preview-select-ie;
border-color: @border-preview-select; border-color: @border-preview-select;
} }
@ -31,10 +33,12 @@
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
} }
@ -58,6 +62,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
&.empty { &.empty {
color: @text-tertiary-ie;
color: @text-tertiary; color: @text-tertiary;
font-style: italic; font-style: italic;
} }

14
apps/common/main/resources/less/window.less
View file

@ -30,7 +30,9 @@
z-index: @zindex-modal-background; z-index: @zindex-modal-background;
box-shadow: 0 5px 15px rgba(0,0,0,0.2); box-shadow: 0 5px 15px rgba(0,0,0,0.2);
border-radius: 5px; border-radius: 5px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
border: solid @scaled-one-px-value-ie @border-toolbar-ie;
border: solid @scaled-one-px-value @border-toolbar; border: solid @scaled-one-px-value @border-toolbar;
left: 0; left: 0;
@ -50,6 +52,7 @@
top: 0; top: 0;
text-overflow: ellipsis; text-overflow: ellipsis;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
@ -57,7 +60,9 @@
vertical-align: bottom; vertical-align: bottom;
line-height: 26px; line-height: 26px;
background: @background-toolbar-ie;
background: @background-toolbar; background: @background-toolbar;
border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie;
border-bottom: solid @scaled-one-px-value @border-toolbar; border-bottom: solid @scaled-one-px-value @border-toolbar;
cursor: move; cursor: move;
@ -95,9 +100,12 @@
content: ' '; content: ' ';
position: absolute; position: absolute;
left: calc(7px/@pixel-ratio-factor); left: calc(7px/@pixel-ratio-factor);
top: @scaled-one-px-value-ie;
top: @scaled-one-px-value; top: @scaled-one-px-value;
height: 14px; height: 14px;
width: @scaled-one-px-value-ie;
width: @scaled-one-px-value; width: @scaled-one-px-value;
background-color: @icon-normal-ie;
background-color: @icon-normal; background-color: @icon-normal;
} }
@ -116,6 +124,7 @@
line-height: 14px; line-height: 14px;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
opacity: 0.7; opacity: 0.7;
@ -146,6 +155,7 @@
position: absolute; position: absolute;
top: 34px; top: 34px;
width: 100%; width: 100%;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
} }
@ -209,9 +219,11 @@
a { a {
text-decoration: underline; text-decoration: underline;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&:focus, &:hover { &:focus, &:hover {
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
} }
@ -270,7 +282,9 @@
width: 5px; width: 5px;
height: 5px; height: 5px;
z-index: 1; z-index: 1;
background: @background-toolbar-ie;
background: @background-toolbar; background: @background-toolbar;
border: @scaled-one-px-value-ie none @border-toolbar-ie;
border: @scaled-one-px-value none @border-toolbar; border: @scaled-one-px-value none @border-toolbar;
&.left { &.left {

1
apps/documenteditor/main/app/controller/Main.js
View file

@ -387,7 +387,6 @@ define([
this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison"); this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison");
this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-controls"); this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-controls");
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); 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)); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));

2
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -313,7 +313,7 @@ define([
cls : 'btn-toolbar' cls : 'btn-toolbar'
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
if ( config.canChangeUITheme ) { if ( Common.UI.Themes.available() ) {
var mnuitemDarkTheme = new Common.UI.MenuItem({ var mnuitemDarkTheme = new Common.UI.MenuItem({
caption: me.header.textDarkTheme, caption: me.header.textDarkTheme,
checked: Common.UI.Themes.isDarkTheme(), checked: Common.UI.Themes.isDarkTheme(),

5
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -244,7 +244,7 @@ define([
'<td class="right"><span id="fms-cmb-show-changes"></span></td>', '<td class="right"><span id="fms-cmb-show-changes"></span></td>',
'</tr>','<tr class="divider coauth changes"></tr>', '</tr>','<tr class="divider coauth changes"></tr>',
/** coauthoring end **/ /** coauthoring end **/
'<tr class="edit">', '<tr class="themes">',
'<td class="left"><label><%= scope.strTheme %></label></td>', '<td class="left"><label><%= scope.strTheme %></label></td>',
'<td class="right"><span id="fms-cmb-theme"></span></td>', '<td class="right"><span id="fms-cmb-theme"></span></td>',
'</tr>','<tr class="divider edit"></tr>', '</tr>','<tr class="divider edit"></tr>',
@ -535,6 +535,9 @@ define([
/** coauthoring end **/ /** coauthoring end **/
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); $('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) { setApi: function(o) {

12
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -10,20 +10,24 @@
margin-bottom: 3px; margin-bottom: 3px;
&:hover:not(.disabled) { &:hover:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.active:not(.disabled) { &.active:not(.disabled) {
outline: 0; outline: 0;
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
> a { > a {
color: @text-normal-pressed-ie;
color: @text-normal-pressed; color: @text-normal-pressed;
} }
} }
&.disabled > a { &.disabled > a {
cursor: default; cursor: default;
color: @border-regular-control-ie;
color: @border-regular-control; color: @border-regular-control;
} }
@ -59,6 +63,7 @@
.panel-context { .panel-context {
width: 100%; width: 100%;
padding-left: 260px; padding-left: 260px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.content-box { .content-box {
@ -154,6 +159,7 @@
h3 { h3 {
margin: 0; margin: 0;
font-size: 10pt; font-size: 10pt;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-weight: bold; font-weight: bold;
padding: 0 0 10px 10px; padding: 0 0 10px 10px;
@ -188,6 +194,7 @@
hr { hr {
margin: 0; margin: 0;
border-bottom: none; border-bottom: none;
border-color: @border-toolbar-ie;
border-color: @border-toolbar; border-color: @border-toolbar;
} }
@ -227,6 +234,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
@ -249,6 +257,7 @@
} }
.file-info { .file-info {
color: @text-secondary-ie;
color: @text-secondary; color: @text-secondary;
} }
} }
@ -266,6 +275,7 @@
} }
.dataview { .dataview {
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
& > .item { & > .item {
@ -280,10 +290,12 @@
&:not(.header-name) { &:not(.header-name) {
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
} }

2
apps/documenteditor/main/resources/less/layout.less
View file

@ -2,6 +2,7 @@ body {
width: 100%; width: 100%;
height: 100%; height: 100%;
.user-select(none); .user-select(none);
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&.safari { &.safari {
@ -39,6 +40,7 @@ label {
top:0; top:0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }

1
apps/documenteditor/main/resources/less/leftmenu.less
View file

@ -13,6 +13,7 @@
top: 0; top: 0;
position: absolute; position: absolute;
z-index: @zindex-dropdown - 5; z-index: @zindex-dropdown - 5;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }

1
apps/documenteditor/main/resources/less/navigation.less
View file

@ -11,6 +11,7 @@
width: 100%; width: 100%;
font-weight: bold; font-weight: bold;
padding: 10px 12px; padding: 10px 12px;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
} }

3
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -85,9 +85,11 @@
.combo-dataview-menu { .combo-dataview-menu {
.form-control { .form-control {
cursor: pointer; cursor: pointer;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&.text { &.text {
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
vertical-align: bottom; vertical-align: bottom;
} }
@ -157,6 +159,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
.caret { .caret {

2
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -69,6 +69,7 @@
.cnt-lang { .cnt-lang {
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
margin-left: 6px; margin-left: 6px;
@ -175,6 +176,7 @@
height: 12px; height: 12px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
border: @scaled-one-px-value-ie solid @border-toolbar-ie;
border: @scaled-one-px-value solid @border-toolbar; border: @scaled-one-px-value solid @border-toolbar;
} }

12
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -27,6 +27,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
opacity: 0; opacity: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
z-index: @zindex-tooltip + 1; z-index: @zindex-tooltip + 1;
} }
@ -48,10 +49,12 @@
width: 246px; width: 246px;
height: @contents-menu-item-height; 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); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
&:hover, &:hover,
&.selected { &.selected {
.box-shadow(0 0 0 2px @border-control-focus-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus);
} }
} }
@ -60,6 +63,7 @@
background-color: transparent; background-color: transparent;
div { div {
.box-shadow(0 0 0 2px @border-control-focus-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus);
} }
} }
@ -91,6 +95,7 @@
opacity: 0.5; opacity: 0.5;
&:hover { &: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); .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.selected,
#watermark-auto-color > a:hover { #watermark-auto-color > a:hover {
span { span {
outline: @scaled-one-px-value-ie solid @icon-normal-ie;
outline: @scaled-one-px-value solid @icon-normal; 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; border: @scaled-one-px-value solid @background-normal;
} }
} }
@ -151,11 +158,14 @@
cursor: default; cursor: default;
position: relative; position: relative;
padding: 14px 11px; 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-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; border-top: @scaled-one-px-value solid @border-regular-control;
} }
.save-style-link { .save-style-link {
border-bottom: @scaled-one-px-value-ie dotted @text-secondary-ie;
border-bottom: @scaled-one-px-value dotted @text-secondary; border-bottom: @scaled-one-px-value dotted @text-secondary;
cursor: pointer; cursor: pointer;
margin-left: 22px; margin-left: 22px;
@ -200,6 +210,8 @@
#special-paste-container { #special-paste-container {
position: absolute; position: absolute;
z-index: @zindex-dropdown - 20; z-index: @zindex-dropdown - 20;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
} }

1
apps/documenteditor/main/resources/less/variables.less
View file

@ -1,6 +1,7 @@
// //
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
@header-background-color-ie: @toolbar-header-document-ie;
@header-background-color: var(--toolbar-header-document); @header-background-color: var(--toolbar-header-document);
// Active color // Active color

1
apps/presentationeditor/main/app/controller/Main.js
View file

@ -345,7 +345,6 @@ define([
this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures; this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings; this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); 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)); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));

2
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -316,7 +316,7 @@ define([
cls : 'btn-toolbar' cls : 'btn-toolbar'
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
if ( config.canChangeUITheme ) { if ( Common.UI.Themes.available() ) {
var mnuitemDarkTheme = new Common.UI.MenuItem({ var mnuitemDarkTheme = new Common.UI.MenuItem({
caption: me.header.textDarkTheme, caption: me.header.textDarkTheme,
checked: Common.UI.Themes.isDarkTheme(), checked: Common.UI.Themes.isDarkTheme(),

6
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -214,7 +214,7 @@ define([
'<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>', '<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
'</tr>','<tr class="divider coauth changes"></tr>', '</tr>','<tr class="divider coauth changes"></tr>',
/** coauthoring end **/ /** coauthoring end **/
'<tr class="edit">', '<tr class="themes">',
'<td class="left"><label><%= scope.strTheme %></label></td>', '<td class="left"><label><%= scope.strTheme %></label></td>',
'<td class="right"><span id="fms-cmb-theme"></span></td>', '<td class="right"><span id="fms-cmb-theme"></span></td>',
'</tr>','<tr class="divider edit"></tr>', '</tr>','<tr class="divider edit"></tr>',
@ -471,6 +471,10 @@ define([
$('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
/** coauthoring end **/ /** coauthoring end **/
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show'](); $('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) { setApi: function(o) {

1
apps/presentationeditor/main/resources/less/document-preview.less
View file

@ -3,6 +3,7 @@
} }
.preview-controls { .preview-controls {
display: table; display: table;
background: @background-toolbar-ie;
background: @background-toolbar; background: @background-toolbar;
height: 35px; height: 35px;
z-index: 10; z-index: 10;

2
apps/presentationeditor/main/resources/less/layout.less
View file

@ -2,6 +2,7 @@ body {
width: 100%; width: 100%;
height: 100%; height: 100%;
.user-select(none); .user-select(none);
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&.safari { &.safari {
@ -50,6 +51,7 @@ label {
top:0; top:0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }

10
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -5,7 +5,9 @@
border-right: 0 none; border-right: 0 none;
&.move { &.move {
border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-left: @scaled-one-px-value solid @border-toolbar; 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-right: @scaled-one-px-value solid @border-toolbar;
opacity: 0.4; opacity: 0.4;
} }
@ -20,6 +22,7 @@
top: 0; top: 0;
position: absolute; position: absolute;
z-index: @zindex-dropdown - 5; z-index: @zindex-dropdown - 5;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }
@ -57,11 +60,13 @@
margin-bottom: 3px; margin-bottom: 3px;
&:hover { &:hover {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.active { &.active {
outline: 0; outline: 0;
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
> a { > a {
@ -115,6 +120,7 @@
.panel-context { .panel-context {
width: 100%; width: 100%;
padding-left: 260px; padding-left: 260px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.content-box { .content-box {
@ -259,6 +265,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
@ -300,6 +307,7 @@
} }
.dataview { .dataview {
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
& > div:not([class^=ps-scrollbar]) { & > div:not([class^=ps-scrollbar]) {
@ -314,10 +322,12 @@
&:not(.header-name) { &:not(.header-name) {
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
} }

3
apps/presentationeditor/main/resources/less/rightmenu.less
View file

@ -21,9 +21,11 @@
.combo-dataview-menu { .combo-dataview-menu {
.form-control { .form-control {
cursor: pointer; cursor: pointer;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&.text { &.text {
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
vertical-align: bottom; vertical-align: bottom;
} }
@ -92,6 +94,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
.caret { .caret {

1
apps/presentationeditor/main/resources/less/statusbar.less
View file

@ -167,6 +167,7 @@
height: 12px; height: 12px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
border: @scaled-one-px-value-ie solid @border-toolbar-ie;
border: @scaled-one-px-value solid @border-toolbar; border: @scaled-one-px-value solid @border-toolbar;
} }

3
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -29,6 +29,7 @@
&:hover, &:hover,
&.selected { &.selected {
.layout > div:first-child { .layout > div:first-child {
.box-shadow(0 0 0 2px @highlight-button-pressed-ie);
.box-shadow(0 0 0 2px @highlight-button-pressed); .box-shadow(0 0 0 2px @highlight-button-pressed);
} }
} }
@ -96,7 +97,9 @@
#special-paste-container { #special-paste-container {
position: absolute; position: absolute;
z-index: @zindex-dropdown - 20; z-index: @zindex-dropdown - 20;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
} }

1
apps/presentationeditor/main/resources/less/variables.less
View file

@ -1,5 +1,6 @@
// Paths // Paths
// ------------------------- // -------------------------
@header-background-color-ie: @toolbar-header-presentation-ie;
@header-background-color: var(--toolbar-header-presentation); @header-background-color: var(--toolbar-header-presentation);
// Grays // Grays

1
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -374,7 +374,6 @@ define([
this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink; this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink;
this.appOptions.canFeaturePivot = true; this.appOptions.canFeaturePivot = true;
this.appOptions.canFeatureViews = !!this.api.asc_isSupportFeature("sheet-views"); 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) if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge)
Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this)); Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));

2
apps/spreadsheeteditor/main/app/controller/Viewport.js
View file

@ -327,7 +327,7 @@ define([
cls : 'btn-toolbar' cls : 'btn-toolbar'
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
if ( config.canChangeUITheme ) { if ( Common.UI.Themes.available() ) {
var mnuitemDarkTheme = new Common.UI.MenuItem({ var mnuitemDarkTheme = new Common.UI.MenuItem({
caption: me.header.textDarkTheme, caption: me.header.textDarkTheme,
checked: Common.UI.Themes.isDarkTheme(), checked: Common.UI.Themes.isDarkTheme(),

6
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -691,7 +691,7 @@ define([
'<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>', '<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
'</tr>','<tr class="divider coauth changes"></tr>', '</tr>','<tr class="divider coauth changes"></tr>',
/** coauthoring end **/ /** coauthoring end **/
'<tr class="edit">', '<tr class="themes">',
'<td class="left"><label><%= scope.strTheme %></label></td>', '<td class="left"><label><%= scope.strTheme %></label></td>',
'<td class="right"><span id="fms-cmb-theme"></span></td>', '<td class="right"><span id="fms-cmb-theme"></span></td>',
'</tr>','<tr class="divider edit"></tr>', '</tr>','<tr class="divider edit"></tr>',
@ -1080,6 +1080,10 @@ define([
$('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && 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'](); $('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) { setApi: function(api) {

1
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

@ -92,6 +92,7 @@
.sort-dialog-btn-caret { .sort-dialog-btn-caret {
display: inline-block; display: inline-block;
border: @scaled-one-px-value-ie solid #cfcfcf;
border: @scaled-one-px-value solid #cfcfcf; border: @scaled-one-px-value solid #cfcfcf;
border-radius: 1px; border-radius: 1px;
} }

13
apps/spreadsheeteditor/main/resources/less/celleditor.less
View file

@ -1,13 +1,18 @@
#cell-editing-box { #cell-editing-box {
border-bottom: solid @scaled-one-px-value-ie @border-toolbar-ie;
border-bottom: solid @scaled-one-px-value @border-toolbar; 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; border-left: solid @scaled-one-px-value @border-toolbar;
min-height: 20px; min-height: 20px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.ce-group-name { .ce-group-name {
float: left; float: left;
height: 20px; height: 20px;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
#ce-cell-name { #ce-cell-name {
@ -17,11 +22,13 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
border: 0 none; border: 0 none;
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
transition: none; transition: none;
-webkit-transition: none; -webkit-transition: none;
&[disabled] { &[disabled] {
color: @border-preview-select-ie;
color: @border-preview-select; color: @border-preview-select;
opacity: 0.5; opacity: 0.5;
} }
@ -31,9 +38,11 @@
display: inline-block; display: inline-block;
position: absolute; position: absolute;
left: 80px; left: 80px;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
button { button {
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
height: 19px; height: 19px;
@ -75,6 +84,7 @@
padding-left: 1px; padding-left: 1px;
margin: 0 16px 0 120px; margin: 0 16px 0 120px;
height: 100%; height: 100%;
border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-left: @scaled-one-px-value solid @border-toolbar; border-left: @scaled-one-px-value solid @border-toolbar;
#ce-cell-content { #ce-cell-content {
@ -87,6 +97,7 @@
padding-bottom: 0; padding-bottom: 0;
&[disabled] { &[disabled] {
color: @border-preview-select-ie;
color: @border-preview-select; color: @border-preview-select;
opacity: 0.5; opacity: 0.5;
} }
@ -102,7 +113,9 @@
border-bottom: 0 none; border-bottom: 0 none;
&.move { &.move {
border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-top: @scaled-one-px-value solid @border-toolbar; 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; border-bottom: @scaled-one-px-value solid @border-toolbar;
opacity: 0.4; opacity: 0.4;
} }

6
apps/spreadsheeteditor/main/resources/less/filterdialog.less
View file

@ -17,14 +17,19 @@
} }
.border-values { .border-values {
border: @scaled-one-px-value-ie solid @input-border;
border: @scaled-one-px-value solid @input-border; border: @scaled-one-px-value solid @input-border;
.item { .item {
&.selected { &.selected {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
border-color: @highlight-button-hover-ie;
border-color: @highlight-button-hover; border-color: @highlight-button-hover;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
border-style: solid; border-style: solid;
border-width: @scaled-one-px-value-ie 0;
border-width: @scaled-one-px-value 0; border-width: @scaled-one-px-value 0;
} }
} }
@ -94,6 +99,7 @@
} }
&.border { &.border {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(1px); .border-radius(1px);
width: 22px; width: 22px;

4
apps/spreadsheeteditor/main/resources/less/layout.less
View file

@ -2,6 +2,7 @@ body {
width: 100%; width: 100%;
height: 100%; height: 100%;
.user-select(none); .user-select(none);
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
&.safari { &.safari {
@ -33,6 +34,7 @@ label {
top:0; top:0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }
@ -52,7 +54,9 @@ label {
} }
#editor_sdk { #editor_sdk {
border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-top: @scaled-one-px-value solid @border-toolbar; 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; border-left: @scaled-one-px-value solid @border-toolbar;
} }

14
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -5,7 +5,9 @@
border-right: 0 none; border-right: 0 none;
&.move { &.move {
border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-left: @scaled-one-px-value solid @border-toolbar; 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-right: @scaled-one-px-value solid @border-toolbar;
opacity: 0.4; opacity: 0.4;
} }
@ -20,6 +22,7 @@
top: 0; top: 0;
position: absolute; position: absolute;
z-index: @zindex-dropdown - 5; z-index: @zindex-dropdown - 5;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
overflow: hidden; overflow: hidden;
} }
@ -57,11 +60,13 @@
margin-bottom: 3px; margin-bottom: 3px;
&:hover:not(.disabled) { &:hover:not(.disabled) {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
&.active:not(.disabled) { &.active:not(.disabled) {
outline: 0; outline: 0;
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
> a { > a {
@ -71,6 +76,7 @@
&.disabled > a { &.disabled > a {
cursor: default; cursor: default;
color: @border-regular-control-ie;
color: @border-regular-control; color: @border-regular-control;
} }
} }
@ -105,6 +111,7 @@
.panel-context { .panel-context {
width: 100%; width: 100%;
padding-left: 260px; padding-left: 260px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
.content-box { .content-box {
@ -155,6 +162,7 @@
#id-settings-menu { #id-settings-menu {
.dataview { .dataview {
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
& > div:not([class^=ps-scrollbar]) { & > div:not([class^=ps-scrollbar]) {
@ -178,10 +186,12 @@
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
@ -323,6 +333,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
@ -364,6 +375,7 @@
} }
.dataview { .dataview {
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
& > div:not([class^=ps-scrollbar]) { & > div:not([class^=ps-scrollbar]) {
@ -378,10 +390,12 @@
&:not(.header-name) { &:not(.header-name) {
&:hover, &:hover,
&.over { &.over {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
} }
&.selected { &.selected {
background-color: @highlight-button-pressed-ie;
background-color: @highlight-button-pressed; background-color: @highlight-button-pressed;
color: @dropdown-link-active-color; color: @dropdown-link-active-color;
} }

3
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View file

@ -15,9 +15,11 @@
.combo-dataview-menu { .combo-dataview-menu {
.form-control { .form-control {
cursor: pointer; cursor: pointer;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
&.text { &.text {
background: @background-normal-ie;
background: @background-normal; background: @background-normal;
vertical-align: bottom; vertical-align: bottom;
} }
@ -162,6 +164,7 @@
&:hover, &:hover,
&.over { &.over {
background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
.caret { .caret {

1
apps/spreadsheeteditor/main/resources/less/spellcheck.less
View file

@ -19,6 +19,7 @@
#spellcheck-suggestions-list { #spellcheck-suggestions-list {
width: 100%; width: 100%;
height: 116px; height: 116px;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
margin-bottom: 8px; margin-bottom: 8px;
} }

24
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -23,6 +23,7 @@
text-align: center; text-align: center;
&.disabled { &.disabled {
color: @border-preview-select-ie;
color: @border-preview-select; color: @border-preview-select;
cursor: default; cursor: default;
} }
@ -93,6 +94,7 @@
height: 12px; height: 12px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
border: @scaled-one-px-value-ie solid @border-toolbar-ie;
border: @scaled-one-px-value solid @border-toolbar; border: @scaled-one-px-value solid @border-toolbar;
} }
@ -111,7 +113,9 @@
#status-addtabs-box { #status-addtabs-box {
float: left; float: left;
padding: 3px 8px 0 8px; 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-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-right: @scaled-one-px-value solid @border-toolbar;
height: 25px; height: 25px;
} }
@ -155,6 +159,7 @@
display: flex; display: flex;
> li { > li {
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
&:first-of-type { &:first-of-type {
@ -175,22 +180,31 @@
padding: 0 10px 0; padding: 0 10px 0;
line-height: 24px; line-height: 24px;
margin-right: -1px; margin-right: -1px;
background-color: @background-toolbar-additional-ie;
background-color: @background-toolbar-additional; background-color: @background-toolbar-additional;
outline: none; outline: none;
border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-left: @scaled-one-px-value solid @border-toolbar; 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-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; border-top: @scaled-one-px-value solid @border-toolbar;
&:hover { &:hover {
border-top-color: @border-toolbar-ie;
border-top-color: @border-toolbar; border-top-color: @border-toolbar;
border-bottom-color: @border-toolbar-ie;
border-bottom-color: @border-toolbar; border-bottom-color: @border-toolbar;
color: @text-normal-ie !important;
color: @text-normal !important; color: @text-normal !important;
} }
} }
&.active { &.active {
> span { > span {
border-bottom-color: @background-toolbar-ie;
border-bottom-color: @background-toolbar; border-bottom-color: @background-toolbar;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
outline: none; outline: none;
@ -203,9 +217,12 @@
&.selected { &.selected {
> span { > span {
border-bottom-color: @highlight-header-button-hover-ie;
border-bottom-color: @highlight-header-button-hover; border-bottom-color: @highlight-header-button-hover;
background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
box-shadow: 0px 4px 0 #49795d inset; box-shadow: 0px 4px 0 #49795d inset;
color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
} }
@ -257,6 +274,7 @@
&:not(.active) { &:not(.active) {
> span { > span {
color: @text-secondary-ie;
color: @text-secondary; color: @text-secondary;
} }
} }
@ -270,13 +288,16 @@
} }
> span { > span {
border-left: 2px solid @text-normal-ie;
border-left: 2px solid @text-normal; border-left: 2px solid @text-normal;
padding-left: 9px; padding-left: 9px;
} }
&.right { &.right {
> span { > span {
border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-left: @scaled-one-px-value solid @border-toolbar; border-left: @scaled-one-px-value solid @border-toolbar;
border-right: 2px solid @text-normal-ie;
border-right: 2px solid @text-normal; border-right: 2px solid @text-normal;
padding-right: 9px; padding-right: 9px;
padding-left: 10px; padding-left: 10px;
@ -295,10 +316,12 @@
} }
&.separator-item { &.separator-item {
margin-left: 20px; margin-left: 20px;
width: @scaled-one-px-value-ie;
width: @scaled-one-px-value; width: @scaled-one-px-value;
> span { > span {
padding: 0; padding: 0;
margin: 0; margin: 0;
width: @scaled-one-px-value-ie;
width: @scaled-one-px-value; width: @scaled-one-px-value;
&::after { &::after {
content: none; content: none;
@ -390,6 +413,7 @@
width: 36px; width: 36px;
height: 100%; height: 100%;
opacity: 0; opacity: 0;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
z-index: @zindex-modal - 1; z-index: @zindex-modal - 1;
} }

4
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -106,7 +106,9 @@
#id-toolbar-menu-auto-fontcolor > a.selected, #id-toolbar-menu-auto-fontcolor > a.selected,
#id-toolbar-menu-auto-fontcolor > a:hover { #id-toolbar-menu-auto-fontcolor > a:hover {
span { span {
outline: @scaled-one-px-value-ie solid @border-regular-control-ie;
outline: @scaled-one-px-value solid @border-regular-control; 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; border: @scaled-one-px-value solid @background-normal;
} }
} }
@ -115,7 +117,9 @@
#autocorrect-paste-container { #autocorrect-paste-container {
position: absolute; position: absolute;
z-index: @zindex-dropdown - 20; z-index: @zindex-dropdown - 20;
background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
} }

1
apps/spreadsheeteditor/main/resources/less/variables.less
View file

@ -1,6 +1,7 @@
// //
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
@header-background-color-ie: @toolbar-header-spreadsheet-ie;
@header-background-color: var(--toolbar-header-spreadsheet); @header-background-color: var(--toolbar-header-spreadsheet);
// Active color // Active color