pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 05:57:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix styles for ie11

Browse Source
This commit is contained in:
Julia.Radzhabova
2025-05-31 01:13:51 +03:00
parent 39df2713e7
commit 5aef494c81
33 changed files with 144 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/main/lib/controller/Themes.js
View File

@ -764,7 +764,7 @@ define([
};
}
} else if (prop==='tab-style') {
return window.getComputedStyle(document.body).getPropertyValue("--toolbar-preferred-tab-style") || 'line';
return Common.Utils.isIE ? 'fill' : window.getComputedStyle(document.body).getPropertyValue("--toolbar-preferred-tab-style") || 'line';
}
return theme_props[prop];
}

4
apps/common/main/lib/util/themeinit.js
View File

@ -46,8 +46,8 @@
!window.uitheme && (window.uitheme = {});
window.uitheme.DEFAULT_LIGHT_THEME_ID = 'theme-white';
window.uitheme.DEFAULT_DARK_THEME_ID = 'theme-night';
window.uitheme.DEFAULT_LIGHT_THEME_ID = !window.isIEBrowser ? 'theme-white' : 'theme-classic-light';
window.uitheme.DEFAULT_DARK_THEME_ID = !window.isIEBrowser ? 'theme-night' : 'theme-dark';
window.uitheme.set_id = function (id) {
if ( id == 'theme-system' )

2
apps/common/main/lib/util/utils.js
View File

@ -1290,7 +1290,7 @@ define([], function () {
Common.Utils.InternalSettings.set('toolbar-height-tabs', 32);
Common.Utils.InternalSettings.set('toolbar-height-tabs-top-title', 28);
Common.Utils.InternalSettings.set('toolbar-height-controls', parseInt(window.getComputedStyle(document.body).getPropertyValue("--toolbar-height-controls") || 84));
Common.Utils.InternalSettings.set('toolbar-height-controls', parseInt(window.getComputedStyle(document.body).getPropertyValue("--toolbar-height-controls") || (Common.Utils.isIE ? 66 : 84)));
Common.Utils.InternalSettings.set('document-title-height', 28);
Common.Utils.InternalSettings.set('window-inactive-area-top', 0);

2
apps/common/main/resources/less/advanced-settings-window.less
View File

@ -170,6 +170,7 @@
border-bottom-right-radius: 0;
.rtl & {
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
@ -181,6 +182,7 @@
border-bottom-left-radius: 0;
.rtl & {
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
border-top-right-radius: 0;
border-bottom-right-radius: 0;

18
apps/common/main/resources/less/buttons.less
View File

@ -2,6 +2,7 @@
@x-tiny-btn-icon-size: 20px;
.btn {
border-radius: @border-radius-button-base-ie;
border-radius: @border-radius-button-base;
color: @text-normal-ie;
color: @text-normal;
@ -448,6 +449,7 @@
margin: 0;
padding: 0;
border: 0;
.border-radius(@border-radius-button-toolbar-ie);
.border-radius(@border-radius-button-toolbar);
background-color: transparent;
@ -469,6 +471,7 @@
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-button-normal-ie);
.border-radius(@border-radius-button-normal);
&:focus:not(.disabled) {
@ -630,6 +633,7 @@
padding: 0;
display: block;
position: relative;
.border-radius(@border-radius-button-category-ie);
.border-radius(@border-radius-button-category);
.font-size-normal();
.font-weight-bold();
@ -732,11 +736,13 @@
> .btn:first-child:not(:last-child):not(.dropdown-toggle) {
.rtl & {
&.btn-toolbar {
.border-radius(@border-radius-button-toolbar-ie);
.border-radius(@border-radius-button-toolbar);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
&:not(.btn-toolbar) {
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
@ -747,11 +753,13 @@
> .dropdown-toggle:not(:first-child) {
.rtl & {
&.btn-toolbar {
.border-radius(@border-radius-button-toolbar-ie);
.border-radius(@border-radius-button-toolbar);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
&:not(.btn-toolbar) {
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
border-top-right-radius: 0;
border-bottom-right-radius: 0;
@ -833,6 +841,7 @@
}
&.split {
border-radius: @border-radius-button-toolbar-ie;
border-radius: @border-radius-button-toolbar;
&.over:not(.disabled),
&.open {
@ -882,6 +891,7 @@
.dropdown-menu {
.btn.small {
.mx-button-otherstates-icon2(@button-small-active-icon-offset-x-ie);
.mx-button-otherstates-icon2(@button-small-active-icon-offset-x);
}
}
@ -897,6 +907,7 @@
padding: @scaled-one-px-value @dd-button-size @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-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
.rtl & {
@ -910,6 +921,7 @@
height: 100%;
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading;
border-radius: @border-radius-form-control-ie;
border-radius: @border-radius-form-control;
background-color: transparent;
}
@ -1083,6 +1095,7 @@
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;
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
&:hover,
@ -1126,6 +1139,7 @@
background: @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-button-normal-ie);
.border-radius(@border-radius-button-normal);
.font-size-normal();
@ -1250,6 +1264,7 @@
background: @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-button-normal-ie);
.border-radius(@border-radius-button-normal);
button {
@ -1306,6 +1321,7 @@
background: @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-button-normal-ie);
.border-radius(@border-radius-button-normal);
&.auto {
@ -1373,6 +1389,7 @@
background: @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-button-normal-ie);
.border-radius(@border-radius-button-normal);
.icon {
@ -1469,6 +1486,7 @@
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-button-normal-ie);
.border-radius(@border-radius-button-normal);
&.template-table {

37
apps/common/main/resources/less/colors-table-ie-fix.less
View File

@ -86,8 +86,8 @@
@canvas-scroll-thumb-hover-ie: #c0c0c0;
@canvas-scroll-thumb-border-hover-ie: #cbcbcb;
@button-header-normal-icon-offset-x-ie: -24px;
@button-header-active-icon-offset-x-ie: -24px;
@button-header-normal-icon-offset-x-ie: -20px;
@button-header-active-icon-offset-x-ie: -20px;
@button-xhuge-active-icon-offset-x-ie: -28px;
@scaled-one-px-value-ie: 1px;
@ -103,7 +103,7 @@
@toolbar-tab-line-radius-ie: 2px;
@toolbar-tab-line-height-ie: 2px;
@toolbar-tab-line-bottom-ie: 4px;
@toolbar-tab-text-margin-ie: 5px;
@toolbar-tab-text-margin-ie: 2px;
@layout-padding-toolbar-ie: 0;
@layout-padding-x-side-panel-ie: 0;
@layout-padding-y-side-panel-ie: 2px;
@ -115,13 +115,13 @@
@layout-padding-left-panel-rtl-ie: 0 40px 0 0;
// cell editor SSE
@celleditor-height-ie: 24px;
@celleditor-line-height-ie: 20px;
@celleditor-border-width-ie: 0px;
@celleditor-input-border-ie: 1px solid #E1E1E1;
@celleditor-input-border-radius-ie: 4px;
@celleditor-cell-name-border-right-ie: 1px solid #E1E1E1;
@celleditor-func-label-margin-left-ie: 1px;
@celleditor-height-ie: 20px;
@celleditor-line-height-ie: 18px;
@celleditor-border-width-ie: 1px;
@celleditor-input-border-ie: 0 none;
@celleditor-input-border-radius-ie: 0x;
@celleditor-cell-name-border-right-ie: 1px solid @border-toolbar-ie;
@celleditor-func-label-margin-left-ie: -3px;
@x-small-btn-size-ie: 20px;
@x-small-btn-icon-size-ie: 20px;
@ -224,6 +224,23 @@
@rb-check-mark-size-ie: 4px;
@rb-check-mark-background-ie: @text-normal-ie;
// header input
@header-input-height-ie: 100%;
@header-input-line-height-ie: 24px;
@border-header-input-focused-ie: transparent;
// header button
@header-component-height-ie: 100%;
@header-component-width-ie: 40px;
@header-component-line-height-ie: 1.5;
@header-component-padding-ie: 1px 3px;
@header-component-margin-ie: 0;
@header-component-align-ie: stretch;
@toolbar-simple-border-bottom-ie: 1px solid @border-toolbar-ie;
@toolbar-simple-shadow-ie: 0 none;
@button-small-active-icon-offset-x-ie: -20px;
.ie {
.toolbar__icon.toolbar__icon-big {

6
apps/common/main/resources/less/colors-table.less
View File

@ -631,6 +631,12 @@
@header-component-margin: var(--header-component-margin);
@header-component-align: var(--header-component-align);
@toolbar-simple-border-bottom: var(--toolbar-simple-border-bottom);
@toolbar-simple-shadow: var(--toolbar-simple-shadow);
@toolbar-simple-content-padding-top: var(--toolbar-simple-content-padding-top);
@layout-padding-hor-toolbar-simple: var(--layout-padding-hor-toolbar-simple);
@simple-editor-layout-collapse-button-rigth: var(--simple-editor-layout-collapse-button-rigth);
// Canvas
// ---------------------------
@canvas-background: var(--canvas-background);

4
apps/common/main/resources/less/combo-dataview.less
View File

@ -9,6 +9,7 @@
overflow: hidden;
width: @combo-dataview-width;
height: 100%;
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
@ -25,6 +26,7 @@
.float-right();
button {
border-radius:0 @border-radius-button-normal-ie @border-radius-button-normal-ie 0;
border-radius:0 @border-radius-button-normal @border-radius-button-normal 0;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
@ -34,6 +36,7 @@
width: 100%;
.rtl & {
border-radius:@border-radius-button-normal-ie 0 0 @border-radius-button-normal-ie;
border-radius:@border-radius-button-normal 0 0 @border-radius-button-normal;
}
@ -98,6 +101,7 @@
margin: @minus-px 0 0 @minus-px;
}
.rtl & {
.border-radius(@border-radius-button-normal-ie);
.border-radius(@border-radius-button-normal);
.border-right-radius(0);

4
apps/common/main/resources/less/combobox.less
View File

@ -18,11 +18,15 @@
-moz-transition: none;
transition: none;
border-top-right-radius: @border-radius-form-control-ie !important;
border-top-right-radius: @border-radius-form-control !important;
border-bottom-right-radius: @border-radius-form-control-ie !important;
border-bottom-right-radius: @border-radius-form-control !important;
.rtl & {
border-top-left-radius: @border-radius-form-control-ie !important;
border-top-left-radius: @border-radius-form-control !important;
border-bottom-left-radius: @border-radius-form-control-ie !important;
border-bottom-left-radius: @border-radius-form-control !important;
}
}

3
apps/common/main/resources/less/common.less
View File

@ -270,7 +270,7 @@ label {
}
.menu-item-icon {
background-position-x: -24px;
background-position-x: @button-small-active-icon-offset-x-ie;
background-position-x: @button-small-active-icon-offset-x;
}
@ -629,6 +629,7 @@ body {
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-radius: @border-radius-form-control-ie;
border-radius: @border-radius-form-control;
overflow: hidden;
box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);

3
apps/common/main/resources/less/dataview.less
View File

@ -54,6 +54,7 @@
&,
canvas,
img {
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
}
}
@ -113,6 +114,7 @@
.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);
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
&:hover:not(.disabled) {
@ -128,6 +130,7 @@
&,
canvas,
img {
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
}
}

1
apps/common/main/resources/less/dropdown-menu.less
View File

@ -6,6 +6,7 @@
border-color: @border-regular-control;
border-width: @scaled-one-px-value-ie;
border-width: @scaled-one-px-value;
.border-radius(@border-radius-dropdown-menu-ie);
.border-radius(@border-radius-dropdown-menu);
&.scrollable-menu {

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

@ -6,6 +6,7 @@
left: 100%;
margin-top: -6px;
margin-left: -1px;
.border-radius(@border-radius-dropdown-menu-ie);
.border-radius(@border-radius-dropdown-menu);
.rtl & {

18
apps/common/main/resources/less/header.less
View File

@ -112,8 +112,11 @@
color: @text-toolbar-header;
background-color: transparent;
border: 0 none;
border-radius: @border-radius-button-base-ie;
border-radius: @border-radius-button-base;
height: @header-input-height-ie;
height: @header-input-height;
line-height: @header-input-line-height-ie;
line-height: @header-input-line-height;
align-items: center;
padding: 1px 8px;
@ -127,6 +130,7 @@
&:focus{
background-color: @highlight-header-input-pressed-ie;
background-color: @highlight-header-input-pressed;
border: @scaled-one-px-value-ie solid @border-header-input-focused-ie;
border: @scaled-one-px-value solid @border-header-input-focused;
.box-shadow(@shadow-fill-input-ie);
.box-shadow(@shadow-fill-input);
@ -206,24 +210,30 @@
.hedset {
font-size: 0;
display: flex;
align-items: @header-component-align-ie;
align-items: @header-component-align;
.btn-group {
height: @header-component-height-ie;
height: @header-component-height;
}
.btn-slot {
& > .btn-group,
& > .btn-header {
margin: @header-component-margin-ie;
margin: @header-component-margin;
}
}
}
.btn-header {
height: @header-component-height-ie;
height: @header-component-height;
background-color: transparent;
width: @header-component-width-ie;
width: @header-component-width;
border: 0;
padding: @header-component-padding-ie;
padding: @header-component-padding;
.icon {
@ -231,6 +241,7 @@
width: @x-small-btn-icon-size;
height: @x-small-btn-icon-size-ie;
height: @x-small-btn-icon-size;
line-height: @header-component-line-height-ie;
line-height: @header-component-line-height;
display: inline-block;
position: relative;
@ -327,7 +338,9 @@
align-items: center;
cursor: pointer;
padding: 0 8px 0 6px;
height: @header-component-height-ie;
height: @header-component-height;
border-radius: @border-radius-button-base-ie;
border-radius: @border-radius-button-base;
.inner-box-icon {
@ -623,7 +636,9 @@
overflow: hidden;
text-align: center;
.font-size-medium();
height: @header-input-height-ie;
height: @header-input-height;
line-height: @header-input-line-height-ie;
line-height: @header-input-line-height;
padding: 1px 8px;
align-items: center;
@ -635,13 +650,16 @@
&:hover:not(:disabled):not(:focus){
background-color: @highlight-header-input-hover-ie;
background-color: @highlight-header-input-hover;
border-radius: @border-radius-button-base-ie;
border-radius: @border-radius-button-base;
cursor: text;
}
&:focus{
background-color: @highlight-header-input-pressed-ie;
background-color: @highlight-header-input-pressed;
border: @scaled-one-px-value-ie solid @border-header-input-focused-ie;
border: @scaled-one-px-value solid @border-header-input-focused;
border-radius: @border-radius-button-base-ie;
border-radius: @border-radius-button-base;
.box-shadow(@shadow-fill-input-ie);
.box-shadow(@shadow-fill-input);

1
apps/common/main/resources/less/input.less
View File

@ -1,4 +1,5 @@
.form-control {
.border-radius(@border-radius-form-control-ie);
.border-radius(@border-radius-form-control);
.box-shadow(none);
color: @text-fill-input-ie;

1
apps/common/main/resources/less/language-dialog.less
View File

@ -19,6 +19,7 @@ li {
&.selected, a.checked {
.icon.spellcheck-lang {
background-position-x: @button-small-active-icon-offset-x-ie;
background-position-x: @button-small-active-icon-offset-x;
}
}

3
apps/common/main/resources/less/layout.less
View File

@ -69,5 +69,6 @@
}
.layout-item.middle {
padding-top:var(--content-padding-top,0)
padding-top:0;
padding-top:var(--content-padding-top,0);
}

2
apps/common/main/resources/less/macros-dialog.less
View File

@ -109,11 +109,13 @@
border-radius: 2px;
&.active {
background-color: @highlight-button-pressed-hover-ie;
background-color: @highlight-button-pressed-hover;
}
}
&.selected {
.listitem-icon {
background-position-x: @button-small-active-icon-offset-x-ie;
background-position-x: @button-small-active-icon-offset-x;
}
}

1
apps/common/main/resources/less/synchronize-tip.less
View File

@ -109,6 +109,7 @@
display: inline-block;
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control;
border-radius: @border-radius-button-normal-ie;
border-radius: @border-radius-button-normal;
padding: 3px 12px;
margin-top: 10px;

10
apps/common/main/resources/less/toolbar.less
View File

@ -33,6 +33,9 @@
border-radius: @border-radius-toolbar;
}
}
.ie & {
box-shadow: @shadow-toolbar-ie;
}
}
.box-tabs {
@ -133,6 +136,7 @@
li {
display: inline-flex;
align-items: center;
align-items: end;
height: 100%;
position: relative;
@ -553,6 +557,7 @@
&.border {
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control;
.border-radius(@border-radius-button-toolbar-ie);
.border-radius(@border-radius-button-toolbar);
width: @form-control-size-ie;
width: @form-control-size;
@ -695,6 +700,7 @@
&:active, &.active {
&:not(.disabled) .icon.toolbar__icon {
&.icon--inverse {
background-position-x: @button-small-active-icon-offset-x-ie !important;
background-position-x: @button-small-active-icon-offset-x !important;
}
}
@ -940,6 +946,7 @@
}
&.borders--small {
border-radius: @border-radius-button-normal-ie;
border-radius: @border-radius-button-normal;
&:not(:active) {
@ -1065,6 +1072,7 @@
-webkit-filter: @img-equition-filter;
filter: @img-equition-filter;
}
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
}
}
@ -1161,7 +1169,7 @@
}
}
.menu-item-icon {
background-position-x: -24px;
background-position-x: @button-small-active-icon-offset-x-ie;
background-position-x: @button-small-active-icon-offset-x;
}

3
apps/common/main/resources/less/window.less
View File

@ -72,6 +72,7 @@
box-sizing: border-box;
z-index: @zindex-modal-background;
box-shadow: 0 5px 15px rgba(0,0,0,0.2);
border-radius: @border-radius-window-ie;
border-radius: @border-radius-window;
background-color: @background-normal-ie;
background-color: @background-normal;
@ -87,6 +88,7 @@
> .header {
height: 34px;
border-radius: @border-radius-window-ie @border-radius-window-ie 0 0;
border-radius: @border-radius-window @border-radius-window 0 0;
position: absolute;
padding: 5px 6px 6px;
@ -182,6 +184,7 @@
}
> .body {
border-radius: @border-radius-window-ie;
border-radius: @border-radius-window;
position: absolute;
top: 34px;

4
apps/documenteditor/main/app/view/FileMenuPanels.js
View File

@ -934,7 +934,7 @@ define([], function () {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
}
$('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
if (mode.compactHeader) {
$('tr.quick-access', this.el).hide();
}
@ -1096,7 +1096,7 @@ define([], function () {
Common.UI.TabStyler.setBackground(this.chTabBack.isChecked() ? 'toolbar' : 'header');
}
if (Common.UI.FeaturesManager.canChange('tabStyle', true)) {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true)) {
Common.UI.TabStyler.setStyle(this.cmbTabStyle.getValue());
}

2
apps/documenteditor/main/resources/less/toolbar.less
View File

@ -55,9 +55,11 @@
.box-shadow(0 0 0 @scaled-two-px-value @border-control-focus);
}
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
canvas {
vertical-align: middle;
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
}
}

4
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -760,7 +760,7 @@ define([], function () {
$('tr.comments', this.el)[mode.canCoAuthoring && mode.isEdit ? 'show' : 'hide']();
/** coauthoring end **/
$('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
@ -884,7 +884,7 @@ define([], function () {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) {
Common.UI.TabStyler.setBackground(this.chTabBack.isChecked() ? 'toolbar' : 'header');
}
if (Common.UI.FeaturesManager.canChange('tabStyle', true)) {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true)) {
Common.UI.TabStyler.setStyle(this.cmbTabStyle.getValue());
}
Common.localStorage.save();

2
apps/pdfeditor/main/app/view/Viewport.js
View File

@ -96,7 +96,7 @@ define([
}, {
el: $container.find(' > .layout-item#statusbar'),
alias: 'statusbar',
height: parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height'))
height: parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height') || 25)
}
]
});

1
apps/pdfeditor/main/resources/less/advanced-settings.less
View File

@ -12,6 +12,7 @@
.format-example {
background: @background-pane-ie;
background: @background-pane;
border-radius: @border-radius-form-control-ie;
border-radius: @border-radius-form-control;
padding: 4px;
#format-settings-label-example.red-color {

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View File

@ -733,7 +733,7 @@ define([], function () {
$('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
$('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
$('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
}
@ -855,7 +855,7 @@ define([], function () {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) {
Common.UI.TabStyler.setBackground(this.chTabBack.isChecked() ? 'toolbar' : 'header');
}
if (Common.UI.FeaturesManager.canChange('tabStyle', true)) {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true)) {
Common.UI.TabStyler.setStyle(this.cmbTabStyle.getValue());
}
Common.localStorage.save();

2
apps/presentationeditor/main/app/view/Viewport.js
View File

@ -100,7 +100,7 @@ define([
}, {
el: items[3],
alias: 'statusbar',
height: parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height'))
height: parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height') || 25)
}]
});

1
apps/presentationeditor/main/resources/less/toolbar.less
View File

@ -29,6 +29,7 @@
& > div:first-child {
margin-bottom: 3px;
border-radius: @border-radius-dataview-item-ie;
border-radius: @border-radius-dataview-item;
}
}

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -1070,7 +1070,7 @@ define([], function () {
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
$('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
$('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
}
@ -1319,7 +1319,7 @@ define([], function () {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) {
Common.UI.TabStyler.setBackground(this.chTabBack.isChecked() ? 'toolbar' : 'header');
}
if (Common.UI.FeaturesManager.canChange('tabStyle', true)) {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true)) {
Common.UI.TabStyler.setStyle(this.cmbTabStyle.getValue());
}
Common.localStorage.save();

2
apps/spreadsheeteditor/main/app/view/Viewport.js
View File

@ -99,7 +99,7 @@ define([
el: items[3],
alias: 'statusbar',
height: (function () {
var h = parseInt(getComputedStyle(document.body).getPropertyValue('--statusbar-height'));
var h = parseInt(getComputedStyle(document.body).getPropertyValue('--statusbar-height') || 25);
return Common.localStorage.getBool('sse-compact-statusbar', true) ? h : h * 2;
})()
}]

28
apps/spreadsheeteditor/main/resources/less/toolbar.less
View File

@ -13,19 +13,23 @@
.simple-bar {
display: flex;
align-items: center;
border-radius: var(--border-radius-toolbar, 0);
border-radius: @border-radius-toolbar-ie;
border-radius: @border-radius-toolbar;
position: relative;
height: 32px;
background-color: @background-toolbar-ie;
background-color: @background-toolbar;
&:before {
content: '';
position: absolute;
box-shadow: var(--toolbar-simple-shadow, none);
box-shadow: @toolbar-simple-shadow-ie;
box-shadow: @toolbar-simple-shadow;
width: 100%;
height: 32px;
bottom: 0;
border-radius: var(--border-radius-toolbar, 0);
border-radius: @border-radius-toolbar-ie;
border-radius: @border-radius-toolbar;
}
.separator.short {
@ -63,9 +67,12 @@
#toolbar {
.inner-simple-editor & {
padding-left: var(--layout-padding-hor-toolbar-simple);
padding-right: var(--layout-padding-hor-toolbar-simple);
border-bottom: var(--toolbar-simple-border-bottom);
padding-left: 0;
padding-left: @layout-padding-hor-toolbar-simple;
padding-right: 0;
padding-right: @layout-padding-hor-toolbar-simple;
border-bottom: @toolbar-simple-border-bottom-ie;
border-bottom: @toolbar-simple-border-bottom;
overflow: hidden;
.toolbar {
@ -92,19 +99,20 @@
.inner-simple-editor & {
padding-left: 0;
padding-right: 0;
padding-left: var(--layout-padding-hor-toolbar-simple);
padding-right: var(--layout-padding-hor-toolbar-simple);
padding-left: @layout-padding-hor-toolbar-simple;
padding-right: @layout-padding-hor-toolbar-simple;
.ce-group-expand {
right: 3px;
right: var(--simple-editor-layout-collapse-button-rigth, 0px);
right: @simple-editor-layout-collapse-button-rigth;
}
}
}
.inner-simple-editor {
.layout-item.middle {
padding-top: var(--toolbar-simple-content-padding-top, 0);
padding-top: 0;
padding-top: @toolbar-simple-content-padding-top;
}
}

4
apps/visioeditor/main/app/view/FileMenuPanels.js
View File

@ -519,7 +519,7 @@ define([], function () {
$('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
$('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.compactHeader && mode.isEdit) ? 'show' : 'hide']();
$('tr.tab-background', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
$('tr.tab-style', this.el)[!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true) ? 'show' : 'hide']();
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
}
@ -587,7 +587,7 @@ define([], function () {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabBackground', true)) {
Common.UI.TabStyler.setBackground(this.chTabBack.isChecked() ? 'toolbar' : 'header');
}
if (Common.UI.FeaturesManager.canChange('tabStyle', true)) {
if (!Common.Utils.isIE && Common.UI.FeaturesManager.canChange('tabStyle', true)) {
Common.UI.TabStyler.setStyle(this.cmbTabStyle.getValue());
}
Common.localStorage.save();