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

Merge branch 'release/v6.3.0' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-15 17:54:30 +03:00
parent c2e0ffb2be e403257024
commit 1677cbfedd
10 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,8 +186,8 @@
&.active:not(.disabled) { &.active:not(.disabled) {
.caret-up, .caret-down { .caret-up, .caret-down {
&::after { &::after {
border-color: @background-normal-ie; border-color: @text-normal-pressed-ie;
border-color: @background-normal; border-color: @text-normal-pressed;
} }
} }
@ -331,8 +331,14 @@
.btn.small; .btn.small;
&.bg-white { &.bg-white {
width: 22px;
height: 22px;
background-color: @background-normal-ie; 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-radius(@border-radius-small);
} }
&:before, &:before,

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

@ -18,9 +18,9 @@
--highlight-button-hover: #555; --highlight-button-hover: #555;
--highlight-button-pressed: #606060; --highlight-button-pressed: #606060;
--highlight-button-pressed-hover: #808080; --highlight-button-pressed-hover: #808080;
--highlight-primary-dialog-button-hover: #e5e5e5; --highlight-primary-dialog-button-hover: #fcfcfc;
--highlight-header-button-hover: fade(#000, 20%); --highlight-header-button-hover: fade(#fff, 5%);
--highlight-header-button-pressed: fade(#000, 25%); --highlight-header-button-pressed: fade(#fff, 15%);
--highlight-toolbar-tab-underline: #ddd; --highlight-toolbar-tab-underline: #ddd;
--highlight-text-select: #96c8fd; --highlight-text-select: #96c8fd;
@ -28,17 +28,17 @@
--border-divider: #505050; --border-divider: #505050;
--border-regular-control: #666666; --border-regular-control: #666666;
--border-toolbar-button-hover: #5a5a5a; --border-toolbar-button-hover: #5a5a5a;
--border-preview-hover: #e0e0e0; --border-preview-hover: #5a5a5a;
--border-preview-select: #666666; --border-preview-select: #666666;
--border-control-focus: #ccc; --border-control-focus: #ccc;
--border-color-shading: fade(#fff, 15%); --border-color-shading: fade(#fff, 5%);
--border-error: #f62211; --border-error: #f62211;
--text-normal: fade(#fff, 80%); --text-normal: fade(#fff, 80%);
--text-normal-pressed: fade(#fff, 80%); --text-normal-pressed: fade(#fff, 80%);
--text-secondary: fade(#fff, 60%); --text-secondary: fade(#fff, 60%);
--text-tertiary: fade(#fff, 40%); --text-tertiary: fade(#fff, 40%);
--text-link: #acbfff; --text-link: #b5e4ff;
--text-inverse: #333; --text-inverse: #333;
--text-toolbar-header: fade(#fff, 80%); --text-toolbar-header: fade(#fff, 80%);
--text-contrast-background: #fff; --text-contrast-background: #fff;
@ -58,9 +58,9 @@
--canvas-ruler-background: #555; --canvas-ruler-background: #555;
--canvas-ruler-margins-background: #444; --canvas-ruler-margins-background: #444;
--canvas-ruler-mark: #b2b2b2; --canvas-ruler-mark: #b6b6b6;
--canvas-ruler-handle-border: #b2b2b2; --canvas-ruler-handle-border: #b6b6b6;
--canvas-ruler-handle-border-disabled: #717171; --canvas-ruler-handle-border-disabled: #808080;
--canvas-high-contrast: #fff; --canvas-high-contrast: #fff;
--canvas-high-contrast-disabled: #888; --canvas-high-contrast-disabled: #888;
@ -112,8 +112,8 @@
--component-normal-icon-opacity: .8; --component-normal-icon-opacity: .8;
--component-hover-icon-opacity: .8; --component-hover-icon-opacity: .8;
--component-active-icon-opacity: .8; --component-active-icon-opacity: 1;
--component-active-hover-icon-opacity: .8; --component-active-hover-icon-opacity: 1;
--component-disabled-opacity: .3; --component-disabled-opacity: .3;
--menu-icon-item-checked-offset-x: -20px; --menu-icon-item-checked-offset-x: -20px;

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

@ -28,8 +28,8 @@
--highlight-button-hover: #e0e0e0; --highlight-button-hover: #e0e0e0;
--highlight-button-pressed: #ccc; --highlight-button-pressed: #ccc;
--highlight-button-pressed-hover: #bababa; --highlight-button-pressed-hover: #bababa;
--highlight-primary-dialog-button-hover: #2b2b2b; --highlight-primary-dialog-button-hover: #1c1c1c;
--highlight-header-button-hover: fade(#fff, 20%); --highlight-header-button-hover: fade(#fff, 15%);
--highlight-header-button-pressed: fade(#fff, 25%); --highlight-header-button-pressed: fade(#fff, 25%);
--highlight-toolbar-tab-underline: #444; --highlight-toolbar-tab-underline: #444;
--highlight-text-select: #3494fb; --highlight-text-select: #3494fb;
@ -41,7 +41,7 @@
--border-preview-hover: #cfcfcf; --border-preview-hover: #cfcfcf;
--border-preview-select: #aaa; --border-preview-select: #aaa;
--border-control-focus: #848484; --border-control-focus: #848484;
--border-color-shading: fade(#000, 15%); --border-color-shading: fade(#000, 10%);
--border-error: #f62211; --border-error: #f62211;
--text-normal: fade(#000, 80%); --text-normal: fade(#000, 80%);
@ -63,7 +63,7 @@
// Canvas // Canvas
--canvas-background: #f0f0f0; --canvas-background: #eee;
--canvas-content-background: #fff; --canvas-content-background: #fff;
--canvas-page-border: #ccc; --canvas-page-border: #ccc;
@ -71,7 +71,7 @@
--canvas-ruler-margins-background: #d9d9d9; --canvas-ruler-margins-background: #d9d9d9;
--canvas-ruler-mark: #555; --canvas-ruler-mark: #555;
--canvas-ruler-handle-border: #555; --canvas-ruler-handle-border: #555;
--canvas-ruler-handle-border-disabled: #bbb; --canvas-ruler-handle-border-disabled: #aaa;
--canvas-high-contrast: #000; --canvas-high-contrast: #000;
--canvas-high-contrast-disabled: #999; --canvas-high-contrast-disabled: #999;
@ -93,8 +93,8 @@
--canvas-scroll-thumb: #f7f7f7; --canvas-scroll-thumb: #f7f7f7;
--canvas-scroll-thumb-hover: #c0c0c0; --canvas-scroll-thumb-hover: #c0c0c0;
--canvas-scroll-thumb-pressed: #adadad; --canvas-scroll-thumb-pressed: #adadad;
--canvas-scroll-thumb-border: #c0c0c0; --canvas-scroll-thumb-border: #cbcbcb;
--canvas-scroll-thumb-border-hover: #c0c0c0; --canvas-scroll-thumb-border-hover: #cbcbcb;
--canvas-scroll-thumb-border-pressed: #adadad; --canvas-scroll-thumb-border-pressed: #adadad;
--canvas-scroll-arrow: #adadad; --canvas-scroll-arrow: #adadad;
--canvas-scroll-arrow-hover: #f7f7f7; --canvas-scroll-arrow-hover: #f7f7f7;
@ -124,8 +124,8 @@
--component-normal-icon-opacity: .8; --component-normal-icon-opacity: .8;
--component-hover-icon-opacity: .8; --component-hover-icon-opacity: .8;
--component-active-icon-opacity: .8; --component-active-icon-opacity: 1;
--component-active-hover-icon-opacity: .8; --component-active-hover-icon-opacity: 1;
--component-disabled-opacity: .4; --component-disabled-opacity: .4;
//--button-icon-opacity: 1; //--button-icon-opacity: 1;
} }

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -2101,7 +2101,7 @@ define([
store : PE.getCollection('SlideLayouts'), store : PE.getCollection('SlideLayouts'),
itemTemplate: _.template([ itemTemplate: _.template([
'<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">', '<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
'<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"></div>', '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;background-size: contain;"></div>',
'<div class="title"><%= title %></div> ', '<div class="title"><%= title %></div> ',
'</div>' '</div>'
].join('')) ].join(''))

4
apps/spreadsheeteditor/main/app/template/SortDialog.template
View file

@ -6,8 +6,8 @@
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-add"><%= scope.textAdd %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-add"><%= scope.textAdd %></button>
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-delete"><%= scope.textDelete %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-delete"><%= scope.textDelete %></button>
<button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-copy"><%= scope.textCopy %></button> <button type="button" class="btn btn-text-default auto sort-dialog-btn-text" id="sort-dialog-btn-copy"><%= scope.textCopy %></button>
<div id="sort-dialog-btn-up" class="sort-dialog-btn-caret"></div> <div id="sort-dialog-btn-up" style="display: inline-block;"></div>
<div id="sort-dialog-btn-down" class="sort-dialog-btn-caret"></div> <div id="sort-dialog-btn-down" style="display: inline-block;"></div>
<button type="button" class="btn btn-text-default" id="sort-dialog-btn-options" style="min-width: 100px;"><%= scope.textOptions %></button> <button type="button" class="btn btn-text-default" id="sort-dialog-btn-options" style="min-width: 100px;"><%= scope.textOptions %></button>
</td> </td>
</tr> </tr>

8
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -85,8 +85,8 @@ define([
'<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-edit" style="min-width: 70px;margin-right:5px;">', me.textEdit, '</button>', '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-edit" style="min-width: 70px;margin-right:5px;">', me.textEdit, '</button>',
'<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-delete" style="min-width: 70px;margin-right:5px;">', me.textDelete, '</button>', '<button type="button" class="btn btn-text-default auto" id="chart-dlg-btn-delete" style="min-width: 70px;margin-right:5px;">', me.textDelete, '</button>',
'<div style="display: inline-block; float: right;">', '<div style="display: inline-block; float: right;">',
'<div id="chart-dlg-btn-up" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;margin-right: 2px;"></div>', '<div id="chart-dlg-btn-up" style="display: inline-block;margin-right: 2px;"></div>',
'<div id="chart-dlg-btn-down" style="display: inline-block;border: 1px solid #cfcfcf;border-radius: 1px;"></div>', '<div id="chart-dlg-btn-down" style="display: inline-block;"></div>',
'</div>', '</div>',
'</td>', '</td>',
'</tr>', '</tr>',
@ -175,7 +175,7 @@ define([
this.btnUp = new Common.UI.Button({ this.btnUp = new Common.UI.Button({
parentEl: $('#chart-dlg-btn-up'), parentEl: $('#chart-dlg-btn-up'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-up', iconCls: 'caret-up',
hint: this.textUp hint: this.textUp
}); });
@ -183,7 +183,7 @@ define([
this.btnDown = new Common.UI.Button({ this.btnDown = new Common.UI.Button({
parentEl: $('#chart-dlg-btn-down'), parentEl: $('#chart-dlg-btn-down'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-down', iconCls: 'caret-down',
hint: this.textDown hint: this.textDown
}); });

4
apps/spreadsheeteditor/main/app/view/SortDialog.js
View file

@ -177,7 +177,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
this.btnUp = new Common.UI.Button({ this.btnUp = new Common.UI.Button({
parentEl: $('#sort-dialog-btn-up'), parentEl: $('#sort-dialog-btn-up'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-up', iconCls: 'caret-up',
hint: this.textUp hint: this.textUp
}); });
@ -185,7 +185,7 @@ define([ 'text!spreadsheeteditor/main/app/template/SortDialog.template',
this.btnDown = new Common.UI.Button({ this.btnDown = new Common.UI.Button({
parentEl: $('#sort-dialog-btn-down'), parentEl: $('#sort-dialog-btn-down'),
cls: 'btn-toolbar', cls: 'btn-toolbar bg-white',
iconCls: 'caret-down', iconCls: 'caret-down',
hint: this.textDown hint: this.textDown
}); });

2
apps/spreadsheeteditor/main/app/view/Spellcheck.js
View file

@ -89,7 +89,7 @@ define([
this.buttonNext = new Common.UI.Button({ this.buttonNext = new Common.UI.Button({
parentEl: $('#spellcheck-next'), parentEl: $('#spellcheck-next'),
style: 'margin-left: 5px; width: 22px; height: 22px; border: 1px solid #cfcfcf;', style: 'margin-left: 5px;',
cls: 'btn-toolbar bg-white', cls: 'btn-toolbar bg-white',
iconCls: 'toolbar__icon btn-nextitem', iconCls: 'toolbar__icon btn-nextitem',
hint: this.txtNextTip hint: this.txtNextTip

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

@ -90,13 +90,6 @@
} }
} }
.sort-dialog-btn-caret {
display: inline-block;
border: @scaled-one-px-value-ie solid #cfcfcf;
border: @scaled-one-px-value solid #cfcfcf;
border-radius: 1px;
}
#sort-dialog-btn-down { #sort-dialog-btn-down {
margin-right: 5px; margin-right: 5px;
} }

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

@ -196,8 +196,7 @@
color: @text-normal-pressed; color: @text-normal-pressed;
.settings-icon { .settings-icon {
background-position-x: -20px; background-position-x: @button-small-active-icon-offset-x;
--bgX: -20px;
} }
} }
} }