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

Merge branch 'develop' into feature/multiZoom5.5

Browse source 
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
This commit is contained in:
Maxim Kadushkin 2021-02-10 15:40:30 +03:00
parent f0c76f1e0a cb21490921
commit f62aa45b18
5950 changed files with 84805 additions and 22062 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/api/documents/api.js
View file

@ -24,10 +24,8 @@
key: 'key',
vkey: 'vkey',
info: {
author: 'author name', // must be deprecated, use owner instead
owner: 'owner name',
folder: 'path to document',
created: '<creation date>', // must be deprecated, use uploaded instead
uploaded: '<uploaded date>',
sharingSettings: [
{
@ -36,7 +34,8 @@
isLink: false
},
...
]
],
favorite: '<file is favorite>' // true/false/undefined (undefined - don't show fav. button)
},
permissions: {
edit: <can edit>, // default = true
@ -48,7 +47,10 @@
modifyFilter: <can add, remove and save filter in the spreadsheet> // default = true
modifyContentControl: <can modify content controls in documenteditor> // default = true
fillForms: <can edit forms in view mode> // default = edit || review,
copy: <can copy data> // default = true
copy: <can copy data> // default = true,
editCommentAuthorOnly: <can edit your own comments only> // default = false
deleteCommentAuthorOnly: <can delete your own comments only> // default = false,
reviewGroup: ["Group1", ""] // current user can accept/reject review changes made by users from Group1 and users without a group. [] - use groups, but can't change any group's changes
}
},
editorConfig: {
@ -124,6 +126,10 @@
"Group2": ["Group1", "Group2"] // users from Group2 can accept/reject review changes made by users from Group1 and Group2
"Group3": [""] // users from Group3 can accept/reject review changes made by users without a group
},
anonymous: { // set name for anonymous user
request: bool (default: true), // enable set name
label: string (default: "Guest") // postfix for user name
}
chat: true,
comments: true,
zoom: 100,
@ -135,7 +141,7 @@
statusBar: true,
autosave: true,
forcesave: false,
commentAuthorOnly: false,
commentAuthorOnly: false, // must be deprecated. use permissions.editCommentAuthorOnly and permissions.deleteCommentAuthorOnly instead
showReviewChanges: false,
help: true,
compactHeader: false,
@ -332,6 +338,8 @@
if ( msg ) {
if ( msg.type === "onExternalPluginMessage" ) {
_sendCommand(msg);
} else if (msg.type === "onExternalPluginMessageCallback") {
postMessage(window.parent, msg);
} else
if ( msg.frameEditorId == placeholderId ) {
var events = _config.events || {},
@ -388,7 +396,7 @@
if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
_config.document.fileType = _config.document.fileType.toLowerCase();
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott))$/
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott|fb2))$/
.exec(_config.document.fileType);
if (!type) {
window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
@ -636,6 +644,13 @@
});
};
var _setFavorite = function(data) {
_sendCommand({
command: 'setFavorite',
data: data
});
};
var _processMouse = function(evt) {
var r = iframe.getBoundingClientRect();
var data = {
@ -681,7 +696,8 @@
setSharingSettings : _setSharingSettings,
insertImage : _insertImage,
setMailMergeRecipients: _setMailMergeRecipients,
setRevisedFile : _setRevisedFile
setRevisedFile : _setRevisedFile,
setFavorite : _setFavorite
}
};
@ -862,6 +878,9 @@
if (config.parentOrigin)
params += "&parentOrigin=" + config.parentOrigin;
if (config.editorConfig && config.editorConfig.customization && config.editorConfig.customization.uiTheme )
params += "&uitheme=" + config.editorConfig.customization.uiTheme;
return params;
}
@ -877,7 +896,7 @@
iframe.allowFullscreen = true;
iframe.setAttribute("allowfullscreen",""); // for IE11
iframe.setAttribute("onmousewheel",""); // for Safari on Mac
iframe.setAttribute("allow", "autoplay");
iframe.setAttribute("allow", "autoplay; camera; microphone; display-capture");
if (config.type == "mobile")
{

4
apps/common/Gateway.js
View file

@ -122,6 +122,10 @@ if (Common === undefined) {
'setRevisedFile': function(data) {
$me.trigger('setrevisedfile', data);
},
'setFavorite': function(data) {
$me.trigger('setfavorite', data);
}
};

10
apps/common/main/lib/component/Button.js
View file

@ -211,7 +211,7 @@ define([
'</div>' +
'<div class="inner-box-caption">' +
'<span class="caption"><%= caption %></span>' +
'<i class="caret img-commonctrl"></i>' +
'<i class="caret"></i>' +
'</div>' +
'</button>' +
'</div>';
@ -226,7 +226,7 @@ define([
'<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown">' +
'<span class="btn-fixflex-vcenter">' +
'<span class="caption"><%= caption %></span>' +
'<i class="caret img-commonctrl"></i>' +
'<i class="caret"></i>' +
'</span>' +
'</button>' +
'</div>';
@ -271,7 +271,7 @@ define([
'<% applyicon() %>',
'<span class="caption"><%= caption %></span>',
'<span class="inner-box-caret">' +
'<i class="caret img-commonctrl"></i>' +
'<i class="caret"></i>' +
'</span>',
'</button>',
'</div>',
@ -282,7 +282,7 @@ define([
'<span class="caption"><%= caption %></span>',
'</button>',
'<button type="button" class="btn <%= cls %> dropdown-toggle" data-toggle="dropdown">',
'<i class="caret img-commonctrl"></i>',
'<i class="caret"></i>',
'<span class="sr-only"></span>',
'</button>',
'</div>',
@ -659,7 +659,7 @@ define([
changeIcon: function(opts) {
var me = this;
if ( opts && (opts.curr || opts.next)) {
if ( opts && (opts.curr || opts.next) && me.$icon) {
!!opts.curr && (me.$icon.removeClass(opts.curr));
!!opts.next && !me.$icon.hasClass(opts.next) && (me.$icon.addClass(opts.next));

101
apps/common/main/lib/component/ColorButton.js
View file

@ -41,16 +41,28 @@ define([
Common.UI.ColorButton = Common.UI.Button.extend(_.extend({
options : {
hint: false,
enableToggle: false,
visible: true
id : null,
hint : false,
enableToggle : false,
allowDepress : false,
toggleGroup : null,
cls : '',
iconCls : '',
caption : '',
menu : null,
disabled : false,
pressed : false,
split : false,
visible : true
},
template: _.template([
'<div class="btn-group" id="<%= id %>">',
'<button type="button" class="btn btn-color dropdown-toggle <%= cls %>" data-toggle="dropdown" style="<%= style %>">',
'<span>&nbsp;</span>',
'<span class="inner-box-caret"><i class="caret img-commonctrl"></i></span>',
'<span class="inner-box-caret">',
'<i class="caret"></i>',
'</span>',
'</button>',
'</div>'
].join('')),
@ -61,7 +73,7 @@ define([
var me = this;
options.menu = me.getMenu(options);
me.on('render:after', function(btn) {
me.getPicker(options.color);
me.getPicker(options.color, options.colors);
});
}
@ -71,16 +83,22 @@ define([
render: function(parentEl) {
Common.UI.Button.prototype.render.call(this, parentEl);
if (this.options.auto)
this.autocolor = (typeof this.options.auto == 'object') ? this.options.auto.color || '000000' : '000000';
if (this.options.color!==undefined)
this.setColor(this.options.color);
},
onColorSelect: function(picker, color) {
this.setColor(color);
this.setAutoColor(false);
this.trigger('color:select', this, color);
},
setColor: function(color) {
if (color == 'auto' && this.options.auto)
color = this.autocolor;
var span = $(this.cmpEl).find('button span:nth-child(1)');
this.color = color;
@ -88,15 +106,21 @@ define([
span.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
},
getPicker: function(color) {
getPicker: function(color, colors) {
if (!this.colorPicker) {
this.colorPicker = new Common.UI.ThemeColorPalette({
el: this.cmpEl.find('#' + this.menu.id + '-color-menu'),
transparent: this.options.transparent,
value: color
value: color,
colors: colors
});
this.colorPicker.on('select', _.bind(this.onColorSelect, this));
this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this));
if (this.options.auto) {
this.cmpEl.find('#' + this.menu.id + '-color-auto').on('click', _.bind(this.onAutoColorSelect, this));
this.colorAuto = this.cmpEl.find('#' + this.menu.id + '-color-auto > a');
(color == 'auto') && this.setAutoColor(true);
}
}
return this.colorPicker;
},
@ -104,13 +128,25 @@ define([
getMenu: function(options) {
if (typeof this.menu !== 'object') {
options = options || this.options;
var id = Common.UI.getId(),
menu = new Common.UI.Menu({
var height = options.paletteHeight || 216,
id = Common.UI.getId(),
auto = [];
if (options.auto) {
this.autocolor = (typeof options.auto == 'object') ? options.auto.color || '000000' : '000000';
auto.push({
id: id + '-color-auto',
caption: (typeof options.auto == 'object') ? options.auto.caption || this.textAutoColor : this.textAutoColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #' + this.autocolor + ';"></span><%= caption %></a>')
});
auto.push({caption: '--'});
}
var menu = new Common.UI.Menu({
id: id,
cls: 'shifted-left',
additionalAlign: options.additionalAlign,
items: (options.additionalItems ? options.additionalItems : []).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
items: (options.additionalItems ? options.additionalItems : []).concat(auto).concat([
{ template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height:' + height + 'px; margin: 10px;"></div>') },
{ template: _.template('<a id="' + id + '-color-new" style="">' + this.textNewColor + '</a>') }
])
});
@ -122,14 +158,53 @@ define([
setMenu: function (m) {
m = m || this.getMenu();
Common.UI.Button.prototype.setMenu.call(this, m);
this.getPicker(this.options.color);
this.getPicker(this.options.color, this.options.colors);
},
addNewColor: function() {
this.colorPicker && this.colorPicker.addNewColor((typeof(this.color) == 'object') ? this.color.color : this.color);
},
textNewColor: 'Add New Custom Color'
onAutoColorSelect: function() {
this.setColor('auto');
this.setAutoColor(true);
this.colorPicker && this.colorPicker.clearSelection();
this.trigger('auto:select', this, this.autocolor);
},
setAutoColor: function(selected) {
if (!this.colorAuto) return;
if (selected && !this.colorAuto.hasClass('selected'))
this.colorAuto.addClass('selected');
else if (!selected && this.colorAuto.hasClass('selected'))
this.colorAuto.removeClass('selected');
},
isAutoColor: function() {
return this.colorAuto && this.colorAuto.hasClass('selected');
},
textNewColor: 'Add New Custom Color',
textAutoColor: 'Automatic'
}, Common.UI.ColorButton || {}));
Common.UI.ButtonColored = Common.UI.Button.extend(_.extend({
render: function(parentEl) {
Common.UI.Button.prototype.render.call(this, parentEl);
$('button:first-child', this.cmpEl).append( $('<div class="btn-color-value-line"></div>'));
this.colorEl = this.cmpEl.find('.btn-color-value-line');
},
setColor: function(color) {
if (this.colorEl) {
this.colorEl.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
this.colorEl.toggleClass('bordered', color=='transparent');
}
}
}, Common.UI.ButtonColored || {}));
});

46
apps/common/main/lib/component/ComboBorderSize.js
View file

@ -77,9 +77,14 @@ define([
Common.UI.ComboBorderSize = Common.UI.ComboBox.extend(_.extend({
template: _.template([
'<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="padding-top:2px; <%= style %>"></div>',
'<div class="form-control" style="<%= style %>">',
'<i class="image"></i>',
'<span class="text"></span>',
'</div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
@ -138,14 +143,15 @@ define([
updateFormControl: function(record) {
var formcontrol = $(this.el).find('.form-control');
var image = formcontrol.find('> .image');
var text = formcontrol.find('> .text');
if (record.get('value')>0) {
formcontrol[0].innerHTML = '';
formcontrol.removeClass('text').addClass('image');
formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
image.css('background-position', '10px -' + record.get('offsety') + 'px').show();
text.hide();
} else {
formcontrol[0].innerHTML = this.txtNoBorders;
formcontrol.removeClass('image').addClass('text');
image.hide();
text.text(this.txtNoBorders).show();
}
},
@ -162,9 +168,7 @@ define([
this.updateFormControl(this._selectedItem);
$('#' + this._selectedItem.get('id'), $(this.el)).addClass('selected');
} else {
var formcontrol = $(this.el).find('.form-control');
formcontrol[0].innerHTML = '';
formcontrol.removeClass('image').addClass('text');
$(this.el).find('.form-control > .text').text("").show();
}
},
@ -175,7 +179,9 @@ define([
template: _.template([
'<span class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control text">',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
@ -224,9 +230,13 @@ define([
Common.UI.ComboBorderType = Common.UI.ComboBorderSize.extend(_.extend({
template: _.template([
'<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="<%= style %>"></div>',
'<div class="form-control" style="<%= style %>">',
'<i class="image"></i>',
'</div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0 2px 10px;">',
@ -262,10 +272,8 @@ define([
},
updateFormControl: function(record) {
var formcontrol = $(this.el).find('.form-control');
formcontrol[0].innerHTML = '';
formcontrol.removeClass('text').addClass('image');
formcontrol.css('background-position', '10px -' + record.get('offsety') + 'px');
$(this.el).find('.form-control > .image')
.css('background-position', '10px -' + record.get('offsety') + 'px');
}
}, Common.UI.ComboBorderType || {}));
@ -275,7 +283,9 @@ define([
'<div class="form-control" style="padding:2px 14px 2px 3px; <%= style %> display: block;">',
'<div style="display: inline-block;overflow: hidden;width: 100%;height: 100%;"></div>',
'</div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<% if (item.value==-1) { %>',

11
apps/common/main/lib/component/ComboBox.js
View file

@ -93,7 +93,9 @@ define([
template: _.template([
'<span class="input-group combobox <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control" spellcheck="false">',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
@ -303,6 +305,9 @@ define([
if ($list.hasClass('menu-absolute')) {
var offset = this.cmpEl.offset();
$list.css({left: offset.left, top: offset.top + this.cmpEl.outerHeight() + 2});
} else if ($list.hasClass('menu-aligned')) {
var offset = this.cmpEl.offset();
$list.toggleClass('show-top', offset.top + this.cmpEl.outerHeight() + $list.outerHeight() > Common.Utils.innerHeight());
}
},
@ -357,15 +362,15 @@ define([
return false;
}
else if (e.keyCode == Common.UI.Keys.RETURN && (this.editable || this.isMenuOpen())) {
var isopen = this.isMenuOpen();
$(e.target).click();
var me = this;
if (this.rendered) {
if (Common.Utils.isIE)
this._input.trigger('change', { onkeydown: true });
else
this._input.blur();
}
return false;
return !isopen;
}
else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) {
this._input.val(this.lastValue);

10
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -72,7 +72,7 @@ define([
'<div class="input-group combobox fonts <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control" spellcheck="false"> ',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<li class="divider">',
'<% _.each(items, function(item) { %>',
@ -131,6 +131,8 @@ define([
if ($(e.target).closest('input').length) { // enter in input field
if (this.lastValue !== this._input.val())
this._input.trigger('change');
else
return true;
} else { // enter in dropdown list
$(e.target).click();
if (this.rendered) {
@ -139,7 +141,7 @@ define([
else
this._input.blur();
}
}
}
return false;
} else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) {
this._input.val(this.lastValue);
@ -343,10 +345,9 @@ define([
var me = this;
var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getFontName());
if (this.__name !== name) {
this.__name = name;
if (!this.__nameId) {
this.__nameId = setTimeout(function () {
me.onApiChangeFontInternal(me.__name);
me.onApiChangeFontInternal(name);
me.__nameId = null;
}, 100);
}
@ -356,6 +357,7 @@ define([
onApiChangeFontInternal: function(name) {
if (this.inFormControl) return;
this.__name = name;
if (this.getRawValue() !== name) {
var record = this.store.findWhere({
name: name

15
apps/common/main/lib/component/DataView.js
View file

@ -200,11 +200,12 @@ define([
allowScrollbar: true,
scrollAlwaysVisible: false,
showLast: true,
useBSKeydown: false
useBSKeydown: false,
cls: ''
},
template: _.template([
'<div class="dataview inner" style="<%= style %>">',
'<div class="dataview inner <%= cls %>" style="<%= style %>">',
'<% _.each(groups, function(group) { %>',
'<% if (group.headername !== undefined) { %>',
'<div class="header-name"><%= group.headername %></div>',
@ -238,6 +239,7 @@ define([
me.useBSKeydown = me.options.useBSKeydown; // only with enableKeyEvents && parentMenu
me.showLast = me.options.showLast;
me.style = me.options.style || '';
me.cls = me.options.cls || '';
me.emptyText = me.options.emptyText || '';
me.listenStoreEvents= (me.options.listenStoreEvents!==undefined) ? me.options.listenStoreEvents : true;
me.allowScrollbar = (me.options.allowScrollbar!==undefined) ? me.options.allowScrollbar : true;
@ -267,7 +269,8 @@ define([
this.setElement(parentEl, false);
this.cmpEl = $(this.template({
groups: me.groups ? me.groups.toJSON() : null,
style: me.style
style: me.style,
cls: me.cls
}));
parentEl.html(this.cmpEl);
@ -275,7 +278,8 @@ define([
this.cmpEl = me.$el || $(this.el);
this.cmpEl.html(this.template({
groups: me.groups ? me.groups.toJSON() : null,
style: me.style
style: me.style,
cls: me.cls
}));
}
@ -454,7 +458,8 @@ define([
$(this.el).html(this.template({
groups: this.groups ? this.groups.toJSON() : null,
style: this.style
style: this.style,
cls: this.cls
}));
if (!_.isUndefined(this.scroller)) {

8
apps/common/main/lib/component/FocusManager.js
View file

@ -74,11 +74,11 @@ Common.UI.FocusManager = new(function() {
trapFirst.on('focus', function() {
if (current.hidden) return;
var fields = current.fields;
for (var i=0; i<fields.length; i++) {
for (var i=fields.length-1; i>=0; i--) {
var field = fields[i];
if ((field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) && !(field.cmp.isDisabled && field.cmp.isDisabled())) {
var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el || field.cmp)).find(field.selector).addBack().filter(field.selector) : field.el;
el.focus();
el && setTimeout(function(){ el.focus(); }, 10);
break;
}
}
@ -89,11 +89,11 @@ Common.UI.FocusManager = new(function() {
trapLast.on('focus', function() {
if (current.hidden) return;
var fields = current.fields;
for (var i=fields.length-1; i>=0; i--) {
for (var i=0; i<fields.length; i++) {
var field = fields[i];
if ((field.cmp.isVisible ? field.cmp.isVisible() : field.cmp.is(':visible')) && !(field.cmp.isDisabled && field.cmp.isDisabled())) {
var el = (field.selector) ? (field.cmp.$el || $(field.cmp.el || field.cmp)).find(field.selector).addBack().filter(field.selector) : field.el;
el.focus();
el && setTimeout(function(){ el.focus(); }, 10);
break;
}
}

9
apps/common/main/lib/component/InputField.js
View file

@ -358,10 +358,10 @@ define([
return true;
},
showError: function(errors) {
showError: function(errors, isWarning) {
var me = this;
if (!_.isEmpty(errors)) {
me.cmpEl.addClass('error');
me.cmpEl.addClass(isWarning ? 'warning' : 'error');
var errorBadge = me.cmpEl.find('.input-error'),
modalParents = errorBadge.closest('.asc-window'),
@ -380,7 +380,12 @@ define([
}
} else {
me.cmpEl.removeClass('error');
me.cmpEl.removeClass('warning');
}
},
showWarning: function(errors) {
this.showError(errors, true);
}
}
})());

4
apps/common/main/lib/component/MetricSpinner.js
View file

@ -120,8 +120,8 @@ define([
template :
'<input type="text" class="form-control" spellcheck="false">' +
'<div class="spinner-buttons">' +
'<button type="button" class="spinner-up"><i class="img-commonctrl"></i></button>' +
'<button type="button" class="spinner-down"><i class="img-commonctrl"></i></button>' +
'<button type="button" class="spinner-up"><i class="arrow"></i></button>' +
'<button type="button" class="spinner-down"><i class="arrow"></i></button>' +
'</div>',
initialize : function(options) {

3
apps/common/main/lib/component/Mixtbar.js
View file

@ -267,7 +267,8 @@ define([
me.dblclick_el = tab;
delete me.dblclick_timer;
},500);
}
} else
me.dblclick_el = tab;
}
}
},

2
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -111,6 +111,8 @@ define([
} else
if (this.placement == 'top')
this.cmpEl.css({bottom : innerHeight - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'});
else if (this.placement == 'bottom')
this.cmpEl.css({top : (showxy.top+5) + this.target.height() + 'px', left: showxy.left + (this.target.width() - this.cmpEl.width())/2 + 'px'});
else if (this.placement == 'target') {
this.cmpEl.css({top : (showxy.top+5) + 'px', left: (showxy.left+5) + 'px'});
} else {// left or right

7
apps/common/main/lib/component/TextareaField.js
View file

@ -161,11 +161,12 @@ define([
if (e.isDefaultPrevented())
return;
if (e.keyCode === Common.UI.Keys.RETURN)
this._doChange(e);
if (e.keyCode === Common.UI.Keys.RETURN) {
e.stopPropagation();
}
if (e.keyCode == Common.UI.Keys.ESC)
this.setValue(this.value);
if (e.keyCode==Common.UI.Keys.RETURN || e.keyCode==Common.UI.Keys.ESC)
if (e.keyCode==Common.UI.Keys.ESC)
this.trigger('inputleave', this);
},

2
apps/common/main/lib/component/ThemeColorPalette.js
View file

@ -60,7 +60,7 @@ define([
template :
_.template(
'<div style="padding: 12px;">' +
'<div style="padding: 8px 12px 12px;">' +
'<% var me = this; %>' +
'<% $(colors).each(function(num, item) { %>' +
'<% if (me.isBlankSeparator(item)) { %> <div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +

16
apps/common/main/lib/component/Window.js
View file

@ -166,7 +166,7 @@ define([
'<div class="header">' +
'<div class="tools">' +
'<% if (closable!==false) %>' +
'<div class="tool close img-commonctrl"></div>' +
'<div class="tool close"></div>' +
'<% %>' +
'<% if (help===true) %>' +
'<div class="tool help">?</div>' +
@ -455,7 +455,7 @@ define([
if (!options.width) options.width = 'auto';
var template = '<div class="info-box">' +
'<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl <%= iconCls %>"></div><% } %>' +
'<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl img-no-theme-filter <%= iconCls %>"></div><% } %>' +
'<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
'<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
'</div>' +
@ -606,7 +606,7 @@ define([
if (b.value !== undefined)
newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
} else {
newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''};
newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b || _.indexOf(options.primary, b)>-1) ? 'primary' : ''};
if (b=='custom')
newBtns[b].cls += ' custom';
}
@ -709,12 +709,14 @@ define([
mask.attr('counter', parseInt(mask.attr('counter'))+1);
mask.show();
} else {
var maskOpacity = $(':root').css('--modal-window-mask-opacity');
mask.css('opacity', 0);
mask.attr('counter', parseInt(mask.attr('counter'))+1);
mask.show();
setTimeout(function () {
mask.css(_getTransformation('0.2'));
mask.css(_getTransformation(maskOpacity));
}, 1);
}
@ -801,11 +803,12 @@ define([
if ( hide_mask ) {
if (this.options.animate !== false) {
var maskOpacity = $(':root').css('--modal-window-mask-opacity');
mask.css(_getTransformation(0));
setTimeout(function () {
if (parseInt(mask.attr('counter'))<1) {
mask.css('opacity', '0.2');
mask.css('opacity', maskOpacity);
mask.hide();
mask.attr('counter', 0);
}
@ -841,11 +844,12 @@ define([
if ( hide_mask ) {
if (this.options.animate !== false) {
var maskOpacity = $(':root').css('--modal-window-mask-opacity');
mask.css(_getTransformation(0));
setTimeout(function () {
if (parseInt(mask.attr('counter'))<1) {
mask.css('opacity', '0.2');
mask.css('opacity', maskOpacity);
mask.hide();
mask.attr('counter', 0);
}

1
apps/common/main/lib/controller/Chat.js
View file

@ -169,6 +169,7 @@ define([
}));
} else {
user.set({online: change.asc_getState()});
user.set({username: change.asc_getUserName()});
}
}
},

36
apps/common/main/lib/controller/Comments.js
View file

@ -169,7 +169,6 @@ define([
if (data) {
this.currentUserId = data.config.user.id;
this.currentUserName = data.config.user.fullname;
this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
this.hintmode = data['hintmode'] || false;
this.viewmode = data['viewmode'] || false;
@ -217,7 +216,7 @@ define([
comment.asc_putTime(this.utcDateToString(new Date()));
comment.asc_putOnlyOfficeTime(this.ooDateToString(new Date()));
comment.asc_putUserId(this.currentUserId);
comment.asc_putUserName(this.currentUserName);
comment.asc_putUserName(Common.Utils.UserInfoParser.getCurrentName());
comment.asc_putSolved(false);
if (!_.isUndefined(comment.asc_putDocumentFlag)) {
@ -238,7 +237,7 @@ define([
},
onRemoveComments: function (type) {
if (this.api) {
this.api.asc_RemoveAllComments(type=='my' || !this.mode.canEditComments, type=='current');// 1 param = true if remove only my comments, 2 param - remove current comments
this.api.asc_RemoveAllComments(type=='my' || !this.mode.canDeleteComments, type=='current');// 1 param = true if remove only my comments, 2 param - remove current comments
}
},
onResolveComment: function (uid) {
@ -291,7 +290,7 @@ define([
return false;
},
onShowComment: function (id, selected) {
onShowComment: function (id, selected, fromLeftPanelSelection) {
var comment = this.findComment(id);
if (comment) {
if (null !== comment.get('quote')) {
@ -319,9 +318,11 @@ define([
this.isSelectedComment = selected;
}
this.api.asc_selectComment(id);
this._dontScrollToComment = true;
this.api.asc_showComment(id,false);
if (!fromLeftPanelSelection || !((0 === _.difference(this.uids, [id]).length) && (0 === _.difference([id], this.uids).length))) {
this.api.asc_selectComment(id);
this._dontScrollToComment = true;
this.api.asc_showComment(id,false);
}
}
} else {
@ -353,7 +354,7 @@ define([
ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
ascComment.asc_putOnlyOfficeTime(t.ooDateToString(new Date(comment.get('time'))));
ascComment.asc_putUserId(t.currentUserId);
ascComment.asc_putUserName(t.currentUserName);
ascComment.asc_putUserName(Common.Utils.UserInfoParser.getCurrentName());
ascComment.asc_putSolved(comment.get('resolved'));
ascComment.asc_putGuid(comment.get('guid'));
ascComment.asc_putUserData(comment.get('userdata'));
@ -430,7 +431,7 @@ define([
if (reply.get('id') === replyId && !_.isUndefined(replyVal)) {
addReply.asc_putText(replyVal);
addReply.asc_putUserId(me.currentUserId);
addReply.asc_putUserName(me.currentUserName);
addReply.asc_putUserName(Common.Utils.UserInfoParser.getCurrentName());
} else {
addReply.asc_putText(reply.get('reply'));
addReply.asc_putUserId(reply.get('userid'));
@ -510,7 +511,7 @@ define([
addReply.asc_putTime(me.utcDateToString(new Date()));
addReply.asc_putOnlyOfficeTime(me.ooDateToString(new Date()));
addReply.asc_putUserId(me.currentUserId);
addReply.asc_putUserName(me.currentUserName);
addReply.asc_putUserName(Common.Utils.UserInfoParser.getCurrentName());
ascComment.asc_addReply(addReply);
@ -775,6 +776,8 @@ define([
comment.set('userdata', data.asc_getUserData());
comment.set('time', date.getTime());
comment.set('date', t.dateToLocaleTimeString(date));
comment.set('editable', t.mode.canEditComments || (data.asc_getUserId() == t.currentUserId));
comment.set('removable', t.mode.canDeleteComments || (data.asc_getUserId() == t.currentUserId));
replies = _.clone(comment.get('replys'));
@ -800,7 +803,8 @@ define([
editTextInPopover : false,
showReplyInPopover : false,
scope : t.view,
editable : t.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId)
editable : t.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId),
removable : t.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId)
}));
}
@ -1240,6 +1244,7 @@ define([
hideAddReply : !_.isUndefined(this.hidereply) ? this.hidereply : (this.showPopover ? true : false),
scope : this.view,
editable : this.mode.canEditComments || (data.asc_getUserId() == this.currentUserId),
removable : this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId),
hint : !this.mode.canComments,
groupName : (groupname && groupname.length>1) ? groupname[1] : null
});
@ -1276,7 +1281,8 @@ define([
editTextInPopover : false,
showReplyInPopover : false,
scope : this.view,
editable : this.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)
editable : this.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId),
removable : this.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)
}));
}
}
@ -1306,7 +1312,7 @@ define([
time: date.getTime(),
date: this.dateToLocaleTimeString(date),
userid: this.currentUserId,
username: this.currentUserName,
username: Common.Utils.UserInfoParser.getCurrentName(),
usercolor: (user) ? user.get('color') : null,
editTextInPopover: true,
showReplyInPopover: false,
@ -1370,7 +1376,7 @@ define([
comment.asc_putTime(this.utcDateToString(new Date()));
comment.asc_putOnlyOfficeTime(this.ooDateToString(new Date()));
comment.asc_putUserId(this.currentUserId);
comment.asc_putUserName(this.currentUserName);
comment.asc_putUserName(Common.Utils.UserInfoParser.getCurrentName());
comment.asc_putSolved(false);
if (!_.isUndefined(comment.asc_putDocumentFlag))
@ -1437,7 +1443,7 @@ define([
for (i = 0; i < comments.length; ++i) {
comment = this.findComment(comments[i].asc_getId());
if (comment) {
comment.set('editTextInPopover', t.mode.canEditComments);// dont't edit comment when customization->commentAuthorOnly is true
comment.set('editTextInPopover', t.mode.canEditComments);// dont't edit comment when customization->commentAuthorOnly is true or when permissions.editCommentAuthorOnly is true
comment.set('hint', false);
this.popoverComments.push(comment);
}

10
apps/common/main/lib/controller/ExternalDiagramEditor.js
View file

@ -56,6 +56,7 @@ define([
var createExternalEditor = function() {
!!customization && (customization.uiTheme = Common.localStorage.getItem("ui-theme", "theme-light"));
externalEditor = new DocsAPI.DocEditor('id-diagram-editor-placeholder', {
width : '100%',
height : '100%',
@ -242,6 +243,15 @@ define([
}
},
showExternalEditor: function () {
if ( externalEditor ) {
var value = Common.localStorage.getItem("ui-theme", "theme-light");
externalEditor.serviceCommand('theme:change', value);
}
this.diagramEditorView.show();
},
warningTitle: 'Warning',
warningText: 'The object is disabled because of editing by another user.',
textClose: 'Close',

22
apps/common/main/lib/controller/History.js
View file

@ -139,6 +139,12 @@ define([
Common.Gateway.requestHistoryData(rev); // получаем url-ы для ревизий
}, 10);
} else {
var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) {
commentsController.onApiHideComment();
commentsController.clearCollections();
}
var urlDiff = record.get('urlDiff'),
token = record.get('token'),
hist = new Asc.asc_CVersionHistory();
@ -152,11 +158,6 @@ define([
hist.asc_setServerVersion(this.currentServerVersion);
this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) {
commentsController.onApiHideComment();
commentsController.clearCollections();
}
var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges');
if (reviewController)
reviewController.onApiShowChange();
@ -175,6 +176,12 @@ define([
};
Common.UI.alert(config);
} else {
var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) {
commentsController.onApiHideComment();
commentsController.clearCollections();
}
var data = opts.data;
var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions');
if (historyStore && data!==null) {
@ -210,11 +217,6 @@ define([
hist.asc_setServerVersion(this.currentServerVersion);
this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) {
commentsController.onApiHideComment();
commentsController.clearCollections();
}
var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges');
if (reviewController)
reviewController.onApiShowChange();

32
apps/common/main/lib/controller/Plugins.js
View file

@ -246,7 +246,7 @@ define([
if (!btn) return;
var _group = $('> .group', me.$toolbarPanelPlugins);
var $slot = $('<span class="slot"></span>').appendTo(_group);
var $slot = $('<span class="btn-slot text x-huge"></span>').appendTo(_group);
btn.render($slot);
}
},
@ -271,7 +271,7 @@ define([
var btn = me.panelPlugins.createPluginButton(model);
if (btn) {
var $slot = $('<span class="slot"></span>').appendTo(_group);
var $slot = $('<span class="btn-slot text x-huge"></span>').appendTo(_group);
btn.render($slot);
rank_plugins++;
}
@ -644,23 +644,23 @@ define([
arr = [],
plugins = this.configPlugins,
warn = false;
if (plugins.plugins && plugins.plugins.length>0) {
if (plugins.plugins && plugins.plugins.length>0)
arr = plugins.plugins;
var val = plugins.config.autostart || plugins.config.autoStartGuid;
if (typeof (val) == 'string')
val = [val];
warn = !!plugins.config.autoStartGuid;
autostart = val || [];
}
var val = plugins.config.autostart || plugins.config.autoStartGuid;
if (typeof (val) == 'string')
val = [val];
warn = !!plugins.config.autoStartGuid;
autostart = val || [];
plugins = this.serverPlugins;
if (plugins.plugins && plugins.plugins.length>0) {
if (plugins.plugins && plugins.plugins.length>0)
arr = arr.concat(plugins.plugins);
var val = plugins.config.autostart || plugins.config.autoStartGuid;
if (typeof (val) == 'string')
val = [val];
(warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
autostart = autostart.concat(val || []);
}
val = plugins.config.autostart || plugins.config.autoStartGuid;
if (typeof (val) == 'string')
val = [val];
(warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
autostart = autostart.concat(val || []);
this.autostart = autostart;
this.parsePlugins(arr, false);
}

12
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -118,16 +118,6 @@ define([
if (data) {
this.currentUserId = data.config.user.id;
if (this.appConfig && this.appConfig.canUseReviewPermissions) {
var permissions = this.appConfig.customization.reviewPermissions,
arr = [],
groups = Common.Utils.UserInfoParser.getParsedGroups(data.config.user.fullname);
groups && groups.forEach(function(group) {
var item = permissions[group.trim()];
item && (arr = arr.concat(item));
});
this.currentUserGroups = arr;
}
this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
}
return this;
@ -482,7 +472,7 @@ define([
checkUserGroups: function(username) {
var groups = Common.Utils.UserInfoParser.getParsedGroups(username);
return this.currentUserGroups && groups && (_.intersection(this.currentUserGroups, (groups.length>0) ? groups : [""]).length>0);
return Common.Utils.UserInfoParser.getCurrentGroups() && groups && (_.intersection(Common.Utils.UserInfoParser.getCurrentGroups(), (groups.length>0) ? groups : [""]).length>0);
},
getUserName: function(id){

62
apps/common/main/lib/controller/Themes.js Normal file
View file

@ -0,0 +1,62 @@
/**
* Created by Maxim.Kadushkin on 2/5/2021.
*/
define([
'core'
], function () {
'use strict';
Common.UI.Themes = new (function() {
var sdk_themes_relation = {
'theme-light': 'flat',
'theme-dark': 'flatDark'
};
sdk_themes_relation.contains = function (name) {
return !!this[name];
}
return {
init: function (api) {
var me = this;
$(window).on('storage', function (e) {
if ( e.key == 'ui-theme' ) {
me.setTheme(e.originalEvent.newValue);
}
})
this.api = api;
api.asc_setSkin(sdk_themes_relation[Common.localStorage.getItem('ui-theme', 'theme-light')]);
// app.eventbus.addListeners({
// 'FileMenu': {
// 'settings:apply': function (menu) {
// }
// }
// }, {id: 'Themes'});
// getComputedStyle(document.documentElement).getPropertyValue('--background-normal');
},
current: function () {
return Common.localStorage.getItem('ui-theme', 'theme-light');
},
setTheme: function (name) {
if ( sdk_themes_relation.contains(name) ) {
var classname = document.documentElement.className.replace(/theme-\w+\s?/, '');
document.documentElement.className = classname;
this.api.asc_setSkin(sdk_themes_relation[name]);
$(':root').addClass(name);
Common.localStorage.setItem('ui-theme', name);
}
},
toggleTheme: function () {
this.setTheme(this.current() == 'theme-dark' ? 'theme-light' : 'theme-dark');
}
}
})();
});

6
apps/common/main/lib/model/Comment.js
View file

@ -79,7 +79,8 @@ define([
hide : false,
hint : false,
dummy : undefined,
editable : true
editable : true,
removable : true
}
});
Common.Models.Reply = Backbone.Model.extend({
@ -96,7 +97,8 @@ define([
editText : false,
editTextInPopover : false,
scope : null,
editable : true
editable : true,
removable : true
}
});
});

6
apps/common/main/lib/template/AutoCorrectDialog.template
View file

@ -25,9 +25,9 @@
</tr>
<tr>
<td style="padding-bottom: 8px;">
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-reset" style="min-width: 86px;"><%= scope.textResetAll %></button>
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-delete" style="min-width: 86px;float: right;"><%= scope.textDelete %></button>
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-edit" style="min-width: 86px;float: right;margin-right:5px;"><%= scope.textAdd %></button>
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-reset" style="min-width: 80px;"><%= scope.textResetAll %></button>
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-delete" style="min-width: 80px;float: right;"><%= scope.textDelete %></button>
<button type="button" class="btn btn-text-default auto" id="auto-correct-btn-edit" style="min-width: 80px;float: right;margin-right:5px;"><%= scope.textAdd %></button>
</td>
</tr>
</table>

10
apps/common/main/lib/template/Comments.template
View file

@ -36,6 +36,8 @@
<div class="btns-reply-ct">
<% if (item.get("editable")) { %>
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
<% } %>
<% if (item.get("removable")) { %>
<div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
<% } %>
</div>
@ -67,13 +69,11 @@
<div class="edit-ct">
<% if (editable) { %>
<div class="btn-edit img-commonctrl"></div>
<% } %>
<% if (removable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>
<% if (resolved) { %>
<div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
<% } else { %>
<div class="btn-resolve img-commonctrl" data-toggle="tooltip"></div>
<% } %>
<div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
</div>
<% } %>

12
apps/common/main/lib/template/CommentsPopover.template
View file

@ -36,7 +36,9 @@
<div class="btns-reply-ct">
<% if (item.get("editable")) { %>
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
<div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
<%}%>
<% if (item.get("removable")) { %>
<div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
<%}%>
</div>
<%}%>
@ -68,13 +70,11 @@
<div class="edit-ct">
<% if (editable) { %>
<div class="btn-edit img-commonctrl"></div>
<% } %>
<% if (removable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>
<% if (resolved) { %>
<div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
<% } else { %>
<div class="btn-resolve img-commonctrl" data-toggle="tooltip"></div>
<% } %>
<div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
</div>
<% } %>

12
apps/common/main/lib/util/LocalStorage.js
View file

@ -98,12 +98,19 @@ define(['gateway'], function () {
var value = _getItem(name);
defValue = defValue || false;
return (value!==null) ? (parseInt(value) != 0) : defValue;
}
};
var _getItemExists = function (name) {
var value = _getItem(name);
return value !== null;
}
};
var _removeItem = function(name) {
if (_lsAllowed)
localStorage.removeItem(name);
else
delete _store[name];
};
try {
var _lsAllowed = !!window.localStorage;
@ -122,6 +129,7 @@ define(['gateway'], function () {
getBool: _getItemAsBool,
setBool: _setItemAsBool,
setItem: _setItem,
removeItem: _removeItem,
setKeysFilter: function(value) {
_filter = value;
},

83
apps/common/main/lib/util/define.js
View file

@ -430,6 +430,32 @@ define(function(){ 'use strict';
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
textCombo: 'Combo',
textBarNormal: 'Clustered column',
textBarStacked: 'Stacked column',
textBarStackedPer: '100% Stacked column',
textBarNormal3d: '3-D Clustered column',
textBarStacked3d: '3-D Stacked column',
textBarStackedPer3d: '3-D 100% Stacked column',
textBarNormal3dPerspective: '3-D column',
textLineStacked: 'Stacked line',
textLineStackedPer: '100% Stacked line',
textLine3d: '3-D line',
textDoughnut: 'Doughnut',
textPie3d: '3-D pie',
textHBarNormal: 'Clustered bar',
textHBarStacked: 'Stacked bar',
textHBarStackedPer: '100% Stacked bar',
textHBarNormal3d: '3-D Clustered bar',
textHBarStacked3d: '3-D Stacked bar',
textHBarStackedPer3d: '3-D 100% Stacked bar',
textAreaStacked: 'Stacked area',
textAreaStackedPer: '100% Stacked area',
textScatter: 'Scatter',
textComboBarLine: 'Clustered column - line',
textComboBarLineSecondary: 'Clustered column - line on secondary axis',
textComboAreaBar: 'Stacked area - clustered column',
textComboCustom: 'Custom combination',
getChartGroupData: function(headername) {
return [
@ -439,38 +465,43 @@ define(function(){ 'use strict';
{id: 'menu-chart-group-hbar', caption: this.textBar},
{id: 'menu-chart-group-area', caption: this.textArea, inline: true},
{id: 'menu-chart-group-scatter', caption: this.textPoint, inline: true},
{id: 'menu-chart-group-stock', caption: this.textStock, inline: true}
{id: 'menu-chart-group-stock', caption: this.textStock, inline: true},
{id: 'menu-chart-group-combo', caption: this.textCombo}
// {id: 'menu-chart-group-surface', caption: this.textSurface}
];
},
getChartData: function() {
return [
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', tip: this.textBarNormal},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack', tip: this.textBarStacked},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack', tip: this.textBarStackedPer},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal', tip: this.textBarNormal3d, is3d: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack', tip: this.textBarStacked3d, is3d: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack', tip: this.textBarStackedPer3d, is3d: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per', tip: this.textBarNormal3dPerspective, is3d: true},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal', tip: this.textLine},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack', tip: this.textLineStacked},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack', tip: this.textLineStackedPer},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d', tip: this.textLine3d, is3d: true},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal', tip: this.textPie},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut', tip: this.textDoughnut},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal', tip: this.textPie3d, is3d: true},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal', tip: this.textHBarNormal},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack', tip: this.textHBarStacked},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack', tip: this.textHBarStackedPer},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal', tip: this.textHBarNormal3d, is3d: true},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack', tip: this.textHBarStacked3d, is3d: true},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack', tip: this.textHBarStackedPer3d, is3d: true},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal', tip: this.textArea},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack', tip: this.textAreaStacked},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack', tip: this.textAreaStackedPer},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal', tip: this.textScatter},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal', tip: this.textStock},
{ group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboBarLine, iconCls: 'combo-bar-line', tip: this.textComboBarLine},
{ group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboBarLineSecondary, iconCls: 'combo-bar-line-sec', tip: this.textComboBarLineSecondary},
{ group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboAreaBar, iconCls: 'combo-area-bar', tip: this.textComboAreaBar},
{ group: 'menu-chart-group-combo', type: Asc.c_oAscChartTypeSettings.comboCustom, iconCls: 'combo-custom', tip: this.textComboCustom}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},

70
apps/common/main/lib/util/utils.js
View file

@ -731,6 +731,7 @@ Common.Utils.fillUserInfo = function(info, lang, defname) {
!_user.id && (_user.id = ('uid-' + Date.now()));
_user.fullname = _.isEmpty(_user.name) ? defname : _user.name;
_user.group && (_user.fullname = (_user.group).toString() + Common.Utils.UserInfoParser.getSeparator() + _user.fullname);
_user.guest = _.isEmpty(_user.name);
return _user;
};
@ -896,23 +897,24 @@ Common.Utils.warningDocumentIsLocked = function (opts) {
opts.disablefunc(true);
var app = window.DE || window.PE || window.SSE;
var tip = new Common.UI.SynchronizeTip({
extCls : 'simple',
text : Common.Locale.get("warnFileLocked",{name:"Common.Translation", default:'Document is in use by another application. You can continue editing and save it as a copy.'}),
textLink : Common.Locale.get("txtContinueEditing",{name:app.nameSpace + ".Views.SignatureSettings", default:'Edit anyway'}),
placement : 'document'
});
tip.on({
'dontshowclick': function() {
if ( opts.disablefunc ) opts.disablefunc(false);
app.getController('Main').api.asc_setIsReadOnly(false);
this.close();
},
'closeclick': function() {
this.close();
Common.UI.warning({
msg: Common.Locale.get("warnFileLocked",{name:"Common.Translation", default: "You can't edit this file. Document is in use by another application."}),
buttons: [{
value: 'view',
caption: Common.Locale.get("warnFileLockedBtnView",{name:"Common.Translation", default: "Open for viewing"})
}, {
value: 'edit',
caption: Common.Locale.get("warnFileLockedBtnEdit",{name:"Common.Translation", default: "Create a copy"})
}],
primary: 'view',
callback: function(btn){
if (btn == 'edit') {
if ( opts.disablefunc ) opts.disablefunc(false);
app.getController('Main').api.asc_setIsReadOnly(false);
}
}
});
tip.show();
};
jQuery.fn.extend({
@ -983,8 +985,12 @@ Common.Utils.ModalWindow = new(function() {
})();
Common.Utils.UserInfoParser = new(function() {
var parse = false;
var separator = String.fromCharCode(160);
var parse = false,
separator = String.fromCharCode(160),
username = '',
usergroups,
reviewPermissions,
reviewGroups;
return {
setParser: function(value) {
parse = !!value;
@ -1010,6 +1016,36 @@ Common.Utils.UserInfoParser = new(function() {
return groups;
} else
return undefined;
},
setCurrentName: function(name) {
username = name;
this.setReviewPermissions(reviewGroups, reviewPermissions);
},
getCurrentName: function() {
return username;
},
setReviewPermissions: function(groups, permissions) {
if (groups) {
if (typeof groups == 'object' && groups.length>0)
usergroups = groups;
reviewGroups = groups;
} else if (permissions) {
var arr = [],
arrgroups = this.getParsedGroups(username);
arrgroups && arrgroups.forEach(function(group) {
var item = permissions[group.trim()];
item && (arr = arr.concat(item));
});
usergroups = arr;
reviewPermissions = permissions;
}
},
getCurrentGroups: function() {
return usergroups;
}
}
})();

9
apps/common/main/lib/view/AutoCorrectDialog.js
View file

@ -133,8 +133,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="pointer-events:none;width: 100%;display:flex;">',
'<div style="min-width:110px;padding-right: 5px;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= replaced %></div>',
'<div style="flex-grow:1;font-family: Cambria Math;font-size:13px;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= by %></div>',
'<div style="width:110px;padding-right: 5px;overflow: hidden;text-overflow: ellipsis;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= replaced %></div>',
'<div style="width:230px;overflow: hidden;text-overflow: ellipsis;flex-grow:1;font-family: Cambria Math;font-size:13px;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= by %></div>',
'</div>'
].join('')),
scrollAlwaysVisible: true,
@ -146,6 +146,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
el : $window.find('#auto-correct-replace'),
allowBlank : true,
validateOnChange : true,
maxLength : 31,
validation : function () { return true; }
}).on ('changing', function (input, value) {
var _selectedItem;
@ -186,6 +187,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
el : $window.find('#auto-correct-by'),
allowBlank : true,
validateOnChange : true,
maxLength : 255,
validation : function () { return true; }
}).on ('changing', function (input, value) {
me.updateControls();
@ -216,7 +218,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
simpleAddMode: false,
template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= value %></div>'
'<div id="<%= id %>" class="list-item" style="width: 340px;text-overflow: ellipsis;overflow: hidden;<% if (defaultDisabled) { %> font-style:italic; opacity: 0.5;<% } %>"><%= value %></div>'
].join('')),
scrollAlwaysVisible: true,
tabindex: 1
@ -227,6 +229,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
el : $window.find('#auto-correct-rec-find'),
allowBlank : true,
validateOnChange : true,
maxLength : 255,
validation : function () { return true; }
}).on ('changing', function (input, value) {
var _selectedItem;

11
apps/common/main/lib/view/Comments.js
View file

@ -283,7 +283,16 @@ define([
} else if (!btn.hasClass('msg-reply') &&
!btn.hasClass('btn-resolve-check') &&
!btn.hasClass('btn-resolve')) {
me.fireEvent('comment:show', [commentId, false]);
var isTextSelected = false;
if (btn.hasClass('user-message')) {
if (window.getSelection) {
var selection = window.getSelection();
isTextSelected = (selection.toString()!=='')
} else if (document.selection) {
isTextSelected = document.selection;
}
}
me.fireEvent('comment:show', [commentId, false, isTextSelected]);
}
}
},

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

@ -78,7 +78,7 @@ define([
blankError : me.options.error ? me.options.error : me.textLabelError,
style : 'width: 100%;',
validateOnBlur: false,
validation : function(value) {
validation : me.options.validation || function(value) {
return value ? true : '';
}
});

3
apps/common/main/lib/view/ExtendedColorDialog.js
View file

@ -125,6 +125,9 @@ define([
this.spinB.on('change', _.bind(this.showColor, this, null, true)).on('changing', _.bind(this.onChangingRGB, this, 3));
this.textColor.on('change', _.bind(this.onChangeMaskedField, this));
this.textColor.on('changed', _.bind(this.onChangedMaskedField, this));
this.textColor.$el.on('focus', function() {
setTimeout(function(){me.textColor.$el && me.textColor.$el.select();}, 1);
});
this.spinR.$el.find('input').attr('maxlength', 3);
this.spinG.$el.find('input').attr('maxlength', 3);
this.spinB.$el.find('input').attr('maxlength', 3);

81
apps/common/main/lib/view/Header.js
View file

@ -98,8 +98,15 @@ define([
'</div>' +
'<div class="hedset">' +
'<div class="btn-slot" id="slot-btn-back"></div>' +
'<div class="btn-slot" id="slot-btn-favorite"></div>' +
'<div class="btn-slot" id="slot-btn-options"></div>' +
'</div>' +
'<div class="hedset">' +
'<div class="btn-slot" id="slot-btn-user-name"></div>' +
'<div class="btn-current-user hidden">' +
'<i class="icon toolbar__icon icon--inverse btn-user"></i>' +
'</div>' +
'</div>' +
'</section>' +
'</section>';
@ -118,7 +125,7 @@ define([
'<div class="lr-separator" id="id-box-doc-name">' +
'<label id="title-doc-name" />' +
'</div>' +
'<label id="title-user-name" style="pointer-events: none;"></label>' +
'<label id="title-user-name"></label>' +
'</section>';
function onResetUsers(collection, opts) {
@ -232,6 +239,14 @@ define([
Common.NotificationCenter.trigger('goback');
});
me.btnFavorite.on('click', function (e) {
// wait for setFavorite method
// me.options.favorite = !me.options.favorite;
// me.btnFavorite.changeIcon(me.options.favorite ? {next: 'btn-in-favorite'} : {curr: 'btn-in-favorite'});
// me.btnFavorite.updateHint(!me.options.favorite ? me.textAddFavorite : me.textRemoveFavorite);
Common.NotificationCenter.trigger('markfavorite', !me.options.favorite);
});
if ( me.logo )
me.logo.children(0).on('click', function (e) {
var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ?
@ -273,6 +288,20 @@ define([
$panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit || !mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings)) ? 'show' : 'hide']();
}
if (appConfig.user.guest && appConfig.canRenameAnonymous) {
if (me.labelUserName) {
me.labelUserName.addClass('clickable');
me.labelUserName.on('click', function (e) {
Common.NotificationCenter.trigger('user:rename');
});
} else if (me.btnUserName) {
me.btnUserName.on('click', function (e) {
Common.NotificationCenter.trigger('user:rename');
});
}
}
if ( me.btnPrint ) {
me.btnPrint.updateHint(me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'));
me.btnPrint.on('click', function (e) {
@ -402,6 +431,12 @@ define([
me.mnuZoom = {options: {value: 100}};
me.btnFavorite = new Common.UI.Button({
id: 'btn-favorite',
cls: 'btn-header',
iconCls: 'toolbar__icon icon--inverse btn-favorite'
});
Common.NotificationCenter.on({
'app:ready': function(mode) {Common.Utils.asyncCall(onAppReady, me, mode);},
'app:face': function(mode) {Common.Utils.asyncCall(onAppShowed, me, mode);}
@ -463,6 +498,14 @@ define([
$html.find('#slot-btn-back').hide();
}
if ( this.options.favorite !== undefined && this.options.favorite!==null) {
me.btnFavorite.render($html.find('#slot-btn-favorite'));
me.btnFavorite.changeIcon(!!me.options.favorite ? {next: 'btn-in-favorite'} : {curr: 'btn-in-favorite'});
me.btnFavorite.updateHint(!me.options.favorite ? me.textAddFavorite : me.textRemoveFavorite);
} else {
$html.find('#slot-btn-favorite').hide();
}
if ( !config.isEdit ) {
if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline )
this.btnDownload = createTitleButton('toolbar__icon icon--inverse btn-download', $html.findById('#slot-hbtn-download'));
@ -475,6 +518,16 @@ define([
}
me.btnOptions.render($html.find('#slot-btn-options'));
if (!config.isEdit || config.customization && !!config.customization.compactHeader) {
if (config.user.guest && config.canRenameAnonymous)
me.btnUserName = createTitleButton('toolbar__icon icon--inverse btn-user', $html.findById('#slot-btn-user-name'));
else {
me.elUserName = $html.find('.btn-current-user');
me.elUserName.removeClass('hidden');
}
me.setUserName(me.options.userName);
}
$userList = $html.find('.cousers-list');
$panelUsers = $html.find('.box-cousers');
$btnUsers = $html.find('.btn-users');
@ -582,6 +635,19 @@ define([
return this.options.canBack;
},
setFavorite: function (value) {
this.options.favorite = value;
this.btnFavorite[value!==undefined && value!==null ? 'show' : 'hide']();
this.btnFavorite.changeIcon(!!value ? {next: 'btn-in-favorite'} : {curr: 'btn-in-favorite'});
this.btnFavorite.updateHint(!value ? this.textAddFavorite : this.textRemoveFavorite);
return this;
},
getFavorite: function () {
return this.options.favorite;
},
setCanRename: function (rename) {
rename = false;
@ -622,6 +688,15 @@ define([
} else this.labelUserName.hide();
} else {
this.options.userName = name;
if ( this.btnUserName ) {
this.btnUserName.updateHint(name);
} else if (this.elUserName) {
this.elUserName.tooltip({
title: name,
placement: 'cursor',
html: true
});
}
}
return this;
@ -691,7 +766,9 @@ define([
textHideLines: 'Hide Rulers',
textZoom: 'Zoom',
textAdvSettings: 'Advanced Settings',
tipViewSettings: 'View Settings'
tipViewSettings: 'View Settings',
textRemoveFavorite: 'Remove from Favorites',
textAddFavorite: 'Mark as favorite'
}
}(), Common.Views.Header || {}))
});

4
apps/common/main/lib/view/LanguageDialog.js
View file

@ -87,7 +87,9 @@ define([
'<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control">',
'<span class="icon input-icon spellcheck-lang toolbar__icon btn-ic-docspell"></span>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret" />',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>">',

3
apps/common/main/lib/view/OpenDialog.js
View file

@ -68,6 +68,7 @@ define([
preview : options.preview,
warning : options.warning,
codepages : options.codepages,
warningMsg : options.warningMsg,
width : width,
height : height,
header : true,
@ -85,7 +86,7 @@ define([
'<% if (warning) { %>',
'<div>',
'<div class="icon img-commonctrl warn"></div>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '</div>',
'<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="width: 290px;"></div></div>',
'</div>',

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

@ -162,7 +162,7 @@ define([
hint: model.get('name')
});
var $slot = $('<span class="slot"></span>').appendTo(_group);
var $slot = $('<span class="btn-slot text x-huge"></span>').appendTo(_group);
btn.render($slot);
model.set('button', btn);
@ -210,6 +210,7 @@ define([
this.iframePlugin.align = "top";
this.iframePlugin.frameBorder = 0;
this.iframePlugin.scrolling = "no";
this.iframePlugin.allow = "camera; microphone; display-capture";
this.iframePlugin.onload = _.bind(this._onLoad,this);
this.currentPluginFrame.append(this.iframePlugin);
@ -393,6 +394,7 @@ define([
iframe.align = "top";
iframe.frameBorder = 0;
iframe.scrolling = "no";
iframe.allow = "camera; microphone; display-capture";
iframe.onload = _.bind(this._onLoad,this);
var me = this;

4
apps/common/main/lib/view/ReviewChanges.js
View file

@ -457,7 +457,7 @@ define([
if (me.btnCommentRemove) {
var items = [
{
caption: config.canEditComments ? me.txtCommentRemCurrent : me.txtCommentRemMyCurrent,
caption: config.canDeleteComments ? me.txtCommentRemCurrent : me.txtCommentRemMyCurrent,
value: 'current'
},
{
@ -465,7 +465,7 @@ define([
value: 'my'
}
];
if (config.canEditComments)
if (config.canDeleteComments)
items.push({
caption: me.txtCommentRemAll,
value: 'all'

17
apps/common/main/lib/view/SymbolTableDialog.js
View file

@ -800,13 +800,16 @@ define([
},
getPasteSymbol: function(cellId) {
var bUpdateRecents = cellId[0] === 'c';
var bUpdateRecents = false;
var sFont;
if(bUpdateRecents){
sFont = aFontSelects[nCurrentFont].displayValue;
} else {
var nFontId = parseInt(cellId.split('_')[2]);
sFont = aFontSelects[nFontId].displayValue;
if (cellId && cellId.length>0) {
bUpdateRecents = (cellId[0] === 'c');
if(bUpdateRecents){
sFont = aFontSelects[nCurrentFont].displayValue;
} else {
var nFontId = parseInt(cellId.split('_')[2]);
sFont = aFontSelects[nFontId].displayValue;
}
}
return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents};
},
@ -831,7 +834,7 @@ define([
}
var special = this.btnSpecial.isActive();
var settings = special ? this.getSpecialSymbol() : this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'));
var settings = (state=='ok') ? (special ? this.getSpecialSymbol() : this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'))) : {};
if (this.options.handler) {
this.options.handler.call(this, this, state, settings);
}

134
apps/common/main/lib/view/UserNameDialog.js Normal file
View file

@ -0,0 +1,134 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2020
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* UserNameDialog.js
*
* Created by Julia Radzhabova on 09.12.2020
* Copyright (c) 2020 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/Window',
'common/main/lib/component/InputField'
], function () { 'use strict';
Common.Views.UserNameDialog = Common.UI.Window.extend(_.extend({
options: {
width: 330,
header: false,
modal : false,
cls: 'modal-dlg',
buttons: ['ok', 'cancel']
},
initialize : function(options) {
_.extend(this.options, options || {});
this.template = [
'<div class="box">',
'<div style="margin-bottom: 2px;">' + (this.options.label ? this.options.label : this.textLabel) + '</div>',
'<div id="id-dlg-username-caption" class="input-row"></div>',
'<div id="id-dlg-username-chk-use" class="" style="margin-top: 10px;"></div>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var me = this;
me.inputLabel = new Common.UI.InputField({
el : $('#id-dlg-username-caption'),
allowBlank : true,
style : 'width: 100%;',
maxLength : 128,
validateOnBlur: false,
validation : me.options.validation || function(value) {
return value ? true : '';
}
});
me.inputLabel.setValue(this.options.value || '' );
me.chDontShow = new Common.UI.CheckBox({
el: $('#id-dlg-username-chk-use'),
labelText: this.textDontShow,
value: this.options.check
});
var $window = this.getChild();
$window.find('.btn').on('click', _.bind(this.onBtnClick, this));
},
show: function() {
Common.UI.Window.prototype.show.apply(this, arguments);
var me = this;
_.delay(function(){
me.getChild('input').focus();
},50);
},
onPrimary: function(event) {
this._handleInput('ok');
return false;
},
onBtnClick: function(event) {
this._handleInput(event.currentTarget.attributes['result'].value);
},
_handleInput: function(state) {
if (this.options.handler) {
if (state == 'ok') {
if (this.inputLabel.checkValidate() !== true) {
this.inputLabel.cmpEl.find('input').focus();
return;
}
}
this.options.handler.call(this, state, {input: this.inputLabel.getValue(), checkbox: this.chDontShow.getValue()=='checked'});
}
this.close();
},
textLabel: 'Label:',
textLabelError: 'Label must not be empty.',
textDontShow: 'Don\'t ask me again'
}, Common.Views.UserNameDialog || {}));
});

BIN
apps/common/main/resources/img/controls/common-controls.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
apps/common/main/resources/img/controls/common-controls@1.5x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
apps/common/main/resources/img/controls/common-controls@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

4
apps/common/main/resources/img/doc-formats/epub.svg
View file

@ -1,8 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<symbol id="svg-format-epub">
<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#5892B6"/>
<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
<path d="M40.3218 114H35.3882V105.434H40.3218V106.922H37.2046V108.803H40.105V110.291H37.2046V112.5H40.3218V114ZM43.9312 109.465H44.5288C45.0874 109.465 45.5054 109.355 45.7827 109.137C46.0601 108.914 46.1987 108.592 46.1987 108.17C46.1987 107.744 46.0815 107.43 45.8472 107.227C45.6167 107.023 45.2534 106.922 44.7573 106.922H43.9312V109.465ZM48.0327 108.105C48.0327 109.027 47.7437 109.732 47.1655 110.221C46.5913 110.709 45.7729 110.953 44.7104 110.953H43.9312V114H42.1147V105.434H44.8511C45.8901 105.434 46.6792 105.658 47.2183 106.107C47.7612 106.553 48.0327 107.219 48.0327 108.105ZM56.6226 105.434V110.977C56.6226 111.609 56.48 112.164 56.1948 112.641C55.9136 113.117 55.5054 113.482 54.9702 113.736C54.4351 113.99 53.8022 114.117 53.0718 114.117C51.9702 114.117 51.1147 113.836 50.5054 113.273C49.896 112.707 49.5913 111.934 49.5913 110.953V105.434H51.4019V110.678C51.4019 111.338 51.5347 111.822 51.8003 112.131C52.0659 112.439 52.5054 112.594 53.1187 112.594C53.7124 112.594 54.1421 112.439 54.4077 112.131C54.6772 111.818 54.812 111.33 54.812 110.666V105.434H56.6226ZM58.7202 105.434H61.3862C62.6011 105.434 63.4819 105.607 64.0288 105.955C64.5796 106.299 64.855 106.848 64.855 107.602C64.855 108.113 64.7339 108.533 64.4917 108.861C64.2534 109.189 63.9351 109.387 63.5366 109.453V109.512C64.0796 109.633 64.4702 109.859 64.7085 110.191C64.9507 110.523 65.0718 110.965 65.0718 111.516C65.0718 112.297 64.7886 112.906 64.2222 113.344C63.6597 113.781 62.894 114 61.9253 114H58.7202V105.434ZM60.5366 108.826H61.5913C62.0835 108.826 62.439 108.75 62.6577 108.598C62.8804 108.445 62.9917 108.193 62.9917 107.842C62.9917 107.514 62.8706 107.279 62.6284 107.139C62.3901 106.994 62.0112 106.922 61.4917 106.922H60.5366V108.826ZM60.5366 110.268V112.5H61.7202C62.2202 112.5 62.5894 112.404 62.8276 112.213C63.0659 112.021 63.1851 111.729 63.1851 111.334C63.1851 110.623 62.6772 110.268 61.6616 110.268H60.5366Z" fill="white"/>
<path d="M40.3217 114H35.3881V105.434H40.3217V106.922H37.2045V108.803H40.1049V110.291H37.2045V112.5H40.3217V114ZM43.9311 109.465H44.5287C45.0873 109.465 45.5053 109.355 45.7827 109.137C46.06 108.914 46.1987 108.592 46.1987 108.17C46.1987 107.744 46.0815 107.43 45.8471 107.227C45.6166 107.023 45.2534 106.922 44.7573 106.922H43.9311V109.465ZM48.0327 108.105C48.0327 109.027 47.7436 109.732 47.1655 110.221C46.5912 110.709 45.7729 110.953 44.7104 110.953H43.9311V114H42.1147V105.434H44.851C45.8901 105.434 46.6791 105.658 47.2182 106.107C47.7612 106.553 48.0327 107.219 48.0327 108.105ZM56.6225 105.434V110.977C56.6225 111.609 56.4799 112.164 56.1948 112.641C55.9135 113.117 55.5053 113.482 54.9702 113.736C54.435 113.99 53.8022 114.117 53.0717 114.117C51.9702 114.117 51.1147 113.836 50.5053 113.273C49.8959 112.707 49.5912 111.934 49.5912 110.953V105.434H51.4018V110.678C51.4018 111.338 51.5346 111.822 51.8002 112.131C52.0659 112.439 52.5053 112.594 53.1186 112.594C53.7123 112.594 54.142 112.439 54.4077 112.131C54.6772 111.818 54.812 111.33 54.812 110.666V105.434H56.6225ZM58.7202 105.434H61.3862C62.601 105.434 63.4819 105.607 64.0287 105.955C64.5795 106.299 64.8549 106.848 64.8549 107.602C64.8549 108.113 64.7338 108.533 64.4916 108.861C64.2534 109.189 63.935 109.387 63.5366 109.453V109.512C64.0795 109.633 64.4702 109.859 64.7084 110.191C64.9506 110.523 65.0717 110.965 65.0717 111.516C65.0717 112.297 64.7885 112.906 64.2221 113.344C63.6596 113.781 62.894 114 61.9252 114H58.7202V105.434ZM60.5366 108.826H61.5912C62.0834 108.826 62.4389 108.75 62.6577 108.598C62.8803 108.445 62.9916 108.193 62.9916 107.842C62.9916 107.514 62.8705 107.279 62.6284 107.139C62.3901 106.994 62.0112 106.922 61.4916 106.922H60.5366V108.826ZM60.5366 110.268V112.5H61.7202C62.2202 112.5 62.5893 112.404 62.8276 112.213C63.0659 112.021 63.185 111.729 63.185 111.334C63.185 110.623 62.6772 110.268 61.6616 110.268H60.5366Z" fill="white"/>
<path d="M49 84V49C49 49 40 43 25 42V75C25 75 42 76 49 84Z" fill="white"/>
<path d="M75 75V42C60 43 51 49 51 49V84C58 76 75 75 75 75Z" fill="white"/>
<path d="M77 47V79C77 79 62 79 50 87.3C38 79 23 79 23 79V47H20V82C20 82 33 80 50 88C67 80 80 82 80 82V47H77Z" fill="white"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

10
apps/common/main/resources/img/doc-formats/fb2.svg Normal file
View file

@ -0,0 +1,10 @@
<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<symbol id="svg-format-fb2">
<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#B07408"/>
<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
<path d="M41.8652 114H40.0781V105.434H44.9883V106.922H41.8652V109.131H44.7715V110.613H41.8652V114ZM46.6641 105.434H49.3301C50.5449 105.434 51.4258 105.607 51.9727 105.955C52.5234 106.299 52.7988 106.848 52.7988 107.602C52.7988 108.113 52.6777 108.533 52.4355 108.861C52.1973 109.189 51.8789 109.387 51.4805 109.453V109.512C52.0234 109.633 52.4141 109.859 52.6523 110.191C52.8945 110.523 53.0156 110.965 53.0156 111.516C53.0156 112.297 52.7324 112.906 52.166 113.344C51.6035 113.781 50.8379 114 49.8691 114H46.6641V105.434ZM48.4805 108.826H49.5352C50.0273 108.826 50.3828 108.75 50.6016 108.598C50.8242 108.445 50.9355 108.193 50.9355 107.842C50.9355 107.514 50.8145 107.279 50.5723 107.139C50.334 106.994 49.9551 106.922 49.4355 106.922H48.4805V108.826ZM48.4805 110.268V112.5H49.6641C50.1641 112.5 50.5332 112.404 50.7715 112.213C51.0098 112.021 51.1289 111.729 51.1289 111.334C51.1289 110.623 50.6211 110.268 49.6055 110.268H48.4805ZM60.1172 114H54.1289V112.74L56.2793 110.566C56.916 109.914 57.332 109.463 57.5273 109.213C57.7227 108.959 57.8633 108.725 57.9492 108.51C58.0352 108.295 58.0781 108.072 58.0781 107.842C58.0781 107.498 57.9824 107.242 57.791 107.074C57.6035 106.906 57.3516 106.822 57.0352 106.822C56.7031 106.822 56.3809 106.898 56.0684 107.051C55.7559 107.203 55.4297 107.42 55.0898 107.701L54.1055 106.535C54.5273 106.176 54.877 105.922 55.1543 105.773C55.4316 105.625 55.7344 105.512 56.0625 105.434C56.3906 105.352 56.7578 105.311 57.1641 105.311C57.6992 105.311 58.1719 105.408 58.582 105.604C58.9922 105.799 59.3105 106.072 59.5371 106.424C59.7637 106.775 59.877 107.178 59.877 107.631C59.877 108.025 59.8066 108.396 59.666 108.744C59.5293 109.088 59.3145 109.441 59.0215 109.805C58.7324 110.168 58.2207 110.686 57.4863 111.357L56.3848 112.395V112.477H60.1172V114Z" fill="white"/>
<path d="M49 84V49C49 49 40 43 25 42V75C25 75 42 76 49 84Z" fill="white"/>
<path d="M75 75V42C60 43 51 49 51 49V84C58 76 75 75 75 75Z" fill="white"/>
<path d="M77 47V79C77 79 62 79 50 87.3C38 79 23 79 23 79V47H20V82C20 82 33 80 50 88C67 80 80 82 80 82V47H77Z" fill="white"/>
</symbol>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

6
apps/common/main/resources/img/doc-formats/html.svg
View file

@ -1,10 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
<symbol id="svg-format-html">
<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<symbol id="svg-format-html">
<path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#7C9A34"/>
<path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>
<path d="M40.9877 114H39.1771V110.303H35.7845V114H33.9681V105.434H35.7845V108.791H39.1771V105.434H40.9877V114ZM46.4603 114H44.6439V106.945H42.3177V105.434H48.7865V106.945H46.4603V114ZM53.7318 114L51.6693 107.279H51.6166C51.6908 108.646 51.7279 109.559 51.7279 110.016V114H50.1049V105.434H52.5775L54.6049 111.984H54.64L56.7904 105.434H59.2631V114H57.5697V109.945C57.5697 109.754 57.5717 109.533 57.5756 109.283C57.5834 109.033 57.6107 108.369 57.6576 107.291H57.6049L55.3959 114H53.7318ZM61.4252 114V105.434H63.2416V112.5H66.7162V114H61.4252Z" fill="white"/>
<path d="M62 53V57.8L75.5 62.5L62 67.2V72L80 64.2V60.8L62 53Z" fill="white"/>
<path d="M40 75H45.5L59.5 50H54L40 75Z" fill="white"/>
<path d="M19 64.2L37 72V67.2L23.5 62.5L37 57.8V53L19 60.8V64.2Z" fill="white"/>
</symbol>
</symbol>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
apps/common/main/resources/img/toolbar/1.25x/btn-change-case.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 521 B

0
apps/documenteditor/main/resources/img/toolbar/1.25x/btn-higlight.png → apps/common/main/resources/img/toolbar/1.25x/btn-higlight.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 276 B

BIN
apps/common/main/resources/img/toolbar/1.25x/btn-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 552 B

0
apps/documenteditor/main/resources/img/toolbar/1.25x/columns-one.png → apps/common/main/resources/img/toolbar/1.25x/columns-one.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 118 B

0
apps/documenteditor/main/resources/img/toolbar/1.25x/columns-three.png → apps/common/main/resources/img/toolbar/1.25x/columns-three.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 118 B

0
apps/documenteditor/main/resources/img/toolbar/1.25x/columns-two.png → apps/common/main/resources/img/toolbar/1.25x/columns-two.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 118 B

BIN
apps/common/main/resources/img/toolbar/1.5x/btn-change-case.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 577 B

0
apps/documenteditor/main/resources/img/toolbar/1.5x/btn-highlight.png → apps/common/main/resources/img/toolbar/1.5x/btn-highlight.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 275 B

BIN
apps/common/main/resources/img/toolbar/1.5x/btn-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 748 B

0
apps/documenteditor/main/resources/img/toolbar/1.5x/columns-one.png → apps/common/main/resources/img/toolbar/1.5x/columns-one.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

0
apps/documenteditor/main/resources/img/toolbar/1.5x/columns-three.png → apps/common/main/resources/img/toolbar/1.5x/columns-three.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 B

After

Width:  |  Height:  |  Size: 105 B

0
apps/documenteditor/main/resources/img/toolbar/1.5x/columns-two.png → apps/common/main/resources/img/toolbar/1.5x/columns-two.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 B

After

Width:  |  Height:  |  Size: 104 B

BIN
apps/common/main/resources/img/toolbar/1.75x/btn-change-case.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 631 B

0
apps/documenteditor/main/resources/img/toolbar/1.75x/btn-higlight.png → apps/common/main/resources/img/toolbar/1.75x/btn-higlight.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

BIN
apps/common/main/resources/img/toolbar/1.75x/btn-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 830 B

0
apps/documenteditor/main/resources/img/toolbar/1.75x/columns-one.png → apps/common/main/resources/img/toolbar/1.75x/columns-one.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

0
apps/documenteditor/main/resources/img/toolbar/1.75x/columns-three.png → apps/common/main/resources/img/toolbar/1.75x/columns-three.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 118 B

0
apps/documenteditor/main/resources/img/toolbar/1.75x/columns-two.png → apps/common/main/resources/img/toolbar/1.75x/columns-two.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

13
apps/common/main/resources/img/toolbar/1x/.css.handlebars
View file

@ -3,18 +3,14 @@
&.active, &:active {
&:not(:disabled):not(.disabled) {
.toolbar__icon {
@btn-active-icon-offset: -20px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
background-position-x: var(--button-small-active-icon-offset-x, 0);
}
}
}
}
.menu__icon {
.no-checkmark.checked & {
@btn-active-icon-offset: -20px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
background-position-x: @menu-icon-item-checked-offset-x;
}
}
.toolbar__icon, .menu__icon {
@ -23,9 +19,6 @@
{{/spritesheet}}
{{#sprites}}
{{#parselang name}}.{{name}}{{/parselang}} {
background-position: {{px.offset_x}} {{px.offset_y}};
--bgX: {{px.offset_x}};
background-position: var(--bgX) {{px.offset_y}};
background-position: var(--button-small-normal-icon-offset-x, 0) {{px.offset_y}};
}
{{/sprites}}

12
apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
View file

@ -4,9 +4,7 @@
&.active, &:active {
&:not(:disabled):not(.disabled) {
.toolbar__icon {
@btn-active-icon-offset: -28px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
background-position-x: var(--button-huge-active-icon-offset-x,0);
}
}
}
@ -15,8 +13,7 @@
&.active, &:active {
&:not(:disabled):not(.disabled) {
.toolbar__icon.toolbar__icon-big {
@btn-active-icon-offset: -28px;
background-position-x: @btn-active-icon-offset;
background-position-x: var(--button-huge-active-icon-offset-x,0);
}
}
}
@ -32,9 +29,6 @@
{{#parselang name}}.x-huge .{{name}}{{/parselang}},
.toolbar__icon-big.{{name}}
{
background-position: {{px.offset_x}} {{px.offset_y}};
--bgX: {{px.offset_x}};
background-position: var(--bgX) {{px.offset_y}};
background-position: var(--button-huge-normal-icon-offset-x,0) {{px.offset_y}};
}
{{/sprites}}

BIN
apps/common/main/resources/img/toolbar/1x/btn-change-case.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 429 B

BIN
apps/common/main/resources/img/toolbar/1x/btn-favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 461 B

0
apps/documenteditor/main/resources/img/toolbar/1x/btn-highlight.png → apps/common/main/resources/img/toolbar/1x/btn-highlight.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

BIN
apps/common/main/resources/img/toolbar/1x/btn-in-favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 426 B

BIN
apps/common/main/resources/img/toolbar/1x/btn-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 462 B

0
apps/documenteditor/main/resources/img/toolbar/1x/columns-one.png → apps/common/main/resources/img/toolbar/1x/columns-one.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 B

After

Width:  |  Height:  |  Size: 96 B

0
apps/documenteditor/main/resources/img/toolbar/1x/columns-three.png → apps/common/main/resources/img/toolbar/1x/columns-three.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 B

After

Width:  |  Height:  |  Size: 93 B

0
apps/documenteditor/main/resources/img/toolbar/1x/columns-two.png → apps/common/main/resources/img/toolbar/1x/columns-two.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 B

After

Width:  |  Height:  |  Size: 99 B

BIN
apps/common/main/resources/img/toolbar/2x/btn-change-case.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 643 B

BIN
apps/common/main/resources/img/toolbar/2x/btn-favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 785 B

0
apps/documenteditor/main/resources/img/toolbar/2x/btn-highlight.png → apps/common/main/resources/img/toolbar/2x/btn-highlight.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

BIN
apps/common/main/resources/img/toolbar/2x/btn-in-favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 637 B

BIN
apps/common/main/resources/img/toolbar/2x/btn-menu-navigation.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 195 B

BIN
apps/common/main/resources/img/toolbar/2x/btn-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,009 B

0
apps/documenteditor/main/resources/img/toolbar/2x/columns-one.png → apps/common/main/resources/img/toolbar/2x/columns-one.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 B

After

Width:  |  Height:  |  Size: 118 B

0
apps/documenteditor/main/resources/img/toolbar/2x/columns-three.png → apps/common/main/resources/img/toolbar/2x/columns-three.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

0
apps/documenteditor/main/resources/img/toolbar/2x/columns-two.png → apps/common/main/resources/img/toolbar/2x/columns-two.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

195
apps/common/main/resources/img/toolbar/charttypes.svg
View file

@ -1,116 +1,151 @@
<svg aria-hidden="true" style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<symbol id="chart-column-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 6H27V34H33V6ZM20 14H26V34H20V14ZM19 20H13V34H19V20ZM12 26H6V34H12V26Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 6H27V34H33V6ZM20 14H26V34H20V14ZM19 20H13V34H19V20ZM12 26H6V34H12V26Z"/>
</symbol>
<symbol id="chart-column-stack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 17H27V34H33V17ZM20 22H26V34H20V22ZM19 26H13V34H19V26ZM12 29H6V34H12V29Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M33 6H27V17H33V6ZM20 14H26V22H20V14ZM19 20H13V26H19V20ZM12 25H6V29H12V25Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 17H27V34H33V17ZM20 22H26V34H20V22ZM19 26H13V34H19V26ZM12 29H6V34H12V29Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M33 6H27V17H33V6ZM20 14H26V22H20V14ZM19 20H13V26H19V20ZM12 25H6V29H12V25Z"/>
</symbol>
<symbol id="chart-column-pstack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 14H27V34H33V14ZM20 16H26V34H20V16ZM19 18H13V34H19V18ZM12 21H6V34H12V21Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M12 6H6V21H12V6ZM19 6H13V18H19V6ZM20 6H26V16H20V6ZM33 6H27V14H33V6Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M33 14H27V34H33V14ZM20 16H26V34H20V16ZM19 18H13V34H19V18ZM12 21H6V34H12V21Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M12 6H6V21H12V6ZM19 6H13V18H19V6ZM20 6H26V16H20V6ZM33 6H27V14H33V6Z"/>
</symbol>
<symbol id="chart-column-3d-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 34L27 35V8L23 7V34ZM22 33L18 32V11L22 12V33ZM13 30L17 31V17L13 16V30ZM8 28L12 29V21L8 20V28Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M31 7L27 6L23 7L27 8L31 7ZM22 10L23 10.25V11.75L22 12L18 11L22 10ZM18 15.25L17 15L13 16L17 17L18 16.75V15.25ZM12 19L13 19.25V20.75L12 21L8 20L12 19Z" fill="#444444"/>
<path opacity="0.4" d="M31 7L27 8V35L31 34V7Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 34L27 35V8L23 7V34ZM22 33L18 32V11L22 12V33ZM13 30L17 31V17L13 16V30ZM8 28L12 29V21L8 20V28Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M31 7L27 6L23 7L27 8L31 7ZM22 10L23 10.25V11.75L22 12L18 11L22 10ZM18 15.25L17 15L13 16L17 17L18 16.75V15.25ZM12 19L13 19.25V20.75L12 21L8 20L12 19Z"/>
<path opacity="0.4" d="M31 7L27 8V35L31 34V7Z"/>
</symbol>
<symbol id="chart-column-3d-stack" viewBox="0 0 40 40">
<path opacity="0.2" d="M27 7L31 6V16L27 17V7Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M23 6L27 5L31 6L27 7L23 6ZM31 16L27 17V34L31 33V16ZM26 20H23V32H26V20ZM18 10L22 9L23 9.25V10.75L22 11L18 10ZM17 14L13 15L17 16L18 15.75V14.25L17 14ZM8 19L12 18L13 18.25V19.75L12 20L8 19Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M27 7L23 6V16L27 17V7ZM22 11L18 10V20L22 21V11ZM12 20L8 19V23L12 24V20ZM13 15L17 16V23L13 22V15Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 16L27 17V34L23 33V16ZM22 21L18 20V31L22 32V21ZM13 22L17 23V30L13 29V22ZM8 23L12 24V28L8 27V23Z" fill="#444444"/>
<path opacity="0.2" d="M27 7L31 6V16L27 17V7Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M23 6L27 5L31 6L27 7L23 6ZM31 16L27 17V34L31 33V16ZM26 20H23V32H26V20ZM18 10L22 9L23 9.25V10.75L22 11L18 10ZM17 14L13 15L17 16L18 15.75V14.25L17 14ZM8 19L12 18L13 18.25V19.75L12 20L8 19Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M27 7L23 6V16L27 17V7ZM22 11L18 10V20L22 21V11ZM12 20L8 19V23L12 24V20ZM13 15L17 16V23L13 22V15Z"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23 16L27 17V34L23 33V16ZM22 21L18 20V31L22 32V21ZM13 22L17 23V30L13 29V22ZM8 23L12 24V28L8 27V23Z"/>
</symbol>
<symbol id="chart-column-3d-pstack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M24 35L28 36V17L24 16V35ZM23 34L19 33V18L23 19V34ZM14 31L18 32V21L14 20V31ZM9 29L13 30V23L9 22V29Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M13 6L9 5V22L13 23V6ZM14 7L18 8V21L14 20V7ZM23 10L19 9V18L23 19V10ZM28 12L24 11V16L28 17V12Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M9 5L13 6L17 5L13 4L9 5ZM18 8L14 7L18 6L22 7L18 8ZM19 9L23 10L27 9L23 8L19 9ZM28 12L24 11L28 10L32 11L28 12ZM28 17L32 16V35L28 36V17Z" fill="#444444"/>
<path opacity="0.2" d="M28 12L32 11V16L28 17V12Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24 35L28 36V17L24 16V35ZM23 34L19 33V18L23 19V34ZM14 31L18 32V21L14 20V31ZM9 29L13 30V23L9 22V29Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M13 6L9 5V22L13 23V6ZM14 7L18 8V21L14 20V7ZM23 10L19 9V18L23 19V10ZM28 12L24 11V16L28 17V12Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M9 5L13 6L17 5L13 4L9 5ZM18 8L14 7L18 6L22 7L18 8ZM19 9L23 10L27 9L23 8L19 9ZM28 12L24 11L28 10L32 11L28 12ZM28 17L32 16V35L28 36V17Z"/>
<path opacity="0.2" d="M28 12L32 11V16L28 17V12Z"/>
</symbol>
<symbol id="chart-column-3d-normal-per" viewBox="0 0 40 40">
<path d="M24.0002 6L28.0002 7V31L25 30V18V17.5V17L24.0002 16.7617V6Z" fill="#444444"/>
<path d="M19 10L23 11V16.5L21 16L19 16.5V10Z" fill="#444444"/>
<path d="M14 14L18 15V16.7617L17 17V20.25L16 20L14 20.5V14Z" fill="#444444"/>
<path opacity="0.2" d="M21 18L25 17V35L21 36V18Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M32 6L28 7V31L32 30V6ZM17.0002 17L21.0002 18V36L17.0002 35V17ZM12.0002 21L16.0002 22V34L12.0002 33V21ZM11 26L7 25V31L11 32V26Z" fill="#444444"/>
<path id="lighter max_2" opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M23.9999 6L27.9999 5L31.9999 6L27.9999 7L23.9999 6ZM19.0001 10L23.0001 9L27.0001 10L23.0001 11L19.0001 10ZM18 13L14 14L18 15L22 14L18 13ZM25 17L21 16L17 17L21 18L25 17ZM16 20L17 20.25V21.75L16 22L12 21L16 20ZM11 24L12 24.25V25.75L11 26L7 25L11 24Z" fill="#444444"/>
<path d="M24.0002 6L28.0002 7V31L25 30V18V17.5V17L24.0002 16.7617V6Z"/>
<path d="M19 10L23 11V16.5L21 16L19 16.5V10Z"/>
<path d="M14 14L18 15V16.7617L17 17V20.25L16 20L14 20.5V14Z"/>
<path opacity="0.2" d="M21 18L25 17V35L21 36V18Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M32 6L28 7V31L32 30V6ZM17.0002 17L21.0002 18V36L17.0002 35V17ZM12.0002 21L16.0002 22V34L12.0002 33V21ZM11 26L7 25V31L11 32V26Z"/>
<path id="lighter max_2" opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M23.9999 6L27.9999 5L31.9999 6L27.9999 7L23.9999 6ZM19.0001 10L23.0001 9L27.0001 10L23.0001 11L19.0001 10ZM18 13L14 14L18 15L22 14L18 13ZM25 17L21 16L17 17L21 18L25 17ZM16 20L17 20.25V21.75L16 22L12 21L16 20ZM11 24L12 24.25V25.75L11 26L7 25L11 24Z"/>
</symbol>
<symbol id="chart-line-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M26 16.5L28.5 14L24.5 10L19.5 15L22 17.5L24.5 15L26 16.5ZM6 28.5L8.5 31L19.5 20L17 17.5L6 28.5ZM34 19.5L31.5 22L28.5 19L31 16.5L34 19.5Z" fill="#444444"/>
<path opacity="0.4" d="M6 20.5L15.5 11L23.5 19L31.5 11L34 13.5L23.5 24L15.5 16L8.5 23L6 20.5Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M26 16.5L28.5 14L24.5 10L19.5 15L22 17.5L24.5 15L26 16.5ZM6 28.5L8.5 31L19.5 20L17 17.5L6 28.5ZM34 19.5L31.5 22L28.5 19L31 16.5L34 19.5Z"/>
<path opacity="0.4" d="M6 20.5L15.5 11L23.5 19L31.5 11L34 13.5L23.5 24L15.5 16L8.5 23L6 20.5Z"/>
</symbol>
<symbol id="chart-line-stack" viewBox="0 0 40 40">
<path d="M6 30.5L17.5 19L22.5 24L31.5 15L34 17.5L22.5 29L17.5 24L8.5 33L6 30.5Z" fill="#444444"/>
<path opacity="0.4" d="M6 22.5L17.5 11L22.5 16L31.5 7L34 9.5L22.5 21L17.5 16L8.5 25L6 22.5Z" fill="#444444"/>
<path d="M6 30.5L17.5 19L22.5 24L31.5 15L34 17.5L22.5 29L17.5 24L8.5 33L6 30.5Z"/>
<path opacity="0.4" d="M6 22.5L17.5 11L22.5 16L31.5 7L34 9.5L22.5 21L17.5 16L8.5 25L6 22.5Z"/>
</symbol>
<symbol id="chart-line-pstack" viewBox="0 0 40 40">
<path d="M6 29.5L17.5 18L22.5 23L31.5 14L34 16.5L22.5 28L17.5 23L8.5 32L6 29.5Z" fill="#444444"/>
<rect opacity="0.4" x="6" y="8" width="28" height="4" fill="#444444"/>
<path d="M6 29.5L17.5 18L22.5 23L31.5 14L34 16.5L22.5 28L17.5 23L8.5 32L6 29.5Z"/>
<rect opacity="0.4" x="6" y="8" width="28" height="4"/>
</symbol>
<symbol id="chart-line-3d" viewBox="0 0 40 40">
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M17.5 18L5.5 10H9.5L22.5 18H17.5ZM20.5 33L12.5 21H16.5L25.5 33H20.5Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.5 9H30.5L17.5 18H22.5L38.5 9ZM2.5 28L12.5 21L13.62 22.68L4.5 28H2.5ZM38.5 22H30.5L20.5 33H25.5L38.5 22Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M17.5 18L5.5 10H9.5L22.5 18H17.5ZM20.5 33L12.5 21H16.5L25.5 33H20.5Z"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.5 9H30.5L17.5 18H22.5L38.5 9ZM2.5 28L12.5 21L13.62 22.68L4.5 28H2.5ZM38.5 22H30.5L20.5 33H25.5L38.5 22Z"/>
</symbol>
<symbol id="chart-pie-normal" viewBox="0 0 40 40">
<path d="M5 20C5 22.9667 5.87973 25.8668 7.52796 28.3336C9.17618 30.8003 11.5189 32.7229 14.2597 33.8582C17.0006 34.9935 20.0166 35.2906 22.9264 34.7118C25.8361 34.133 28.5088 32.7044 30.6066 30.6066C32.7044 28.5088 34.133 25.8361 34.7118 22.9264C35.2906 20.0166 34.9935 17.0006 33.8582 14.2597C32.7229 11.5189 30.8003 9.17618 28.3336 7.52796C25.8668 5.87973 22.9667 5 20 5L20 20L5 20Z" fill="#444444"/>
<path opacity="0.4" d="M20 5C18.0302 5 16.0796 5.38799 14.2597 6.14181C12.4399 6.89563 10.7863 8.00052 9.3934 9.3934C8.00052 10.7863 6.89563 12.4399 6.14181 14.2598C5.38799 16.0796 5 18.0302 5 20L20 20V5Z" fill="#444444"/>
<path d="M5 20C5 22.9667 5.87973 25.8668 7.52796 28.3336C9.17618 30.8003 11.5189 32.7229 14.2597 33.8582C17.0006 34.9935 20.0166 35.2906 22.9264 34.7118C25.8361 34.133 28.5088 32.7044 30.6066 30.6066C32.7044 28.5088 34.133 25.8361 34.7118 22.9264C35.2906 20.0166 34.9935 17.0006 33.8582 14.2597C32.7229 11.5189 30.8003 9.17618 28.3336 7.52796C25.8668 5.87973 22.9667 5 20 5L20 20L5 20Z"/>
<path opacity="0.4" d="M20 5C18.0302 5 16.0796 5.38799 14.2597 6.14181C12.4399 6.89563 10.7863 8.00052 9.3934 9.3934C8.00052 10.7863 6.89563 12.4399 6.14181 14.2598C5.38799 16.0796 5 18.0302 5 20L20 20V5Z"/>
</symbol>
<symbol id="chart-pie-doughnut" viewBox="0 0 40 40">
<path d="M5 20C5 22.9667 5.87973 25.8668 7.52796 28.3336C9.17618 30.8003 11.5189 32.7229 14.2597 33.8582C17.0006 34.9935 20.0166 35.2906 22.9264 34.7118C25.8361 34.133 28.5088 32.7044 30.6066 30.6066C32.7044 28.5088 34.133 25.8361 34.7118 22.9264C35.2906 20.0166 34.9935 17.0006 33.8582 14.2597C32.7229 11.5189 30.8003 9.17618 28.3336 7.52796C25.8668 5.87973 22.9667 5 20 5L20 11C21.78 11 23.5201 11.5278 25.0001 12.5168C26.4802 13.5057 27.6337 14.9113 28.3149 16.5558C28.9961 18.2004 29.1743 20.01 28.8271 21.7558C28.4798 23.5016 27.6226 25.1053 26.364 26.364C25.1053 27.6226 23.5016 28.4798 21.7558 28.8271C20.01 29.1743 18.2004 28.9961 16.5558 28.3149C14.9113 27.6337 13.5057 26.4802 12.5168 25.0001C11.5278 23.5201 11 21.78 11 20L5 20Z" fill="#444444"/>
<path opacity="0.4" d="M20 5C18.0302 5 16.0796 5.38799 14.2597 6.14181C12.4399 6.89563 10.7863 8.00052 9.3934 9.3934C8.00052 10.7863 6.89563 12.4399 6.14181 14.2598C5.38799 16.0796 5 18.0302 5 20L11 20C11 18.8181 11.2328 17.6478 11.6851 16.5559C12.1374 15.4639 12.8003 14.4718 13.636 13.636C14.4718 12.8003 15.4639 12.1374 16.5558 11.6851C17.6478 11.2328 18.8181 11 20 11V5Z" fill="#444444"/>
<path d="M5 20C5 22.9667 5.87973 25.8668 7.52796 28.3336C9.17618 30.8003 11.5189 32.7229 14.2597 33.8582C17.0006 34.9935 20.0166 35.2906 22.9264 34.7118C25.8361 34.133 28.5088 32.7044 30.6066 30.6066C32.7044 28.5088 34.133 25.8361 34.7118 22.9264C35.2906 20.0166 34.9935 17.0006 33.8582 14.2597C32.7229 11.5189 30.8003 9.17618 28.3336 7.52796C25.8668 5.87973 22.9667 5 20 5L20 11C21.78 11 23.5201 11.5278 25.0001 12.5168C26.4802 13.5057 27.6337 14.9113 28.3149 16.5558C28.9961 18.2004 29.1743 20.01 28.8271 21.7558C28.4798 23.5016 27.6226 25.1053 26.364 26.364C25.1053 27.6226 23.5016 28.4798 21.7558 28.8271C20.01 29.1743 18.2004 28.9961 16.5558 28.3149C14.9113 27.6337 13.5057 26.4802 12.5168 25.0001C11.5278 23.5201 11 21.78 11 20L5 20Z"/>
<path opacity="0.4" d="M20 5C18.0302 5 16.0796 5.38799 14.2597 6.14181C12.4399 6.89563 10.7863 8.00052 9.3934 9.3934C8.00052 10.7863 6.89563 12.4399 6.14181 14.2598C5.38799 16.0796 5 18.0302 5 20L11 20C11 18.8181 11.2328 17.6478 11.6851 16.5559C12.1374 15.4639 12.8003 14.4718 13.636 13.636C14.4718 12.8003 15.4639 12.1374 16.5558 11.6851C17.6478 11.2328 18.8181 11 20 11V5Z"/>
</symbol>
<symbol id="chart-pie-3d-normal" viewBox="0 0 40 40">
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M31.3137 9.22183C34.3143 11.2847 36 14.0826 36 17L36 22C36 24.9174 34.3143 27.7153 31.3137 29.7782C28.3131 31.8411 24.2435 33 20 33C15.7565 33 11.6869 31.8411 8.68629 29.7782C5.68571 27.7153 4 24.9174 4 22V17C4 14.0826 5.68571 11.2847 8.68629 9.22182C11.6869 7.15892 15.7565 6 20 6C24.2435 6 28.3131 7.15893 31.3137 9.22183Z" fill="#444444"/>
<path d="M4 17C4 19.1756 4.93838 21.3023 6.69649 23.1113C8.45459 24.9202 10.9534 26.3301 13.8771 27.1627C16.8007 27.9952 20.0177 28.2131 23.1214 27.7886C26.2251 27.3642 29.0761 26.3166 31.3137 24.7782C33.5513 23.2398 35.0752 21.2798 35.6926 19.146C36.3099 17.0122 35.9931 14.8005 34.7821 12.7905C33.5711 10.7805 31.5203 9.06253 28.8891 7.85383C26.2579 6.64514 23.1645 6 20 6L20 17L4 17Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M31.3137 9.22183C34.3143 11.2847 36 14.0826 36 17L36 22C36 24.9174 34.3143 27.7153 31.3137 29.7782C28.3131 31.8411 24.2435 33 20 33C15.7565 33 11.6869 31.8411 8.68629 29.7782C5.68571 27.7153 4 24.9174 4 22V17C4 14.0826 5.68571 11.2847 8.68629 9.22182C11.6869 7.15892 15.7565 6 20 6C24.2435 6 28.3131 7.15893 31.3137 9.22183Z"/>
<path d="M4 17C4 19.1756 4.93838 21.3023 6.69649 23.1113C8.45459 24.9202 10.9534 26.3301 13.8771 27.1627C16.8007 27.9952 20.0177 28.2131 23.1214 27.7886C26.2251 27.3642 29.0761 26.3166 31.3137 24.7782C33.5513 23.2398 35.0752 21.2798 35.6926 19.146C36.3099 17.0122 35.9931 14.8005 34.7821 12.7905C33.5711 10.7805 31.5203 9.06253 28.8891 7.85383C26.2579 6.64514 23.1645 6 20 6L20 17L4 17Z"/>
</symbol>
<symbol id="chart-bar-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15 6H6V12H15V6ZM6 27V33H34V27H6ZM6 13H20V19H6V13ZM26 20H6V26H26V20Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15 6H6V12H15V6ZM6 27V33H34V27H6ZM6 13H20V19H6V13ZM26 20H6V26H26V20Z"/>
</symbol>
<symbol id="chart-bar-stack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 6H6V12H11V6ZM14 13H6V19H14V13ZM6 20H18V26H6V20ZM23 27H6V33H23V27Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M15 6H11V12H15V6ZM20 13H14V19H20V13ZM18 20H26V26H18V20ZM34 27H23V33H34V27Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 6H6V12H11V6ZM14 13H6V19H14V13ZM6 20H18V26H6V20ZM23 27H6V33H23V27Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M15 6H11V12H15V6ZM20 13H14V19H20V13ZM18 20H26V26H18V20ZM34 27H23V33H34V27Z"/>
</symbol>
<symbol id="chart-bar-pstack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 6H6V12H20V6ZM22 13H6V19H22V13ZM6 20H24V26H6V20ZM26 27H6V33H26V27Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M34 6H20V12H34V6ZM34 13H22V19H34V13ZM24 20H34V26H24V20ZM34 27H26V33H34V27Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 6H6V12H20V6ZM22 13H6V19H22V13ZM6 20H24V26H6V20ZM26 27H6V33H26V27Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M34 6H20V12H34V6ZM34 13H22V19H34V13ZM24 20H34V26H24V20ZM34 27H26V33H34V27Z"/>
</symbol>
<symbol id="chart-bar-3d-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 9L8 5V10L20 14V9ZM8 11L23 16V21L8 16V11ZM26 23L8 17L8 22L26 28V23ZM29 30L8 23V28L29 35L29 30Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M24 8L20 9V14L24 13V8ZM23 16L27 15V20L23 21V16ZM30 22L26 23V28L30 27V22ZM33 29L29 30V35L33 34V29Z" fill="#444444"/>
<path opacity="0.4" d="M12 4L24 8L20 9L8 5L12 4Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 9L8 5V10L20 14V9ZM8 11L23 16V21L8 16V11ZM26 23L8 17L8 22L26 28V23ZM29 30L8 23V28L29 35L29 30Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M24 8L20 9V14L24 13V8ZM23 16L27 15V20L23 21V16ZM30 22L26 23V28L30 27V22ZM33 29L29 30V35L33 34V29Z"/>
<path opacity="0.4" d="M12 4L24 8L20 9L8 5L12 4Z"/>
</symbol>
<symbol id="chart-bar-3d-stack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 6L8 5V10L11 11V6ZM8 16V11L14 13V18L8 16ZM17 20L8 17L8 22L17 25V20ZM8 23V28L20 32V27L8 23Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M15 5L12 4L8 5L11 6L15 5ZM20 9L24 8V13L20 14V9ZM27 15L23 16V21L27 20V15ZM26 23L30 22V27L26 28V23ZM29 30L33 29V34L29 35L29 30Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M20 9L11 6V11L20 14V9ZM14 13L23 16V21L14 18V13ZM26 23L17 20V25L26 28V23ZM29 30L20 27V32L29 35V30Z" fill="#444444"/>
<path opacity="0.2" d="M15 5L24 8L20 9L11 6L15 5Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 6L8 5V10L11 11V6ZM8 16V11L14 13V18L8 16ZM17 20L8 17L8 22L17 25V20ZM8 23V28L20 32V27L8 23Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M15 5L12 4L8 5L11 6L15 5ZM20 9L24 8V13L20 14V9ZM27 15L23 16V21L27 20V15ZM26 23L30 22V27L26 28V23ZM29 30L33 29V34L29 35L29 30Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M20 9L11 6V11L20 14V9ZM14 13L23 16V21L14 18V13ZM26 23L17 20V25L26 28V23ZM29 30L20 27V32L29 35V30Z"/>
<path opacity="0.2" d="M15 5L24 8L20 9L11 6L15 5Z"/>
</symbol>
<symbol id="chart-bar-3d-pstack" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 7L8 5V10L14 12V7ZM8 11L17 14V19L8 16V11ZM20 26V21L8 17V22L20 26ZM23 28L8 23V28L23 33V28Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M29 12L14 7V12L29 17V12ZM17 14L29 18V23L17 19V14ZM29 24L20 21V26L29 29V24ZM29 30L23 28V33L29 35V30Z" fill="#444444"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M18 6L12 4L8 5L14 7L18 6ZM29 12L33 11V16L29 17V12ZM33 17L29 18V23L33 22V17ZM29 24L33 23V28L29 29V24ZM29 30L33 29V34L29 35V30Z" fill="#444444"/>
<path opacity="0.2" d="M18 6L33 11L29 12L14 7L18 6Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 7L8 5V10L14 12V7ZM8 11L17 14V19L8 16V11ZM20 26V21L8 17V22L20 26ZM23 28L8 23V28L23 33V28Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M29 12L14 7V12L29 17V12ZM17 14L29 18V23L17 19V14ZM29 24L20 21V26L29 29V24ZM29 30L23 28V33L29 35V30Z"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M18 6L12 4L8 5L14 7L18 6ZM29 12L33 11V16L29 17V12ZM33 17L29 18V23L33 22V17ZM29 24L33 23V28L29 29V24ZM29 30L33 29V34L29 35V30Z"/>
<path opacity="0.2" d="M18 6L33 11L29 12L14 7L18 6Z"/>
</symbol>
<symbol id="chart-area-normal" viewBox="0 0 40 40">
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z" fill="#444444"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M19.5 29L15.5 24L6 34L15.5 15L20.5 22H26.2667L19.5 29Z" fill="#444444"/>
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z"/>
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M19.5 29L15.5 24L6 34L15.5 15L20.5 22H26.2667L19.5 29Z"/>
</symbol>
<symbol id="chart-area-stack" viewBox="0 0 40 40">
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z" fill="#444444"/>
<path opacity="0.4" d="M15.5 17L19.5 22L34 7V14L19.5 29L15.5 24L6 34V27L15.5 17Z" fill="#444444"/>
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z"/>
<path opacity="0.4" d="M15.5 17L19.5 22L34 7V14L19.5 29L15.5 24L6 34V27L15.5 17Z"/>
</symbol>
<symbol id="chart-area-pstack" viewBox="0 0 40 40">
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z" fill="#444444"/>
<path opacity="0.4" d="M6 6H34V14L19.5 29L15.5 24L6 34V6Z" fill="#444444"/>
<path d="M15.5 24L19.5 29L34 14V34H6L15.5 24Z"/>
<path opacity="0.4" d="M6 6H34V14L19.5 29L15.5 24L6 34V6Z"/>
</symbol>
<symbol id="chart-point-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 7H7V20.5V34H34V33H8V7ZM11.5 30C12.3284 30 13 29.3284 13 28.5C13 27.6716 12.3284 27 11.5 27C10.6716 27 10 27.6716 10 28.5C10 29.3284 10.6716 30 11.5 30ZM16 22.5C16 23.3284 15.3284 24 14.5 24C13.6716 24 13 23.3284 13 22.5C13 21.6716 13.6716 21 14.5 21C15.3284 21 16 21.6716 16 22.5ZM20.5 21C21.3284 21 22 20.3284 22 19.5C22 18.6716 21.3284 18 20.5 18C19.6716 18 19 18.6716 19 19.5C19 20.3284 19.6716 21 20.5 21ZM28 19.5C28 20.3284 27.3284 21 26.5 21C25.6716 21 25 20.3284 25 19.5C25 18.6716 25.6716 18 26.5 18C27.3284 18 28 18.6716 28 19.5ZM26.5 27C27.3284 27 28 26.3284 28 25.5C28 24.6716 27.3284 24 26.5 24C25.6716 24 25 24.6716 25 25.5C25 26.3284 25.6716 27 26.5 27ZM34 19.5C34 20.3284 33.3284 21 32.5 21C31.6716 21 31 20.3284 31 19.5C31 18.6716 31.6716 18 32.5 18C33.3284 18 34 18.6716 34 19.5ZM29.5 15C30.3284 15 31 14.3284 31 13.5C31 12.6716 30.3284 12 29.5 12C28.6716 12 28 12.6716 28 13.5C28 14.3284 28.6716 15 29.5 15Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 7H7V20.5V34H34V33H8V7ZM11.5 30C12.3284 30 13 29.3284 13 28.5C13 27.6716 12.3284 27 11.5 27C10.6716 27 10 27.6716 10 28.5C10 29.3284 10.6716 30 11.5 30ZM16 22.5C16 23.3284 15.3284 24 14.5 24C13.6716 24 13 23.3284 13 22.5C13 21.6716 13.6716 21 14.5 21C15.3284 21 16 21.6716 16 22.5ZM20.5 21C21.3284 21 22 20.3284 22 19.5C22 18.6716 21.3284 18 20.5 18C19.6716 18 19 18.6716 19 19.5C19 20.3284 19.6716 21 20.5 21ZM28 19.5C28 20.3284 27.3284 21 26.5 21C25.6716 21 25 20.3284 25 19.5C25 18.6716 25.6716 18 26.5 18C27.3284 18 28 18.6716 28 19.5ZM26.5 27C27.3284 27 28 26.3284 28 25.5C28 24.6716 27.3284 24 26.5 24C25.6716 24 25 24.6716 25 25.5C25 26.3284 25.6716 27 26.5 27ZM34 19.5C34 20.3284 33.3284 21 32.5 21C31.6716 21 31 20.3284 31 19.5C31 18.6716 31.6716 18 32.5 18C33.3284 18 34 18.6716 34 19.5ZM29.5 15C30.3284 15 31 14.3284 31 13.5C31 12.6716 30.3284 12 29.5 12C28.6716 12 28 12.6716 28 13.5C28 14.3284 28.6716 15 29.5 15Z"/>
</symbol>
<symbol id="chart-stock-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 7H7V20.5V34H34V33H8V7ZM23 12H22V16H20V20H22V24H23V20H25V16H23V12ZM13 27H11V20H13V16H14V20H16V27H14V31H13V27ZM31 11H29V18H31V22H32V18H34V11H32V7H31V11Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 7H7V20.5V34H34V33H8V7ZM23 12H22V16H20V20H22V24H23V20H25V16H23V12ZM13 27H11V20H13V16H14V20H16V27H14V31H13V27ZM31 11H29V18H31V22H32V18H34V11H32V7H31V11Z"/>
</symbol>
<symbol id="chart-combo-bar-line" viewBox="0 0 40 40">
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M20 10H26V34H20V10ZM19 14H13V34H19V14ZM12 26H6V34H12V26ZM33 21H27V34H33V21Z" fill="#444444"/>
<path d="M5 26.5L15.5 16L23.5 24L32.5 15L33.5 16L23.5 26L15.5 18L6 27.5L5 26.5Z" fill="#444444"/>
<path d="M5 5H6V34H35V35H5V20.5V5Z" fill="#444444"/>
</symbol>
<symbol id="chart-combo-bar-line-sec" viewBox="0 0 40 40">
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M20 10H26V34H20V10ZM19 14H13V34H19V14ZM12 26H6V34H12V26ZM33 21H27V34H33V21Z" fill="#444444"/>
<path d="M5 26.5L15.5 16L23.5 24L32.5 15L33.5 16L23.5 26L15.5 18L6 27.5L5 26.5Z" fill="#444444"/>
<path d="M5 5H6V34H35V35H5V20.5V5Z" fill="#444444"/>
<rect x="34" y="32" width="1" height="1" fill="#444444"/>
<rect x="34" y="30" width="1" height="1" fill="#444444"/>
<rect x="34" y="28" width="1" height="1" fill="#444444"/>
<rect x="34" y="26" width="1" height="1" fill="#444444"/>
<rect x="34" y="24" width="1" height="1" fill="#444444"/>
<rect x="34" y="22" width="1" height="1" fill="#444444"/>
<rect x="34" y="20" width="1" height="1" fill="#444444"/>
<rect x="34" y="18" width="1" height="1" fill="#444444"/>
<rect x="34" y="16" width="1" height="1" fill="#444444"/>
<rect x="34" y="14" width="1" height="1" fill="#444444"/>
<rect x="34" y="12" width="1" height="1" fill="#444444"/>
<rect x="34" y="10" width="1" height="1" fill="#444444"/>
<rect x="34" y="8" width="1" height="1" fill="#444444"/>
<rect x="34" y="6" width="1" height="1" fill="#444444"/>
</symbol>
<symbol id="chart-combo-area-bar" viewBox="0 0 40 40">
<path d="M5 5H6V34H35V35H5V20.5V5Z" fill="#444444"/>
<path opacity="0.4" d="M6 20.5L15.5 11L23.5 19L33 9.5V34H6V20.5Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M19 19H13V34H19V19ZM12 27H6V34H12V27ZM20 23H26V34H20V23ZM33 26H27V34H33V26Z" fill="#444444"/>
</symbol>
<symbol id="chart-combo-custom" viewBox="0 0 40 40">
<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M26 10H20V34H24V33.5L26 31.5V10ZM33 24.5V21H27V30.5L33 24.5ZM13 14H19V34H13V14ZM6 26H12V34H6V26Z" fill="#444444"/>
<path d="M5 26.5L15.5 16L23.5 24L32.5 15L33.5 16L23.5 26L15.5 18L6 27.5L5 26.5Z" fill="#444444"/>
<path d="M5 5H6V34H24V35H5V20.5V5Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M34 25L37 28L39 26V25L37 23H36L34 25ZM25 37V34L33 26L36 29L28 37H25Z" fill="#444444"/>
</symbol>
<symbol id="chart-spark-line" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.86358 21.8725L15.7636 27.7725L20.7636 16.7725L25.682 21.691L31.6394 5.65181L33.5143 6.34819L26.4717 25.309L21.3901 20.2275L16.3901 31.2275L10.2901 25.1275L5.44232 33.5008L3.71148 32.4987L9.86358 21.8725Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.86358 21.8725L15.7636 27.7725L20.7636 16.7725L25.682 21.691L31.6394 5.65181L33.5143 6.34819L26.4717 25.309L21.3901 20.2275L16.3901 31.2275L10.2901 25.1275L5.44232 33.5008L3.71148 32.4987L9.86358 21.8725Z"/>
</symbol>
<defs>
<clipPath id="clip0">
@ -118,40 +153,40 @@
</clipPath>
</defs>
<symbol id="chart-spark-column" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M26 6H20V34H26V6ZM13 14H19V34H13V14ZM33 18H27V34H33V18ZM12 20H6V34H12V20Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M26 6H20V34H26V6ZM13 14H19V34H13V14ZM33 18H27V34H33V18ZM12 20H6V34H12V20Z"/>
</symbol>
<symbol id="chart-spark-win" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 7H12V20H6V7ZM13 7H19V20H13V7ZM33 7H27V20H33V7Z" fill="#444444"/>
<rect opacity="0.4" x="20" y="20" width="6" height="13" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 7H12V20H6V7ZM13 7H19V20H13V7ZM33 7H27V20H33V7Z"/>
<rect opacity="0.4" x="20" y="20" width="6" height="13"/>
</symbol>
<symbol id="chart-surface-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 6V15.0117L6 28.0117H8.29308L4.64648 31.6581L5.35357 32.3652L9.70733 28.0117H16.5L27 34.0117L30.7242 25.0116L36 25.0116L36 24.0116L31.138 24.0116L33 19.5117L22.5 8.01172L13 14.3451V6H12ZM17.837 24.3331L19.1385 18.5263L23.5873 23.1301C22.7174 23.5372 21.8181 23.8456 20.906 24.0206C19.7223 24.2476 18.7595 24.3698 17.837 24.3331ZM16.617 25.2036L16.2117 27.0117H7.56291L10.2783 21.1283C10.5037 21.3862 10.7771 21.6877 11.0846 22.0044C11.9473 22.8927 13.1287 23.9536 14.2985 24.4692C15.1229 24.8325 15.8764 25.0699 16.617 25.2036ZM16.8359 24.2269C16.1677 24.1101 15.4773 23.8959 14.7018 23.5541C13.72 23.1214 12.6514 22.1823 11.802 21.3077C11.4314 20.9262 11.1121 20.5669 10.8714 20.2852L18.1822 18.2208L16.8359 24.2269ZM17.615 25.3232C17.6295 25.3241 17.644 25.3249 17.6585 25.3257C18.7407 25.3857 19.8305 25.2451 21.0943 25.0027C22.1885 24.7928 23.2713 24.4012 24.3136 23.8817L28.3718 28.0812L26.5102 32.5801L17.1831 27.2503L17.615 25.3232ZM25.2274 23.3883L28.7887 27.0736L31.833 19.7166L30.7961 18.581C30.6237 18.79 30.4188 19.031 30.1871 19.2902C28.8262 20.8126 27.1112 22.2931 25.2274 23.3883ZM30.1147 17.8347L22.7292 9.74581L19.4441 17.4034L24.5166 22.6527C26.3887 21.6052 28.0891 20.1367 29.4415 18.6238C29.7055 18.3285 29.933 18.058 30.1147 17.8347ZM21.6168 9.80239L18.4881 17.0954L11.1883 19.1566L12.7896 15.6871L21.6168 9.80239Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 6V15.0117L6 28.0117H8.29308L4.64648 31.6581L5.35357 32.3652L9.70733 28.0117H16.5L27 34.0117L30.7242 25.0116L36 25.0116L36 24.0116L31.138 24.0116L33 19.5117L22.5 8.01172L13 14.3451V6H12ZM17.837 24.3331L19.1385 18.5263L23.5873 23.1301C22.7174 23.5372 21.8181 23.8456 20.906 24.0206C19.7223 24.2476 18.7595 24.3698 17.837 24.3331ZM16.617 25.2036L16.2117 27.0117H7.56291L10.2783 21.1283C10.5037 21.3862 10.7771 21.6877 11.0846 22.0044C11.9473 22.8927 13.1287 23.9536 14.2985 24.4692C15.1229 24.8325 15.8764 25.0699 16.617 25.2036ZM16.8359 24.2269C16.1677 24.1101 15.4773 23.8959 14.7018 23.5541C13.72 23.1214 12.6514 22.1823 11.802 21.3077C11.4314 20.9262 11.1121 20.5669 10.8714 20.2852L18.1822 18.2208L16.8359 24.2269ZM17.615 25.3232C17.6295 25.3241 17.644 25.3249 17.6585 25.3257C18.7407 25.3857 19.8305 25.2451 21.0943 25.0027C22.1885 24.7928 23.2713 24.4012 24.3136 23.8817L28.3718 28.0812L26.5102 32.5801L17.1831 27.2503L17.615 25.3232ZM25.2274 23.3883L28.7887 27.0736L31.833 19.7166L30.7961 18.581C30.6237 18.79 30.4188 19.031 30.1871 19.2902C28.8262 20.8126 27.1112 22.2931 25.2274 23.3883ZM30.1147 17.8347L22.7292 9.74581L19.4441 17.4034L24.5166 22.6527C26.3887 21.6052 28.0891 20.1367 29.4415 18.6238C29.7055 18.3285 29.933 18.058 30.1147 17.8347ZM21.6168 9.80239L18.4881 17.0954L11.1883 19.1566L12.7896 15.6871L21.6168 9.80239Z"/>
<g opacity="0.4">
<path d="M19.1385 18.5263L17.837 24.3331C18.7595 24.3698 19.7223 24.2476 20.906 24.0206C21.8181 23.8456 22.7174 23.5372 23.5873 23.1301L19.1385 18.5263Z" fill="#444444"/>
<path d="M14.7018 23.5541C15.4773 23.8959 16.1677 24.1101 16.8359 24.2269L18.1822 18.2208L10.8714 20.2852C11.1121 20.5669 11.4314 20.9262 11.802 21.3077C12.6514 22.1823 13.72 23.1214 14.7018 23.5541Z" fill="#444444"/>
<path d="M22.7292 9.74581L30.1147 17.8347C29.933 18.058 29.7055 18.3285 29.4415 18.6238C28.0891 20.1367 26.3887 21.6052 24.5166 22.6527L19.4441 17.4034L22.7292 9.74581Z" fill="#444444"/>
<path d="M18.4881 17.0954L21.6168 9.80239L12.7896 15.6871L11.1883 19.1566L18.4881 17.0954Z" fill="#444444"/>
<path d="M19.1385 18.5263L17.837 24.3331C18.7595 24.3698 19.7223 24.2476 20.906 24.0206C21.8181 23.8456 22.7174 23.5372 23.5873 23.1301L19.1385 18.5263Z"/>
<path d="M14.7018 23.5541C15.4773 23.8959 16.1677 24.1101 16.8359 24.2269L18.1822 18.2208L10.8714 20.2852C11.1121 20.5669 11.4314 20.9262 11.802 21.3077C12.6514 22.1823 13.72 23.1214 14.7018 23.5541Z"/>
<path d="M22.7292 9.74581L30.1147 17.8347C29.933 18.058 29.7055 18.3285 29.4415 18.6238C28.0891 20.1367 26.3887 21.6052 24.5166 22.6527L19.4441 17.4034L22.7292 9.74581Z"/>
<path d="M18.4881 17.0954L21.6168 9.80239L12.7896 15.6871L11.1883 19.1566L18.4881 17.0954Z"/>
</g>
</symbol>
<symbol id="chart-surface-wireframe" viewBox="0 0 40 40">
<g opacity="0.4">
<path d="M24.4393 24.0117H17.909L17.6848 25.0117H25.4056L24.4393 24.0117Z" fill="#444444"/>
<path d="M29.6419 25.0117H26.7962L25.8299 24.0117H30.0557L29.6419 25.0117Z" fill="#444444"/>
<path d="M16.66 25.0117L16.8842 24.0117H13.0004L13.0005 19.684L12.0005 19.9664L12.0004 24.3042L9.29291 27.0117H10.7071L12.7071 25.0117H16.66Z" fill="#444444"/>
<path d="M12.0005 18.9273L13.0005 18.6449L13.0005 15.5466L12.7896 15.6871L12.0005 17.397L12.0005 18.9273Z" fill="#444444"/>
<path d="M24.4393 24.0117H17.909L17.6848 25.0117H25.4056L24.4393 24.0117Z"/>
<path d="M29.6419 25.0117H26.7962L25.8299 24.0117H30.0557L29.6419 25.0117Z"/>
<path d="M16.66 25.0117L16.8842 24.0117H13.0004L13.0005 19.684L12.0005 19.9664L12.0004 24.3042L9.29291 27.0117H10.7071L12.7071 25.0117H16.66Z"/>
<path d="M12.0005 18.9273L13.0005 18.6449L13.0005 15.5466L12.7896 15.6871L12.0005 17.397L12.0005 18.9273Z"/>
</g>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 15.0117V6H13V14.3451L22.5 8.01172L33 19.5117L31.138 24.0116L36 24.0116L36 25.0116L30.7242 25.0116L27 34.0117L16.5 28.0117H9.70733L5.35357 32.3652L4.64648 31.6581L8.29308 28.0117H6L12 15.0117ZM19.1385 18.5263L17.1831 27.2503L26.5102 32.5801L28.3718 28.0812L19.1385 18.5263ZM18.4881 17.0954L21.6168 9.80239L12.7896 15.6871L11.1883 19.1566L18.4881 17.0954ZM22.7292 9.74581L19.4441 17.4034L28.7887 27.0736L31.833 19.7166L22.7292 9.74581ZM7.56291 27.0117L10.6369 20.3514L18.1822 18.2208L16.2117 27.0117H7.56291Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12 15.0117V6H13V14.3451L22.5 8.01172L33 19.5117L31.138 24.0116L36 24.0116L36 25.0116L30.7242 25.0116L27 34.0117L16.5 28.0117H9.70733L5.35357 32.3652L4.64648 31.6581L8.29308 28.0117H6L12 15.0117ZM19.1385 18.5263L17.1831 27.2503L26.5102 32.5801L28.3718 28.0812L19.1385 18.5263ZM18.4881 17.0954L21.6168 9.80239L12.7896 15.6871L11.1883 19.1566L18.4881 17.0954ZM22.7292 9.74581L19.4441 17.4034L28.7887 27.0736L31.833 19.7166L22.7292 9.74581ZM7.56291 27.0117L10.6369 20.3514L18.1822 18.2208L16.2117 27.0117H7.56291Z"/>
</symbol>
<symbol id="chart-contour-normal" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7V34H34V7H7ZM19.9994 8H8V20H19.9994V8ZM20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994ZM25.355 21H20.9994V25.8163C21.7839 25.398 22.5013 24.8046 23.1681 24.0797C23.9739 23.2036 24.6942 22.147 25.355 21ZM20.9994 26.9284C22.0933 26.4431 23.0537 25.6812 23.9041 24.7567C24.8901 23.6847 25.7426 22.3795 26.5028 21H33V33H20.9994V26.9284ZM19.9994 26.2398V21H8V21.875L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398ZM19.9994 27.2817V33H8V23.1193C8.16619 23.2385 8.3967 23.4008 8.68037 23.5929C9.29197 24.007 10.1529 24.5612 11.1505 25.1214C13.1245 26.2298 15.7135 27.4084 17.9798 27.4995C18.6961 27.5283 19.368 27.4498 19.9994 27.2817ZM33 20H27.0327C27.2702 19.5352 27.4986 19.0664 27.7195 18.5994C28.1239 17.7445 28.5003 16.9021 28.8609 16.0954C29.4506 14.7758 29.9978 13.5515 30.5548 12.5234C30.9997 11.7023 31.4275 11.0537 31.8538 10.6154C32.2796 10.1776 32.6537 9.99993 33 9.99993V20Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7V34H34V7H7ZM19.9994 8H8V20H19.9994V8ZM20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994ZM25.355 21H20.9994V25.8163C21.7839 25.398 22.5013 24.8046 23.1681 24.0797C23.9739 23.2036 24.6942 22.147 25.355 21ZM20.9994 26.9284C22.0933 26.4431 23.0537 25.6812 23.9041 24.7567C24.8901 23.6847 25.7426 22.3795 26.5028 21H33V33H20.9994V26.9284ZM19.9994 26.2398V21H8V21.875L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398ZM19.9994 27.2817V33H8V23.1193C8.16619 23.2385 8.3967 23.4008 8.68037 23.5929C9.29197 24.007 10.1529 24.5612 11.1505 25.1214C13.1245 26.2298 15.7135 27.4084 17.9798 27.4995C18.6961 27.5283 19.368 27.4498 19.9994 27.2817ZM33 20H27.0327C27.2702 19.5352 27.4986 19.0664 27.7195 18.5994C28.1239 17.7445 28.5003 16.9021 28.8609 16.0954C29.4506 14.7758 29.9978 13.5515 30.5548 12.5234C30.9997 11.7023 31.4275 11.0537 31.8538 10.6154C32.2796 10.1776 32.6537 9.99993 33 9.99993V20Z"/>
<g opacity="0.4">
<path d="M19.9994 20H8V8H19.9994V20Z" fill="#444444"/>
<path d="M20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994Z" fill="#444444"/>
<path d="M8 21.875L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398V21H8V21.875Z" fill="#444444"/>
<path d="M20.9994 21H25.355C24.6942 22.147 23.9739 23.2036 23.1681 24.0797C22.5013 24.8046 21.7839 25.398 20.9994 25.8163V21Z" fill="#444444"/>
<path d="M19.9994 20H8V8H19.9994V20Z"/>
<path d="M20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994Z"/>
<path d="M8 21.875L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398V21H8V21.875Z"/>
<path d="M20.9994 21H25.355C24.6942 22.147 23.9739 23.2036 23.1681 24.0797C22.5013 24.8046 21.7839 25.398 20.9994 25.8163V21Z"/>
</g>
</symbol>
<symbol id="chart-contour-wireframe" viewBox="0 0 40 40">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7V34H34V7H7ZM19.9994 8H8V20H19.9994V8ZM20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994ZM25.355 21H20.9994V25.8163C21.7839 25.398 22.5013 24.8046 23.1681 24.0797C23.9739 23.2036 24.6942 22.147 25.355 21ZM20.9994 26.9284C22.0933 26.4431 23.0537 25.6812 23.9041 24.7567C24.8901 23.6847 25.7426 22.3795 26.5028 21H33V33H20.9994V26.9284ZM19.9994 26.2398V21H8V21.8716L8.30468 22.1035L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398ZM19.9994 27.2817V33H8V23.1193C8.16619 23.2385 8.3967 23.4008 8.68037 23.5929C9.29197 24.007 10.1529 24.5612 11.1505 25.1214C13.1245 26.2298 15.7135 27.4084 17.9798 27.4995C18.6961 27.5283 19.368 27.4498 19.9994 27.2817ZM33 20H27.0327C27.2702 19.5352 27.4986 19.0664 27.7195 18.5994C28.1239 17.7445 28.5003 16.9021 28.8609 16.0954C29.4506 14.7758 29.9978 13.5515 30.5548 12.5234C30.9997 11.7023 31.4275 11.0537 31.8538 10.6154C32.2796 10.1776 32.6537 9.99993 33 9.99993V20Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 7V34H34V7H7ZM19.9994 8H8V20H19.9994V8ZM20.9994 8V20H25.9058C26.221 19.4031 26.5232 18.7899 26.8155 18.1718C27.1967 17.366 27.5639 16.5451 27.9217 15.7452C28.5259 14.3941 29.1035 13.1029 29.6756 12.047C30.1349 11.1992 30.6145 10.4552 31.137 9.91811C31.66 9.38042 32.2762 8.99994 32.9999 8.99993L33 8H20.9994ZM25.355 21H20.9994V25.8163C21.7839 25.398 22.5013 24.8046 23.1681 24.0797C23.9739 23.2036 24.6942 22.147 25.355 21ZM20.9994 26.9284C22.0933 26.4431 23.0537 25.6812 23.9041 24.7567C24.8901 23.6847 25.7426 22.3795 26.5028 21H33V33H20.9994V26.9284ZM19.9994 26.2398V21H8V21.8716L8.30468 22.1035L8.31595 22.112L8.36241 22.1465C8.40379 22.1771 8.46567 22.2224 8.54631 22.2805C8.70763 22.3967 8.94385 22.5636 9.24104 22.7648C9.83585 23.1676 10.6726 23.7061 11.6401 24.2494C13.5964 25.3479 16.0074 26.4194 18.02 26.5003C18.7238 26.5286 19.3815 26.4361 19.9994 26.2398ZM19.9994 27.2817V33H8V23.1193C8.16619 23.2385 8.3967 23.4008 8.68037 23.5929C9.29197 24.007 10.1529 24.5612 11.1505 25.1214C13.1245 26.2298 15.7135 27.4084 17.9798 27.4995C18.6961 27.5283 19.368 27.4498 19.9994 27.2817ZM33 20H27.0327C27.2702 19.5352 27.4986 19.0664 27.7195 18.5994C28.1239 17.7445 28.5003 16.9021 28.8609 16.0954C29.4506 14.7758 29.9978 13.5515 30.5548 12.5234C30.9997 11.7023 31.4275 11.0537 31.8538 10.6154C32.2796 10.1776 32.6537 9.99993 33 9.99993V20Z"/>
</symbol>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 22 KiB

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

@ -23,18 +23,19 @@
margin: 0 30px;
font: 12px Tahoma;
letter-spacing: 1px;
color: #666666;
color: @text-normal;
font-weight: bold;
white-space: nowrap;
}
.asc-about-version {
font: 15px Tahoma;
color: #b6b6b6;
color: @text-tertiary;
}
.asc-about-companyname {
font: bold 15px Tahoma;
color: #333;
color: @text-normal;
}
label {
@ -42,11 +43,11 @@
&.asc-about-desc-name,
&.asc-about-lic {
font: 12px Tahoma;
color: #333;
color: @text-normal;
}
&.asc-about-desc-name {
color: #666666;
color: @text-normal;
white-space: pre;
}
@ -58,7 +59,7 @@
a {
font: 12px Tahoma;
color: #333;
color: @text-normal;
}
.separator.horizontal {

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

@ -91,19 +91,21 @@
.pixel-ratio__1_5 {
@ratio: 1.5;
@one-px: 1px / @ratio;
@two-px: 2px / @ratio;
--pixel-ratio-factor: @ratio;
--scaled-one-pixel: @one-px;
--scaled-two-pixel: @two-px;
}
.pixel-ratio__2 {
}
}
.button-normal-icon(@icon-class, @index, @icon-size) {
.button-normal-icon(@icon-class, @index, @icon-size, @normal-h-offset: 0px) {
.@{icon-class} {
background-position: -0*@icon-size -@index*@icon-size;
background-position: var(--bgX) -@index*@icon-size;
background-position: @normal-h-offset -@index*@icon-size;
}
// .@{icon-class} {background-position-y: -@index*@icon-size;}
}
@ -123,19 +125,17 @@
}
}
.mx-button-otherstates-icon2(@icon-size) {
.mx-button-otherstates-icon2(@offset) {
&.active, &:active{
&:not(:disabled):not(.disabled) {
.icon {
@btn-active-icon-offset: -1 * @icon-size;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
background-position-x: @offset;
}
}
}
&.active svg.icon,
&:active svg.icon {fill:#fff;}
//&.active svg.icon,
//&:active svg.icon {fill:#fff;}
}
.button-otherstates-icon2(@icon-class, @icon-size) {
@ -213,11 +213,12 @@
@common-controls-width: 100px;
.img-commonctrl,
.dropdown-menu li .checked:before, .input-error:before,
.dropdown-menu li .checked:before, .input-error:before, .input-warning:before,
.btn-toolbar .icon.img-commonctrl, .list-item div.checked:before
{
background-image: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/@{common-controls}')), ~"url(@{common-image-const-path}/@{common-controls})");
background-repeat: no-repeat;
filter: @component-normal-icon-filer;
@1d5ximage: replace(@common-controls, '\.png$', '@1.5x.png');
@2ximage: replace(@common-controls, '\.png$', '@2x.png');
@ -294,56 +295,18 @@
}
}
.adaptive-solid-border(@width, @color, @borderside: all) {
@lb-border: if((@borderside = all), border, e('border-@{borderside}'));
@lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width'));
@{lb-border}: @width solid @color;
@media only screen {
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
(min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
(min-resolution: 144dpi) and (max-resolution: 191dpi)
{
@{lb-border-width}: (@width / 1.5);
}
}
}
.adaptive-border-width(@width, @borderside: all) {
@lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width'));
@{lb-border-width}: @width;
@media only screen {
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
(min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
(min-resolution: 144dpi) and (max-resolution: 191dpi)
{
@{lb-border-width}: (@width / 1.5);
}
}
}
.adaptive-box-shadow(@arguments, @value, @regexp: "%1") {
@shadowargs: replace(@arguments, @regexp, @value);
-webkit-box-shadow: @shadowargs;
box-shadow: @shadowargs;
@media only screen {
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
(min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
(min-resolution: 144dpi) and (max-resolution: 191dpi)
{
@shadowargs: replace(@arguments, @regexp, @value / 1.5);
-webkit-box-shadow: @shadowargs;
box-shadow: @shadowargs;
}
}
}
.get-scaled-value(@v) {
@scaledvalue: calc(@v / var(--pixel-ratio-factor));
}
//.adaptive-solid-border(@width, @color, @borderside: all) {
// @lb-border: if((@borderside = all), border, e('border-@{borderside}'));
// @lb-border-width: if((@borderside = all), border-width, e('border-@{borderside}-width'));
//
// @{lb-border}: @width solid @color;
//
// @media only screen {
// @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
// (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
// (min-resolution: 144dpi) and (max-resolution: 191dpi)
// {
// @{lb-border-width}: (@width / 1.5);
// }
// }
//}

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

@ -4,8 +4,8 @@
.btn {
border-radius: 1px;
color: @gray-deep;
.adaptive-border-width(1px);
color: @text-normal;
border-width: @scaled-one-px-value;
.btnsize(@value) {
min-width: @value;
@ -44,6 +44,11 @@
&:focus {
outline: 0;
outline-offset: 0;
color: @text-normal;
}
&:hover {
color: @text-normal;
}
&:active, &.active {
@ -52,18 +57,22 @@
}
.caret {
width: 7px;
height: 7px;
border: 0;
background-position: @arrow-small-offset-x @arrow-small-offset-y;
position: relative;
width: 4px;
height: 4px;
border: solid 1px @icon-normal;
border-bottom: none;
border-right: none;
background-image: none;
transition: transform 0.2s ease;
transform: rotate(-135deg) translate(1px,1px);
}
//&:active,
&:active:not(.disabled),
&.active:not(.disabled){
.caret {
background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y;
transform: rotate(45deg);
}
}
@ -95,7 +104,7 @@
&::after {
content: ' ';
position: absolute;
border: 1px solid #000;
border: 1px solid @icon-notification-badge;
border-left: 0 none;
border-right: 0 none;
width: 6px;
@ -110,7 +119,7 @@
width: 10px;
height: 7px;
bottom: 2px;
background-color: #ffd112;
background-color: @background-notification-badge;
border-radius: 2px;
right: 0;
}
@ -126,7 +135,7 @@
width: 8px;
height: 8px;
background-color: transparent;
border: solid 1px @gray-deep;
border: solid 1px @text-normal;
border-bottom: none;
border-right: none;
}
@ -158,7 +167,7 @@
&.active:not(.disabled) {
.caret-up, .caret-down {
&::after {
border-color: #FFFFFF;
border-color: @background-normal;
}
}
}
@ -180,7 +189,7 @@
&.x-huge {
@icon-size: 28px;
min-width: 45px;
min-width: 35px;
height: @x-huge-btn-height;
img {
@ -214,8 +223,8 @@
only screen and (-webkit-min-device-pixel-ratio: 1.5),
only screen and (min-resolution: 1.5dppx),
only screen and (min-resolution: 144dpi) {
width:calc(~"40px/1.5");
height:calc(~"40px/1.5");
//width:calc(~"40px/1.5");
//height:calc(~"40px/1.5");
}
}
@ -266,11 +275,11 @@
.icon-top {
&.x-huge {
.btn&, .btn-group& .btn-toolbar {
.mx-button-otherstates-icon2(@x-huge-btn-icon-size);
.mx-button-otherstates-icon2(@button-huge-active-icon-offset-x);
}
.btn.small {
.mx-button-otherstates-icon2(20px);
.mx-button-otherstates-icon2(@button-small-active-icon-offset-x);
}
}
}
@ -287,7 +296,7 @@
.btn.small;
&.bg-white {
background-color: #fff;
background-color: @background-normal;
}
&:before,
@ -298,14 +307,14 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary;
background-color: @highlight-button-hover;
}
&:active:not(.disabled),
&.active:not(.disabled) {
color: lighten(@gray-lighter, 10%);
background-color: @primary;
color: @text-normal;
background-color: @highlight-button-pressed;
}
&:not(.icon-top)
@ -363,6 +372,10 @@
width: 14px;
height: 3px;
background-color: red;
&.bordered {
border: 1px solid @border-regular-control;
}
.pixel-ratio__1_5 & {
height: 4px;
@ -382,13 +395,13 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary;
background-color: @highlight-button-hover;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary;
color: #fff;
background-color: @highlight-button-pressed;
color: @text-normal-pressed;
}
.icon {
@ -401,7 +414,7 @@
&[disabled],
&.disabled {
color: #000;
//color: #000; btn-category has no text
opacity: @btn-disabled-opacity;
}
}
@ -437,7 +450,7 @@
&.open {
> .btn-toolbar {
//color: lighten(@gray-lighter, 10%);
//color: @text-normal;
// Show no shadow for `.btn-link` since it has no other button styles.
&.btn-link {
@ -452,7 +465,7 @@
&.over {
> button {
//background-color: @secondary;
//background-color: @highlight-button-hover;
}
}
@ -495,16 +508,11 @@
}
}
@color-gray: @secondary;
@color-dark: @primary;
//@color-gray: #079e2f;
//@color-dark: #c52c0e;
&.split {
&.over:not(.disabled),
&.open {
box-shadow: inset 0 0 0 1px @color-gray;
box-shadow: inset 0 0 0 1px @highlight-button-hover;
button:not(.active):not(.btn-text-split-default) {
background-color: transparent;
@ -515,13 +523,13 @@
button {
&:not(.active) {
&:hover {
background-color: @color-gray;
background-color: @highlight-button-hover;
}
}
&:active,
&:active:hover {
background-color: @color-dark;
background-color: @highlight-button-pressed;
}
}
}
@ -529,7 +537,7 @@
&.open {
> button:not(.active) {
&:last-of-type {
background-color: @color-dark;
background-color: @highlight-button-pressed;
}
}
@ -539,7 +547,7 @@
}
button.active:not(.disabled) {
background-color: @color-dark;
background-color: @highlight-button-pressed;
}
.btn + .btn {
@ -552,20 +560,20 @@
width: 45px;
height: 22px;
padding: @scaled-one-px-value 11px @scaled-one-px-value @scaled-one-px-value;
border:@scaled-one-px-value solid @input-border;
border:@scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
span:nth-child(1) {
float: left;
width: 100%;
height: 100%;
border: @scaled-one-px-value solid rgba(0, 0, 0, 0.2);
border: @scaled-one-px-value solid @border-color-shading;
background-color: transparent;
}
.inner-box-caret {
position: absolute;
right: 0;
right: 1px;
top: 2px;
}
@ -574,7 +582,7 @@
.over,
&:active,
&.active {
background: #fff !important;
background: @background-normal !important;
.box-shadow(none) !important;
}
@ -585,8 +593,7 @@
.color-transparent {
&:before {
//border-right: 1px solid red;
.adaptive-solid-border(1px, red);
border-right: @scaled-one-px-value solid red;
height: 34px;
transform: translate(16px, -9px) rotate(62deg);
left: 0;
@ -596,11 +603,22 @@
&:active:not(.disabled),
&.active:not(.disabled) {
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
}
}
// for color button auto color
.dropdown-menu {
li > a.selected,
li > a:hover {
span.color-auto {
outline: @scaled-one-px-value solid @border-regular-control;
border: @scaled-one-px-value solid @background-normal;
}
}
}
.btn-options {
padding: 0;
margin:0;
@ -609,7 +627,7 @@
background-color: transparent;
&.bg-white {
background-color: #fff;
background-color: @background-normal;
}
.icon {
@ -623,26 +641,25 @@
background-repeat: no-repeat;
}
//box-shadow: inset 0 0 0 1px @gray;
.adaptive-box-shadow(~'inset 0 0 0 %1 @{gray}', 1px);
box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control;
.border-radius(@border-radius-small);
&:hover,
&.over {
background-color: @secondary;
background-color: @highlight-button-hover;
}
&:active,
&.active {
background-color: @primary;
background-color: @highlight-button-pressed;
}
}
.btn-text-default {
width: 75px;
height: 22px;
background: @input-bg;
border: @scaled-one-px-value solid @input-border;
background: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
&.auto {
@ -653,14 +670,14 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary !important;
background-color: @highlight-button-hover !important;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary !important;
border-color: @primary;
color: white;
background-color: @highlight-button-pressed !important;
border-color: @highlight-button-pressed;
color: @text-normal-pressed;
}
&[disabled],
@ -672,8 +689,8 @@
.btn-text-menu-default {
width: 100%;
height: 22px;
background: @input-bg;
border: @scaled-one-px-value solid @input-border;
background: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
button {
@ -688,12 +705,12 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary !important;
background-color: @highlight-button-hover !important;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary !important;
background-color: @highlight-button-pressed !important;
color: white;
}
@ -706,8 +723,8 @@
.btn-text-split-default {
width: 75px;
height: 22px;
background: @input-bg;
border: @scaled-one-px-value solid @input-border;
background: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
&.dropdown-toggle {
@ -720,14 +737,14 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary !important;
background-color: @highlight-button-hover !important;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary !important;
border-color: @primary;
color: white;
background-color: @highlight-button-pressed !important;
border-color: @highlight-button-pressed;
color: @text-normal-pressed;
}
&[disabled],
@ -739,8 +756,8 @@
.btn-icon-default {
width: 45px;
height: 22px;
background: @input-bg;
border: @scaled-one-px-value solid @input-border;
background: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
.icon {
@ -758,12 +775,12 @@
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @secondary !important;
background-color: @highlight-button-hover !important;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary !important;
background-color: @highlight-button-pressed !important;
}
&[disabled],
@ -779,8 +796,8 @@
padding: 2px;
margin:0;
box-shadow: none;
background-color: @input-bg;
border: @scaled-one-px-value solid @input-border;
background-color: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
&.template-table {
@ -805,7 +822,7 @@
margin-right: 3px;
background-color: transparent;
background-repeat: no-repeat;
border: @scaled-one-px-value solid @input-border;
border: @scaled-one-px-value solid @border-regular-control;
position: relative;
}
@ -819,7 +836,7 @@
.over,
&:active,
&.active {
background-color: @input-bg !important;
background-color: @background-normal !important;
}
&:active:not(.disabled),
@ -841,21 +858,23 @@
.dlg-btn {
font-weight: bold;
width: 86px;
color: @gray-deep;
background-color: @secondary;
color: @text-normal;
background-color: @background-normal;
border: 1px solid @border-regular-control;
&:hover:not(.disabled),
&.hover:not(.disabled) {
background-color: @secondary-hover;
background-color: @highlight-button-hover;
}
&.primary {
color: #fff;
background-color: @primary;
color: @text-inverse;
background-color: @background-primary-dialog-button;
border: 0 none;
&:hover:not(.disabled),
&.hover:not(.disabled) {
background-color: @primary-hover;
background-color: @highlight-primary-dialog-button-hover;
}
}

2
apps/common/main/resources/less/calendar.less
View file

@ -1,4 +1,4 @@
@calendar-bg-color: @tabs-bg-color;
@calendar-bg-color: @header-background-color;
.calendar-window {
border-radius: 0;

24
apps/common/main/resources/less/chat.less
View file

@ -11,7 +11,7 @@
.area {
position: absolute;
border-bottom: 1px solid @gray-dark;
border-bottom: 1px solid @border-toolbar;
overflow: hidden;
}
@ -57,7 +57,7 @@
margin: 0 5px 3px 0;
width: 12px;
height: 12px;
border: 1px solid @gray-dark;
border: 1px solid @border-toolbar;
}
.name {
@ -101,7 +101,7 @@
}
.user-name {
color: @gray-deep;
color: @text-normal;
font-size: 12px;
font-weight: bold;
overflow: hidden;
@ -112,7 +112,7 @@
.color {
width: 12px;
height: 12px;
border: 1px solid @gray-dark;
border: 1px solid @border-toolbar;
margin: 0 5px 3px 0;
vertical-align: middle;
}
@ -121,12 +121,12 @@
word-wrap: break-word;
width: 100%;
&.service {
text-align: center;
color: #CECECE;
text-shadow: 0 1px 0 #fff;
padding-right: 20px;
}
//&.service {
// text-align: center;
// color: #CECECE;
// text-shadow: 0 1px 0 #fff;
// padding-right: 20px;
//}
}
}
}
@ -143,11 +143,11 @@
height: 100%;
resize: none;
margin-bottom: 5px;
border: 1px solid @gray-dark;
border: 1px solid @border-regular-control;
font-size: 12px;
&:focus {
border-color: @gray-darker;
border-color: @border-preview-select;
}
}
}

11
apps/common/main/resources/less/checkbox.less
View file

@ -12,8 +12,8 @@
+ label {
width: 14px;
height: 14px;
background: #fff;
border: @scaled-one-px-value solid @gray;
background: @background-normal;
border: @scaled-one-px-value solid @border-regular-control;
border-radius: 2px;
position: absolute;
left: 0;
@ -25,8 +25,7 @@
&::before {
content: '';
position: absolute;
//border: solid @gray-deep;
.adaptive-solid-border(2px, @gray-deep);
border: @scaled-two-px-value solid @text-normal;
border-top: 0 none;
border-left: 0 none;
transform: rotate(45deg);
@ -42,8 +41,8 @@
&::before {
content: '';
position: absolute;
border: @scaled-one-px-value solid @gray-deep;
background: @gray-soft;
border: @scaled-one-px-value solid @text-normal;
background: @icon-normal;
width: 8px;
height: 8px;
left: 2px;

12
apps/common/main/resources/less/colorpalette.less
View file

@ -7,7 +7,7 @@
&:hover,
&.selected {
.box-shadow(0 0 0 1px @primary);
.box-shadow(0 0 0 @scaled-one-px-value @highlight-button-pressed);
}
}
}
@ -26,7 +26,7 @@
padding: 10px;
.palette-color-item {
padding: 0;
border: 1px solid #fff;
border: @scaled-one-px-value solid @background-normal;
display: inline-block;
text-decoration: none;
-moz-outline: 0 none;
@ -43,21 +43,21 @@
width: 12px;
cursor: pointer;
display: block;
border: 1px solid rgba(0, 0, 0, 0.2);
border: @scaled-one-px-value solid @border-color-shading;
}
}
&:hover, &.selected {
border-color: #000;
border-color: @icon-normal;
em span {
border-color: #fff;
border-color: @background-normal;
}
}
}
.color-transparent {
em span {
border:solid 1px #C0C0C0;
border:solid @scaled-one-px-value @border-color-shading;
}
}
}

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

@ -0,0 +1,110 @@
:root {
&.theme-dark {
--toolbar-header-document: #2a2a2a;
--toolbar-header-spreadsheet: #2a2a2a;
--toolbar-header-presentation: #2a2a2a;
--background-normal: #333;
--background-toolbar: #404040;
--background-toolbar-additional: #505050;
--background-primary-dialog-button: #ddd;
--background-tab-underline: #ddd;
--background-notification-popover: #3e5968;
--background-notification-badge: #ffd114;
--background-scrim: fade(black, 60%);
--background-loader: fade(#181818, 90%);
--highlight-button-hover: #555;
--highlight-button-pressed: #606060;
--highlight-button-pressed-hover: #808080;
--highlight-primary-dialog-button-hover: #e5e5e5;
--highlight-header-button-hover: fade(#000, 20%);
--highlight-header-button-pressed: fade(#000, 25%);
--highlight-toolbar-tab-underline: #ddd;
--highlight-text-select: #96c8fd;
--border-toolbar: #2a2a2a;
--border-divider: #505050;
--border-regular-control: #666666;
--border-toolbar-button-hover: #5a5a5a;
--border-preview-select: #666666;
--border-control-focus: #ccc;
--border-color-shading: fade(#fff, 5%);
--border-error: #f62211;
--text-normal: fade(#fff, 80%);
--text-normal-pressed: fade(#fff, 80%);
--text-secondary: fade(#fff, 60%);
--text-tertiary: fade(#fff, 40%);
--text-link: #acbfff;
--text-inverse: #333;
--text-toolbar-header: fade(#fff, 80%);
--text-contrast-background: #fff;
--icon-normal: fade(#fff, 80%);
--icon-normal-pressed: fade(#fff, 80%);
--icon-inverse: #444;
--icon-toolbar-header: fade(#fff, 80%);
--icon-notification-badge: #000;
--icon-contrast-popover: #fff;
--icon-success: #090;
// Canvas colors
--canvas-background: #666666;
--canvas-content-background: #fff;
--canvas-page-border: #555;
--canvas-ruler-background: #555;
--canvas-ruler-margins-background: #444;
--canvas-ruler-mark: #b2b2b2;
--canvas-ruler-handle-border: #b2b2b2;
--canvas-ruler-handle-border-disabled: #717171;
--canvas-high-contrast: #fff;
--canvas-high-contrast-disabled: #888;
--canvas-cell-border: fade(#000, 10%);
--canvas-cell-title-border: #757575;
--canvas-cell-title-border-hover: #858585;
--canvas-cell-title-border-selected: #9e9e9e;
--canvas-cell-title-hover: #787878;
--canvas-cell-title-selected: #939393;
--canvas-dark-cell-title: #111;
--canvas-dark-cell-title-hover: #000;
--canvas-dark-cell-title-selected: #333;
--canvas-dark-cell-title-border: #282828;
--canvas-dark-cell-title-border-hover: #191919;
--canvas-dark-cell-title-border-selected: #474747;
--canvas-scroll-thumb: #404040;
--canvas-scroll-thumb-hover: #999;
--canvas-scroll-thumb-pressed: #adadad;
--canvas-scroll-thumb-border: #2a2a2a;
--canvas-scroll-thumb-border-hover: #2a2a2a;
--canvas-scroll-thumb-border-pressed: #2a2a2a;
--canvas-scroll-arrow: #999;
--canvas-scroll-arrow-hover: #404040;
--canvas-scroll-arrow-pressed: #404040;
--canvas-scroll-thumb-target: #999;
--canvas-scroll-thumb-target-hover: #404040;
--canvas-scroll-thumb-target-pressed: #404040;
// Others
--button-small-normal-icon-offset-x: -20px;
--button-small-active-icon-offset-x: -20px;
--button-large-normal-icon-offset-x: -31px;
--button-large-active-icon-offset-x: -31px;
--button-huge-normal-icon-offset-x: -28px;
--button-huge-active-icon-offset-x: -28px;
--modal-window-mask-opacity: 0.6;
--image-border-types-filter: invert(100%) brightness(4);
--image-border-types-filter-selected: invert(100%) brightness(4);
--component-normal-icon-filter: invert(100%);
--menu-icon-item-checked-offset-x: -20px;
}
}

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

@ -0,0 +1,193 @@
// Brand colors
// -------------------------
@brand-primary: #428bca;
@brand-success: #5cb85c;
@brand-warning: #f0ad4e;
@brand-danger: #d9534f;
@brand-info: #5bc0de;
:root {
--toolbar-header-document: #446995;
--toolbar-header-spreadsheet: #40865c;
--toolbar-header-presentation: #aa5252;
--background-normal: #fff;
--background-toolbar: #f7f7f7;
--background-toolbar-additional: #efefef;
--background-primary-dialog-button: #444;
--background-tab-underline: #444;
--background-notification-popover: #fcfed7;
--background-notification-badge: #ffd112;
--background-scrim: fade(#000, 20%);
--background-loader: fade(#181818, 90%);
--highlight-button-hover: #e0e0e0;
--highlight-button-pressed: #ccc;
--highlight-button-pressed-hover: #bababa;
--highlight-primary-dialog-button-hover: #2b2b2b;
--highlight-header-button-hover: fade(#fff, 20%);
--highlight-header-button-pressed: fade(#fff, 25%);
--highlight-toolbar-tab-underline: #444;
--highlight-text-select: #3494fb;
--border-toolbar: #cbcbcb;
--border-divider: #dfdfdf;
--border-regular-control: #c0c0c0;
--border-toolbar-button-hover: #e0e0e0;
--border-preview-select: #aaa;
--border-control-focus: #848484;
--border-color-shading: fade(#000, 10%);
--border-error: #f62211;
--text-normal: fade(#000, 80%);
--text-normal-pressed: fade(#000, 80%);
--text-secondary: fade(#000, 60%);
--text-tertiary: fade(#000, 40%);
--text-link: #445799;
--text-inverse: #fff;
--text-toolbar-header: #fff;
--text-contrast-background: #fff;
--icon-normal: #444;
--icon-normal-pressed: #444;
--icon-inverse: #fff;
--icon-toolbar-header: #fff;
--icon-notification-badge: #000;
--icon-contrast-popover: #fff;
--icon-success: #090;
// Canvas
--canvas-background: #f0f0f0;
--canvas-content-background: #fff;
--canvas-page-border: #ccc;
--canvas-ruler-background: #fff;
--canvas-ruler-margins-background: #d9d9d9;
--canvas-ruler-mark: #555;
--canvas-ruler-handle-border: #555;
--canvas-ruler-handle-border-disabled: #bbb;
--canvas-high-contrast: #000;
--canvas-high-contrast-disabled: #999;
--canvas-cell-border: fade(black, 10%);
--canvas-cell-title-border: #d8d8d8;
--canvas-cell-title-border-hover: #c9c9c9;
--canvas-cell-title-border-selected: #bbb;
--canvas-cell-title-hover: #dfdfdf;
--canvas-cell-title-selected: #cfcfcf;
--canvas-dark-cell-title: #444;
--canvas-dark-cell-title-hover: #666 ;
--canvas-dark-cell-title-selected: #111;
--canvas-dark-cell-title-border: #3d3d3d;
--canvas-dark-cell-title-border-hover: #5c5c5c;
--canvas-dark-cell-title-border-selected: #0f0f0f;
--canvas-scroll-thumb: #f7f7f7;
--canvas-scroll-thumb-hover: #c0c0c0;
--canvas-scroll-thumb-pressed: #adadad;
--canvas-scroll-thumb-border: #c0c0c0;
--canvas-scroll-thumb-border-hover: #c0c0c0;
--canvas-scroll-thumb-border-pressed: #0%;
--canvas-scroll-arrow: #adadad;
--canvas-scroll-arrow-hover: #f7f7f7;
--canvas-scroll-arrow-pressed: #f7f7f7;
--canvas-scroll-thumb-target: #c0c0c0;
--canvas-scroll-thumb-target-hover: #f7f7f7;
--canvas-scroll-thumb-target-pressed: #f7f7f7;
// Others
//--button-small-normal-icon-offset-x: 0;
//--button-small-active-icon-offset-x: 0;
//--button-large-normal-icon-offset-x: 0;
//--button-large-active-icon-offset-x: 0;
//--button-huge-normal-icon-offset-x: 0;
//--button-huge-active-icon-offset-x: 0;
--button-header-normal-icon-offset-x: -20px;
--button-header-active-icon-offset-x: -20px;
//--menu-icon-item-checked-offset-x: 0;
--modal-window-mask-opacity: 0.2;
--image-border-types-filter: none;
--image-border-types-filter-selected: none;
--component-normal-icon-filter: none;
}
// Background
// -------------------------
@background-normal: var(--background-normal);
@background-toolbar: var(--background-toolbar);
@background-toolbar-additional: var(--background-toolbar-additional);
@background-primary-dialog-button: var(--background-primary-dialog-button);
@background-tab-underline: var(--background-tab-underline);
@background-notification-popover: var(--background-notification-popover);
@background-notification-badge: var(--background-notification-badge);
@background-scrim: var(--background-scrim);
@background-loader: var(--background-loader);
// Highlight
// -------------------------
@highlight-button-hover: var(--highlight-button-hover);
@highlight-button-pressed: var(--highlight-button-pressed);
@highlight-button-pressed-hover: var(--highlight-button-pressed-hover);
@highlight-primary-dialog-button-hover: var(--highlight-primary-dialog-button-hover);
@highlight-header-button-hover: var(--highlight-header-button-hover);
@highlight-header-button-pressed: var(--highlight-header-button-pressed);
@highlight-toolbar-tab-underline: var(--highlight-toolbar-tab-underline);
@highlight-text-select: var(--highlight-text-select);
// Border
// -------------------------
@border-toolbar: var(--border-toolbar);
@border-divider: var(--border-divider);
@border-regular-control: var(--border-regular-control);
@border-toolbar-button-hover: var(--border-toolbar-button-hover);
@border-preview-select: var(--border-preview-select);
@border-control-focus: var(--border-control-focus);
@border-color-shading: var(--border-color-shading);
@border-error: var(--border-error);
// Text
// -------------------------
@text-normal: var(--text-normal);
@text-normal-pressed: var(--text-normal-pressed);
@text-secondary: var(--text-secondary);
@text-tertiary: var(--text-tertiary);
@text-link: var(--text-link);
@text-inverse: var(--text-inverse);
@text-toolbar-header: var(--text-toolbar-header);
@text-contrast-background: var(--text-contrast-background);
// Icon
// -------------------------
@icon-normal: var(--icon-normal);
@icon-normal-pressed: var(--icon-normal-pressed);
@icon-inverse: var(--icon-inverse);
@icon-toolbar-header: var(--icon-toolbar-header);
@icon-contrast-popover: var(--icon-contrast-popover);
@icon-notification-badge: var(--icon-notification-badge);
@icon-success: var(--icon-success);
@button-small-normal-icon-offset-x: var(--button-small-normal-icon-offset-x,0);
@button-small-active-icon-offset-x: var(--button-small-active-icon-offset-x,0);
@button-large-normal-icon-offset-x: var(--button-large-normal-icon-offset-x, 0);
@button-large-active-icon-offset-x: var(--button-large-active-icon-offset-x, 0);
@button-huge-normal-icon-offset-x: var(--button-huge-normal-icon-offset-x, 0);
@button-huge-active-icon-offset-x: var(--button-huge-active-icon-offset-x, 0);
@button-header-normal-icon-offset-x: var(--button-header-normal-icon-offset-x, -20px);
@button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px);
@component-normal-icon-filer: var(--component-normal-icon-filter);
@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
// Canvas
// ---------------------------
@canvas-content-background: var(--canvas-content-background);

11
apps/common/main/resources/less/combo-border-size.less
View file

@ -22,8 +22,17 @@
}
}
.image {
position: relative;
width: 100%;
height: 100%;
display: inline-block;
background-color: transparent;
margin: -1px 0 0 -3px;
}
img, .image {
background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0 #fff";
background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0";
@media only screen {
//@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),

60
apps/common/main/resources/less/combo-dataview.less
View file

@ -10,9 +10,8 @@
width: @combo-dataview-width;
height: 100%;
.border-radius(@border-radius-small);
//border: 1px solid @input-border;
.adaptive-solid-border(1px, @input-border);
background-color: @input-bg;
border: @scaled-one-px-value solid @border-regular-control;
background-color: @background-normal;
.dataview {
padding: 1px;
@ -25,9 +24,8 @@
button {
border-radius:0 @border-radius-small @border-radius-small 0;
//border: 1px solid @input-border;
.adaptive-solid-border(1px, @input-border);
background-color: @input-bg;
border: @scaled-one-px-value solid @border-regular-control;
background-color: @background-normal;
&.dropdown-toggle {
.inner-box-caret {
@ -37,15 +35,16 @@
.caret {
// width: 7px;
// height: 7px;
border: 0;
background-position: @arrow-small-offset-x @arrow-small-offset-y;
// border: 0;
// background-position: @arrow-small-offset-x @arrow-small-offset-y;
margin-left: 1px;
}
}
}
}
.dropdown-menu {
border-color: @gray;
border-color: @border-regular-control;
border-top-right-radius: 0;
border-top-left-radius: 2px;
margin: 0;
@ -86,20 +85,17 @@
.item {
padding: 3px;
//border: 1px solid @gray;
.adaptive-solid-border(1px, @gray);
border: @scaled-one-px-value solid @border-regular-control;
.box-shadow(none);
margin: 0 -1px -1px 0;
&:hover {
//.box-inner-shadow(0 0 0 2px @gray);
.adaptive-box-shadow(~"inset 0 0 0 %1 @{gray}", 2px);
.box-inner-shadow(0 0 0 @scaled-two-px-value @border-regular-control);
}
&.selected {
//.box-inner-shadow(0 0 0 2px @gray-darker);
.adaptive-box-shadow(~"inset 0 0 0 %1 @{gray-darker}", 2px);
.box-inner-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
}
}
@ -130,8 +126,7 @@
width: auto;
position: relative;
border: none;
//.box-shadow(0 0 0 1px @body-bg);
.adaptive-box-shadow(~"0 0 0 %1 @{body-bg}", 1px);
.box-shadow(0 0 0 @scaled-one-px-value @background-normal);
> div {
background-repeat: no-repeat;
@ -148,15 +143,24 @@
padding: 0;
.caret {
width: 27px;
height: 27px;
background-position: @arrow-big-offset-x @arrow-big-offset-y;
transition: transform .2s;
//width: 27px;
//height: 27px;
//background-position: @arrow-big-offset-x @arrow-big-offset-y;
width: 8px;
height: 8px;
background-color: transparent;
border: solid 1px @icon-normal;
border-bottom: none;
border-right: none;
background-image: none;
transition: transform 0.2s ease;
transform: rotate(-135deg) translate(2px,2px);
}
&.active {
.caret {
transform: rotate(180deg);
transform: rotate(45deg);
}
}
}
@ -194,8 +198,7 @@
&.disabled {
.item {
&:hover:not(.selected) {
//.box-shadow(0 0 0 1px @gray);
.adaptive-box-shadow(~"0 0 0 %1 @{gray}", 1px);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
}
}
}
@ -245,8 +248,7 @@
.item {
&:hover {
//.box-shadow(0 0 0 1px @gray);
.adaptive-box-shadow(~"0 0 0 %1 @{gray}", 1px);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
}
}
@ -273,15 +275,13 @@
.item {
margin-left: 4px;
//.box-shadow(0 0 0 1px @gray);
.adaptive-box-shadow(~"0 0 0 %1 @{gray}", 1px);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
}
&.disabled {
.item {
&:hover:not(.selected) {
//.box-shadow(0 0 0 1px @gray);
.adaptive-box-shadow(~"0 0 0 %1 @{gray}", 1px);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
}
}
}

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

@ -1,3 +1,6 @@
@img-borders-filter: var(--image-border-types-filter);
@img-borders-filter-selected: var(--image-border-types-filter-selected);
.combobox {
display: block;
@ -23,36 +26,21 @@
padding-right: 7px + 2 * @padding-base-horizontal;
}
&.input-group-nr > .btn {
&.dropdown-toggle {
.caret {
width: 7px;
height: 7px;
border: 0;
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
&:active,
&.active {
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
}
}
}
.form-control {
border-right: 0;
position: static;
z-index: auto;
float: none;
.image {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
}
}
.btn,
.btn:hover,
.btn:focus {
.btn {
border-left: 0;
border-color: @input-border;
border-color: @border-regular-control;
background-color: transparent;
margin-left: -1px;
position: absolute;
@ -62,21 +50,33 @@
.btn-default:not(.disabled),
&.open .dropdown-toggle.btn-default {
background-color: @input-bg;
border-color: @input-border;
background-color: @background-normal;
border-color: @border-regular-control;
padding-right: 4px;
}
.btn-default.disabled {
&:hover, &:focus {
background-color: transparent;
border-color: @border-regular-control;
}
}
&.input-group-nr.open:not(.no-highlighted) {
& > .form-control,
& > .btn {
border-color: @gray-darker;
border-color: @border-control-focus;
.caret {
transform: rotate(45deg);
}
}
}
&.input-group-nr:not(.no-highlighted) > .form-control {
&:focus,
&:focus ~ button.dropdown-toggle {
border-color: @gray-darker;
border-color: @border-control-focus;
}
}
@ -86,16 +86,16 @@
}
&.selected {
background-color: @primary;
background-color: @highlight-button-pressed;
a {
color: @dropdown-link-active-color;
color: @text-normal-pressed;
&:hover,
&.hover,
&:focus,
&.focus {
background-color: @primary;
background-color: @highlight-button-pressed;
}
}
}
@ -104,14 +104,23 @@
// Font combobox
// ------------------------
li {
img {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
}
canvas {
-webkit-filter: @img-borders-filter;
filter: @img-borders-filter;
}
&.selected {
img {
-webkit-filter: invert(100%) brightness(4);
filter: invert(100%) brightness(4);
-webkit-filter: @img-borders-filter-selected;
filter: @img-borders-filter-selected;
}
canvas {
-webkit-filter: invert(100%) brightness(4);
filter: invert(100%) brightness(4);
-webkit-filter: @img-borders-filter-selected;
filter: @img-borders-filter-selected;
}
}
@ -130,13 +139,18 @@
.dropdown-menu.menu-absolute {
position: fixed;
}
.dropdown-menu.show-top {
top: auto;
bottom: 100%;
}
}
.open > .combobox.combo-dataview-menu {
&.input-group-nr:not(.no-highlighted) {
& > .form-control,
& > .btn {
border-color: @gray-darker;
border-color: @border-control-focus;
}
}
}

77
apps/common/main/resources/less/comments-panel.less
View file

@ -1,77 +0,0 @@
.comments-panel {
display: table;
position: relative;
width: 100%;
height: 100%;
border-collapse: collapse;
font: 12px arial;
.row {
display: table-row;
}
.user-name {
color: @gray-deep;
font-size: 12px;
font-weight: bold;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
padding: 10px 10px 0 20px;
height: 26px;
max-width: 155px;
}
.color {
width: 12px;
height: 12px;
border: 1px solid @gray-dark;
margin: 0 5px 3px 0;
vertical-align: middle;
}
.user-date {
color: @gray-darker;
font-size: 10px;
padding: 0 0 0 20px;
height: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
}
.user-quote {
color: @gray-darker;
font-style: italic;
border-left: 1px solid @gray-darker;
margin-left: 20px;
margin-top: 3px;
padding: 5px 9px 5px 9px;
white-space: pre-wrap;
cursor: pointer;
}
.user-message {
.user-select(text);
color: @black;
padding: 9px 10px 0 20px;
white-space: pre-wrap;
word-wrap: break-word;
cursor: default;
}
.user-reply {
color: @black;
border-bottom-width: 1px solid @black;
box-sizing: border-box;
height: auto;
margin-left: 18px;
margin-top: 10px;
white-space: pre-wrap;
width: auto;
cursor: pointer;
}
}

54
apps/common/main/resources/less/comments.less
View file

@ -14,7 +14,7 @@
right: 0;
bottom: 45px;
height: 300px;
border-bottom: @scaled-one-px-value solid @gray-dark;
border-bottom: @scaled-one-px-value solid @border-toolbar;
&.stretch {
border-bottom: none;
@ -32,10 +32,10 @@
text-align: center;
label {
color: @black;
color: @text-normal;
font: 12px arial;
line-height: normal;
border-bottom: @scaled-one-px-value dotted @black;
border-bottom: @scaled-one-px-value dotted @text-normal;
padding-top: 12px;
outline: none;
height: 29px;
@ -58,10 +58,10 @@
width: 100%;
resize: none;
margin-bottom: 5px;
border: @scaled-one-px-value solid @gray-dark;
border: @scaled-one-px-value solid @border-regular-control;
height: 100%;
&:focus {
border-color: @gray-darker;
border-color: @border-control-focus;
}
}
}
@ -83,19 +83,19 @@
line-height: normal;
position: relative;
overflow: hidden;
color: @gray-darker;
color: @border-preview-select;
textarea {
width: 100%;
height: 50px;
resize: none;
margin-bottom: 5px;
border: @scaled-one-px-value solid @gray-dark;
border: @scaled-one-px-value solid @border-regular-control;
word-break: break-all;
line-height: 15px;
color: @gray-deep;
color: @text-normal;
&:focus {
border-color: @gray-darker;
border-color: @border-control-focus;
}
}
@ -109,7 +109,7 @@
}
.separator-cmt {
border-bottom: @scaled-one-px-value solid @gray-dark;
border-bottom: @scaled-one-px-value solid @border-toolbar;
margin: 20px 0px 0px 0px;
}
@ -119,7 +119,7 @@
}
.user-name {
color: @gray-deep;
color: @text-normal;
font-size: 12px;
font-weight: bold;
overflow: hidden;
@ -133,7 +133,7 @@
.color {
width: 12px;
height: 12px;
border: @scaled-one-px-value solid @gray-dark;
border: @scaled-one-px-value solid @border-toolbar;
margin: 0 5px 3px 0;
vertical-align: middle;
}
@ -177,7 +177,7 @@
}
.user-message {
color: @black;
color: @text-normal;
padding: 9px 0px 0 0px;
white-space: pre-wrap;
word-wrap: break-word;
@ -200,11 +200,11 @@
}
.user-reply {
color: @black;
color: @text-normal;
margin-top: 10px;
white-space: pre-wrap;
width: auto;
border-bottom: @scaled-one-px-value dotted @black;
border-bottom: @scaled-one-px-value dotted @text-normal;
height: 16px;
cursor: pointer;
}
@ -265,7 +265,25 @@
}
.btn-resolve {
background-position: -2px -253px;
position: relative;
&:after {
content: '';
position: absolute;
border: solid @text-normal;
border-width: 0 2px 2px 0;
transform: rotate(40deg);
width: 7px;
height: 12px;
left: 6px;
top: -2px;
}
&.comment-resolved {
&:after {
border-color: @icon-success;
}
}
}
.btn-resolve-check {
@ -402,12 +420,12 @@
left: 2px;
width: 15px;
height: 15px;
background-color: #ffffff;
background-color: @background-normal;
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
border: solid @scaled-one-px-value @gray-dark;
border: solid @scaled-one-px-value @border-toolbar;
}
}

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

@ -1,6 +1,6 @@
label {
&.link {
border-bottom: @scaled-one-px-value dotted #aaa;
border-bottom: @scaled-one-px-value dotted @text-secondary;
cursor: pointer;
&.disabled {
@ -9,7 +9,7 @@ label {
}
&.link-solid {
border-bottom: 1px solid #aaa;
border-bottom: @scaled-one-px-value solid @text-secondary;
cursor: pointer;
&.disabled {
@ -46,15 +46,15 @@ label {
overflow: hidden;
.tool-menu-btns {
border-right: @scaled-one-px-value solid @gray-dark;
border-right: @scaled-one-px-value solid @border-regular-control;
}
}
&.right {
.tool-menu-btns {
//position: absolute;
border-left: @scaled-one-px-value solid @gray-dark;
background-color: @gray-light;
border-left: @scaled-one-px-value solid @border-regular-control;
background-color: @background-toolbar;
right: 0;
overflow: hidden;
}
@ -76,7 +76,7 @@ label {
.left-panel {
padding-left: 40px;
height: 100%;
border-right: @scaled-one-px-value solid @gray-dark;
border-right: @scaled-one-px-value solid @border-regular-control;
#left-panel-chat {
height: 100%;
@ -94,18 +94,18 @@ label {
padding: 0 10px 0 15px;
position: relative;
overflow: hidden;
border-left: @scaled-one-px-value solid @gray-dark;
border-left: @scaled-one-px-value solid @border-regular-control;
line-height: 15px;
}
.statusbar {
height: 25px;
background-color: @gray-light;
.box-inner-shadow(0 @scaled-one-px-value 0 @gray-dark);
background-color: @background-toolbar;
.box-inner-shadow(0 @scaled-one-px-value 0 @border-regular-control);
.status-label {
font-weight: bold;
color: @gray-deep;
color: @text-normal;
white-space: nowrap;
}
}
@ -118,13 +118,13 @@ label {
.panel-menu {
width: 260px;
float: left;
border-right: @scaled-one-px-value solid @gray-dark;
background-color: @gray-light;
border-right: @scaled-one-px-value solid @border-regular-control;
background-color: @background-toolbar;
}
.flex-settings {
&.bordered {
border-bottom: @scaled-one-px-value solid @gray;
border-bottom: @scaled-one-px-value solid @border-regular-control;
}
overflow: hidden;
position: relative;
@ -182,7 +182,7 @@ label {
width: 100%;
resize: none;
margin-bottom: 5px;
border: @scaled-one-px-value solid @gray-dark;
border: @scaled-one-px-value solid @border-regular-control;
height: 100%;
&.disabled {
@ -190,4 +190,62 @@ label {
cursor: default !important;
}
}
}
}
.dropdown-menu {
> li > a {
color: @text-normal;
}
}
textarea {
background-color: @background-normal;
color: @text-normal
}
.btn-edit-table,
.btn-change-shape {
.background-ximage-v2('right-panels/rowscols_icon.png', 84px);
margin-right: 2px !important;
margin-bottom: 1px !important;
}
.btn-edit-table {
background-position: 0 0;
button.over & {
//background-position: -28px 0;
}
.btn-group.open &,
button.active:not(.disabled) &,
button:active:not(.disabled) &
{
//background-position: -56px 0;
}
// TODO: not good, must be controled by variable
.theme-dark & {
background-position-x: -56px;
}
}
.btn-change-shape {
background-position: 0 -16px;
button.over & {
//background-position: -28px -16px;
}
.btn-group.open &,
button.active:not(.disabled) &,
button:active:not(.disabled) &
{
//background-position: -56px -16px;
}
// TODO: not good, must be controled by variable
.theme-dark & {
background-position-x: -56px;
}
}

Some files were not shown because too many files have changed in this diff Show more