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

Merge pull request #848 from ONLYOFFICE/feature/px24-fix-bug-50024

Browse source 
Feature/px24 fix bug 50024
This commit is contained in:
maxkadushkin 2021-04-28 14:15:46 +03:00 committed by GitHub
parent 4aaaf833ff 134001162c
commit ba6a752ec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,8 +115,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;
--header-component-normal-icon-opacity: 1; --header-component-normal-icon-opacity: 1;

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

@ -224,6 +224,8 @@
@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1); @header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1);
@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
@img-border-type-filter: var(--image-border-types-filter, none);
@img-border-type-filter-selected: var(--image-border-types-filter-selected, none);
// Canvas // Canvas
// --------------------------- // ---------------------------

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

@ -1,5 +1,3 @@
@img-borders-filter: var(--image-border-types-filter);
@img-borders-filter-selected: var(--image-border-types-filter-selected);
.combobox { .combobox {
display: block; display: block;
@ -33,8 +31,8 @@
float: none; float: none;
.image { .image {
-webkit-filter: @img-borders-filter; -webkit-filter: @img-border-type-filter;
filter: @img-borders-filter; filter: @img-border-type-filter;
} }
} }
@ -98,6 +96,16 @@
} }
} }
&.input-group-nr {
.btn {
&:active {
.caret {
border-color: @icon-normal;
}
}
}
}
li { li {
a { a {
white-space: pre; white-space: pre;
@ -126,22 +134,22 @@
// ------------------------ // ------------------------
li { li {
img { img {
-webkit-filter: @img-borders-filter; -webkit-filter: @img-border-type-filter;
filter: @img-borders-filter; filter: @img-border-type-filter;
} }
canvas { canvas {
-webkit-filter: @img-borders-filter; -webkit-filter: @img-border-type-filter;
filter: @img-borders-filter; filter: @img-border-type-filter;
} }
&.selected { &.selected {
img { img {
-webkit-filter: @img-borders-filter-selected; -webkit-filter: @img-border-type-filter-selected;
filter: @img-borders-filter-selected; filter: @img-border-type-filter-selected;
} }
canvas { canvas {
-webkit-filter: @img-borders-filter-selected; -webkit-filter: @img-border-type-filter-selected;
filter: @img-borders-filter-selected; filter: @img-border-type-filter-selected;
} }
} }

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

@ -39,8 +39,8 @@
&:focus, &.focus { &:focus, &.focus {
outline: 0; outline: 0;
color: @text-normal-pressed-ie; color: @text-normal-ie;
color: @text-normal-pressed; color: @text-normal;
background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover-ie;
background-color: @highlight-button-hover; background-color: @highlight-button-hover;
} }
@ -55,14 +55,14 @@
&.over > a { &.over > a {
text-decoration: none; text-decoration: none;
color: @text-normal-pressed-ie; //color: @text-normal-pressed-ie;
color: @text-normal-pressed; //color: @text-normal-pressed;
background-color: @highlight-button-hover-ie; 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-ie;
border-left-color: @icon-normal-pressed; border-left-color: @icon-normal;
} }
} }

8
apps/spreadsheeteditor/main/app/controller/CellEditor.js
View file

@ -190,11 +190,15 @@ define([
onLayoutResize: function(o, r) { onLayoutResize: function(o, r) {
if (r == 'cell:edit') { if (r == 'cell:edit') {
if (Math.floor(this.editor.$el.height()) > 19) { if (Math.floor(this.editor.$el.height()) > 19) {
if (!this.editor.$btnexpand.hasClass('btn-collapse')) if (!this.editor.$btnexpand.hasClass('btn-collapse')) {
this.editor.$el.addClass('expanded');
this.editor.$btnexpand['addClass']('btn-collapse'); this.editor.$btnexpand['addClass']('btn-collapse');
}
o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height()); o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height());
o && Common.localStorage.setBool('sse-celleditor-expand', true); o && Common.localStorage.setBool('sse-celleditor-expand', true);
} else { } else {
this.editor.$el.removeClass('expanded');
this.editor.$btnexpand['removeClass']('btn-collapse'); this.editor.$btnexpand['removeClass']('btn-collapse');
o && Common.localStorage.setBool('sse-celleditor-expand', false); o && Common.localStorage.setBool('sse-celleditor-expand', false);
} }
@ -232,10 +236,12 @@ define([
if ( Math.floor(this.editor.$el.height()) > 19) { if ( Math.floor(this.editor.$el.height()) > 19) {
this.editor.keep_height = this.editor.$el.height(); this.editor.keep_height = this.editor.$el.height();
this.editor.$el.height(19); this.editor.$el.height(19);
this.editor.$el.removeClass('expanded');
this.editor.$btnexpand['removeClass']('btn-collapse'); this.editor.$btnexpand['removeClass']('btn-collapse');
Common.localStorage.setBool('sse-celleditor-expand', false); Common.localStorage.setBool('sse-celleditor-expand', false);
} else { } else {
this.editor.$el.height(this.editor.keep_height); this.editor.$el.height(this.editor.keep_height);
this.editor.$el.addClass('expanded');
this.editor.$btnexpand['addClass']('btn-collapse'); this.editor.$btnexpand['addClass']('btn-collapse');
Common.localStorage.setBool('sse-celleditor-expand', true); Common.localStorage.setBool('sse-celleditor-expand', true);
} }

2
apps/spreadsheeteditor/main/index.html
View file

@ -92,7 +92,7 @@
.loadmask > .sktoolbar li { .loadmask > .sktoolbar li {
background: #ccc; background: #ccc;
background: var(--highlight-button-pressed, #ccc); background: var(--highlight-button-hover, #ccc);
border-radius: 3px; border-radius: 3px;
width: 20px; width: 20px;
height: 20px; height: 20px;

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 207 B

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

@ -4,20 +4,21 @@
border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; 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-toolbar-ie;
background-color: @background-normal; background-color: @background-toolbar;
.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-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-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
#ce-cell-name { #ce-cell-name {
width: 100px; width: 100px;
height: 19px; height: 19px;
height: calc(19px + (1px - 1px/var(--pixel-ratio-factor,1)));
padding: 0px 19px 0 4px; padding: 0px 19px 0 4px;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
@ -26,6 +27,8 @@
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;
box-shadow: 0 @scaled-one-px-value-ie 0 0 @border-toolbar-ie;
box-shadow: 0 @scaled-one-px-value 0 0 @border-toolbar;
&[disabled] { &[disabled] {
color: @border-preview-select-ie; color: @border-preview-select-ie;
@ -53,7 +56,7 @@
&:active:not(.disabled), &:active:not(.disabled),
&.active:not(.disabled){ &.active:not(.disabled){
.caret { .caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y; border-color: @icon-normal;
} }
} }
} }
@ -75,9 +78,19 @@
} }
} }
&:not(.expanded) {
#ce-func-label {
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar;
}
}
.ce-group-expand { .ce-group-expand {
float: right; float: right;
height: 20px; //height: 20px;
height: 100%;
background-color: @background-normal-ie;
background-color: @background-normal;
} }
.ce-group-content { .ce-group-content {
@ -130,8 +143,8 @@
padding: 0 2px 0; padding: 0 2px 0;
.caret { .caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
transition: transform .2s; transition: transform .2s;
border-color: @icon-normal;
} }
&.btn-collapse { &.btn-collapse {

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

@ -211,11 +211,11 @@
background-size: 60px auto; background-size: 60px auto;
.pixel-ratio__1_5 & { .pixel-ratio__1_5 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)"; background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
} }
.pixel-ratio__2 & { .pixel-ratio__2 & {
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)"; background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
} }
} }
} }

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

@ -77,27 +77,19 @@
#id-toolbar-mnu-item-border-width { #id-toolbar-mnu-item-border-width {
.border-size-item { .border-size-item {
background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0"; background: ~"url(@{app-image-const-path}/toolbar/BorderSize.png) no-repeat scroll 0 0";
background-size: 60px auto;
width: 60px; width: 60px;
height: 20px; height: 20px;
margin: -3px 10px -2px; margin: -3px 10px -2px;
filter: @component-normal-icon-filter; filter: @img-border-type-filter;
@media only screen { .pixel-ratio__1_5 & {
//@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
// (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), //background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
// (min-resolution: 144dpi) and (max-resolution: 191dpi) }
//{
// background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)";
// background-size: 60px auto;
//}
@media (-webkit-min-device-pixel-ratio: 2), .pixel-ratio__2 & {
(min-resolution: 2dppx), background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
(min-resolution: 192dpi)
{
background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)";
background-size: 60px auto;
}
} }
} }
} }