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

Merge pull request #1232 from ONLYOFFICE/feature/Fix-red-mark

Browse source 
Fix red mark
This commit is contained in:
maxkadushkin 2021-10-06 14:30:45 +03:00 committed by GitHub
parent 8da1200ea1 901d50cd01
commit d46607d350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/Plugins.js
View file

@ -62,7 +62,7 @@ define([
'<div id="current-plugin-box" class="layout-ct vbox hidden">',
'<div id="current-plugin-header">',
'<label></label>',
'<div id="id-plugin-close" class="plugin-close img-commonctrl"></div>',
'<div id="id-plugin-close" class="tool close"></div>',
'</div>',
'<div id="current-plugin-frame" class="">',
'</div>',

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

@ -11,6 +11,7 @@
font-weight: bold;
margin-top: 10px;
margin-left: 12px;
}
#plugins-list {
@ -97,16 +98,16 @@
}
}
.plugin-close {
.tool {
position: absolute;
top: 9px;
right: 7px;
width: 16px;
height: 16px;
background-position: -26px -150px;
cursor: pointer;
margin: 0;
/*&:before, &:after {
width: 2px;
width: @scaled-two-px-value;
}*/
}
#current-plugin-frame {
width: 100%;
height: 100%;

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

@ -22,6 +22,50 @@
opacity: 0.6;
}
}
.tool {
float: right;
width: 16px;
height: 16px;
cursor: pointer;
overflow: hidden;
padding: 0px;
margin: 4px 3px 0px 0px;
&.close {
position: relative;
opacity: 0.7;
&:hover {
opacity: 1;
}
&.disabled {
cursor: default;
}
&:before, &:after {
content: ' ';
position: absolute;
left: 7px;
left: calc(7px / @pixel-ratio-factor);
top: @scaled-one-px-value-ie;
top: @scaled-one-px-value;
height: 14px;
width: @scaled-one-px-value-ie;
width: @scaled-one-px-value;
background-color: @icon-normal-ie;
background-color: @icon-normal;
}
&:before {
transform: rotate(45deg);
}
&:after {
transform: rotate(-45deg);
}
}
}
.asc-window {
min-height: 50px;
@ -73,51 +117,7 @@
padding-right: 6px;
}
.tool {
float: right;
width: 16px;
height: 16px;
cursor: pointer;
overflow: hidden;
padding: 0px;
margin: 4px 3px 0px 0px;
&.close {
position: relative;
opacity: 0.7;
&:hover {
opacity: 1;
}
&.disabled {
cursor: default;
}
&:before, &:after {
content: ' ';
position: absolute;
left: 7px;
left: calc(7px/@pixel-ratio-factor);
top: @scaled-one-px-value-ie;
top: @scaled-one-px-value;
height: 14px;
width: @scaled-one-px-value-ie;
width: @scaled-one-px-value;
background-color: @icon-normal-ie;
background-color: @icon-normal;
}
&:before {
transform: rotate(45deg);
}
&:after {
transform: rotate(-45deg);
}
}
&.help {
.tool.help {
width: 20px;
margin-right:0;
line-height: 14px;
@ -136,7 +136,7 @@
cursor: default;
}
}
}
&.resizing {
cursor: inherit !important;