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

[multiscaling] repaired some components

Browse source
This commit is contained in:
Maxim Kadushkin 2021-01-21 13:14:36 +03:00
parent edca282ea7
commit 4412524e82
14 changed files with 93 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/resources/less/asc-mixins.less
View file

@ -89,7 +89,11 @@
--pixel-ratio-factor: 1; --pixel-ratio-factor: 1;
.pixel-ratio__1_5 { .pixel-ratio__1_5 {
--pixel-ratio-factor: 1.5; @ratio: 1.5;
@one-px: 1px / @ratio;
--pixel-ratio-factor: @ratio;
--scaled-one-pixel: @one-px;
} }
} }
@ -339,4 +343,4 @@
.get-scaled-value(@v) { .get-scaled-value(@v) {
@scaledvalue: calc(@v / var(--pixel-ratio-factor)); @scaledvalue: calc(@v / var(--pixel-ratio-factor));
} }

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

@ -36,4 +36,76 @@ label {
.user-select { .user-select {
.user-select(text); .user-select(text);
}
.tool-menu {
height: 100%;
display: block;
&.left {
overflow: hidden;
.tool-menu-btns {
border-right: @scaled-one-px-value solid @gray-dark;
}
}
&.right {
.tool-menu-btns {
//position: absolute;
border-left: @scaled-one-px-value solid @gray-dark;
background-color: @gray-light;
right: 0;
overflow: hidden;
}
}
}
.tool-menu-btns {
width: 40px;
height: 100%;
display: inline-block;
position: absolute;
padding-top: 15px;
button {
margin-bottom: 8px;
}
}
.left-panel {
padding-left: 40px;
height: 100%;
border-right: @scaled-one-px-value solid @gray-dark;
#left-panel-chat {
height: 100%;
}
#left-panel-comments {
height: 100%;
}
}
.right-panel {
width: 220px;
height: 100%;
display: none;
padding: 0 10px 0 15px;
position: relative;
overflow: hidden;
border-left: @scaled-one-px-value solid @gray-dark;
line-height: 15px;
}
.statusbar {
height: 25px;
background-color: @gray-light;
.box-inner-shadow(0 @scaled-one-px-value 0 @gray-dark);
.status-label {
font-weight: bold;
color: @gray-deep;
white-space: nowrap;
}
} }

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

@ -2,6 +2,7 @@
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
@pixel-ratio-factor: var(--pixel-ratio-factor); @pixel-ratio-factor: var(--pixel-ratio-factor);
@scaled-one-px-value: var(--scaled-one-pixel, 1px);
// Paths // Paths
// ------------------------- // -------------------------

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

@ -1,42 +1,6 @@
.tool-menu {
height: 100%;
display: block;
&.left {
overflow: hidden;
.tool-menu-btns {
//border-right: 1px solid @gray-dark;
.adaptive-solid-border(1px, @gray-dark, right);
}
}
}
.tool-menu-btns {
width: 40px;
height: 100%;
display: inline-block;
position: absolute;
padding-top: 15px;
button {
margin-bottom: 8px;
}
}
.left-panel { .left-panel {
padding-left: 40px; #left-panel-history {
height: 100%;
//border-right: 1px solid @gray-dark;
.adaptive-solid-border(1px, @gray-dark, right);
#left-panel-chat {
height: 100%;
}
#left-panel-comments {
height: 100%;
}
#left-panel-history {
height: 100%; height: 100%;
} }
} }

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

@ -1,27 +1,4 @@
.tool-menu.right {
.tool-menu-btns {
position: absolute;
//border-left: 1px solid @gray-dark;
.adaptive-solid-border(1px, @gray-dark, left);
background-color: @gray-light;
right: 0;
overflow: hidden;
}
}
.right-panel {
width: 220px;
height: 100%;
display: none;
padding: 0 10px 0 15px;
position: relative;
overflow: hidden;
//border-left: 1px solid @gray-dark;
.adaptive-solid-border(1px, @gray-dark, left);
line-height: 15px;
}
.settings-panel { .settings-panel {
display: none; display: none;
overflow: visible; overflow: visible;

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

@ -1,15 +1,8 @@
.statusbar { .statusbar {
display: table; display: table;
padding: 2px; padding: 2px;
height: 25px;
background-color: @gray-light;
//.box-inner-shadow(0 1px 0 @gray-dark);
.adaptive-box-shadow(~'inset 0 %1 0 @{gray-dark}', 1px);
.status-label { .status-label {
font-weight: bold;
color: @gray-deep;
white-space: nowrap;
position: relative; position: relative;
top: 1px; top: 1px;
} }

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

@ -1,15 +1,3 @@
.tool-menu {
height: 100%;
display: block;
&.left {
overflow: hidden;
.tool-menu-btns {
border-right: 1px solid @gray-dark;
}
}
}
#left-menu { #left-menu {
&+.layout-resizer { &+.layout-resizer {
@ -24,31 +12,6 @@
} }
} }
.tool-menu-btns {
width: 40px;
height: 100%;
display: inline-block;
position: absolute;
padding-top: 15px;
button {
margin-bottom: 8px;
}
}
.left-panel {
padding-left: 40px;
height: 100%;
border-right: 1px solid @gray-dark;
#left-panel-chat {
height: 100%;
}
#left-panel-comments {
height: 100%;
}
}
.left-menu-full-ct { .left-menu-full-ct {
width: 100%; width: 100%;
height: 100%; height: 100%;

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

@ -1,25 +1,4 @@
.tool-menu.right {
.tool-menu-btns {
position: absolute;
border-left: 1px solid @gray-dark;
background-color: @gray-light;
right: 0;
overflow: hidden;
}
}
.right-panel {
width: 220px;
height: 100%;
display: none;
padding: 0 10px 0 15px;
position: relative;
overflow: hidden;
border-left: 1px solid @gray-dark;
line-height: 15px;
}
.settings-panel { .settings-panel {
display: none; display: none;
overflow: visible; overflow: visible;

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

@ -1,14 +1,8 @@
.statusbar { .statusbar {
display: table; display: table;
padding: 2px; padding: 2px;
height: 25px;
background-color: @gray-light;
.box-inner-shadow(0 1px 0 @gray-dark);
.status-label { .status-label {
font-weight: bold;
color: @gray-deep;
white-space: nowrap;
position: relative; position: relative;
top: 1px; top: 1px;
} }

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

@ -185,7 +185,7 @@ define([
onLayoutResize: function(o, r) { onLayoutResize: function(o, r) {
if (r == 'cell:edit') { if (r == 'cell:edit') {
if (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.$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());
@ -225,7 +225,7 @@ define([
}, },
expandEditorField: function() { expandEditorField: function() {
if (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.$btnexpand['removeClass']('btn-collapse'); this.editor.$btnexpand['removeClass']('btn-collapse');

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

@ -1,13 +1,13 @@
#cell-editing-box { #cell-editing-box {
border-bottom: solid 1px @gray-dark; border-bottom: solid @scaled-one-px-value @gray-dark;
border-left: solid 1px @gray-dark; border-left: solid @scaled-one-px-value @gray-dark;
min-height: 20px; min-height: 20px;
background-color: #fff; background-color: #fff;
.ce-group-name { .ce-group-name {
float: left; float: left;
height: 20px; height: 20px;
border-bottom: 1px solid @gray-dark; border-bottom: @scaled-one-px-value solid @gray-dark;
background-color: @gray-light; background-color: @gray-light;
#ce-cell-name { #ce-cell-name {
@ -17,7 +17,7 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
border: 0 none; border: 0 none;
border-right: 1px solid @gray-dark; border-right: @scaled-one-px-value solid @gray-dark;
transition: none; transition: none;
-webkit-transition: none; -webkit-transition: none;
@ -75,7 +75,7 @@
padding-left: 1px; padding-left: 1px;
margin: 0 16px 0 120px; margin: 0 16px 0 120px;
height: 100%; height: 100%;
border-left: 1px solid @gray-dark; border-left: @scaled-one-px-value solid @gray-dark;
#ce-cell-content { #ce-cell-content {
height: 100%; height: 100%;

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

@ -1,15 +1,3 @@
.tool-menu {
height: 100%;
display: block;
&.left {
overflow: hidden;
.tool-menu-btns {
border-right: 1px solid @gray-dark;
}
}
}
#left-menu { #left-menu {
&+.layout-resizer { &+.layout-resizer {
@ -24,31 +12,6 @@
} }
} }
.tool-menu-btns {
width: 40px;
height: 100%;
display: inline-block;
position: absolute;
padding-top: 15px;
button {
margin-bottom: 8px;
}
}
.left-panel {
padding-left: 40px;
height: 100%;
border-right: 1px solid @gray-dark;
#left-panel-chat {
height: 100%;
}
#left-panel-comments {
height: 100%;
}
}
.left-menu-full-ct { .left-menu-full-ct {
width: 100%; width: 100%;
height: 100%; height: 100%;

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

@ -1,25 +1,4 @@
.tool-menu.right {
.tool-menu-btns {
position: absolute;
border-left: 1px solid @gray-dark;
background-color: @gray-light;
right: 0;
overflow: hidden;
}
}
.right-panel {
width: 220px;
height: 100%;
display: none;
padding: 0 10px 0 15px;
position: relative;
overflow: hidden;
border-left: 1px solid @gray-dark;
line-height: 15px;
}
.settings-panel { .settings-panel {
display: none; display: none;
overflow: visible; overflow: visible;

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

@ -1,8 +1,5 @@
.statusbar { .statusbar {
padding: 0 2px 0; padding: 0 2px 0;
height: 25px;
background-color: @gray-light;
.box-inner-shadow(0 1px 0 @gray-dark);
z-index: 500; z-index: 500;
#status-tabs-scroll { #status-tabs-scroll {
@ -96,7 +93,7 @@
height: 12px; height: 12px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
border: 1px solid @gray-dark; border: @scaled-one-px-value solid @gray-dark;
} }
.name { .name {
@ -114,8 +111,8 @@
#status-addtabs-box { #status-addtabs-box {
float: left; float: left;
padding: 3px 8px 0 8px; padding: 3px 8px 0 8px;
border-left: 1px solid @gray-dark; border-left: @scaled-one-px-value solid @gray-dark;
border-right: 1px solid @gray-dark; border-right: @scaled-one-px-value solid @gray-dark;
height: 25px; height: 25px;
} }
@ -180,9 +177,9 @@
margin-right: -1px; margin-right: -1px;
background-color: @gray-light; background-color: @gray-light;
outline: none; outline: none;
border-left: 1px solid @gray-dark; border-left: @scaled-one-px-value solid @gray-dark;
border-right: 1px solid @gray-dark; border-right: @scaled-one-px-value solid @gray-dark;
border-top: 1px solid @gray-dark; border-top: @scaled-one-px-value solid @gray-dark;
&:hover { &:hover {
border-top-color: @gray-dark; border-top-color: @gray-dark;
@ -316,12 +313,6 @@
} }
} }
.status-label {
font-weight: bold;
color: @gray-deep;
white-space: nowrap;
}
.btn-tpl(@top-position) { .btn-tpl(@top-position) {
.btn-icon { .btn-icon {
background-position: 0 @top-position; background-position: 0 @top-position;