Merge branch 'develop' into feature/alt-keys
This commit is contained in:
JuliaSvinareva
commit
a443fcfd2a
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -4,6 +4,7 @@ Thumbs.db
|
|||
/deploy
|
||||
build/node_modules
|
||||
build/sprites/node_modules/
|
||||
vendor/framework7-react/
|
||||
apps/documenteditor/embed/resources/less/node_modules
|
||||
apps/presentationeditor/embed/resources/less/node_modules
|
||||
apps/spreadsheeteditor/embed/resources/less/node_modules
|
||||
|
|
@ -14,6 +15,8 @@ apps/**/main/resources/**/iconssmall*.png
|
|||
apps/**/main/resources/**/iconssmall*.less
|
||||
apps/**/main/resources/**/iconsbig*.png
|
||||
apps/**/main/resources/**/iconsbig*.less
|
||||
apps/**/main/resources/**/iconshuge*.png
|
||||
apps/**/main/resources/**/iconshuge*.less
|
||||
|
||||
|
||||
# test documents
|
||||
|
|
|
|||
|
|
@ -162,6 +162,8 @@
|
|||
macrosMode: 'warn' // warn about automatic macros, 'enable', 'disable', 'warn',
|
||||
trackChanges: undefined // true/false - open editor with track changes mode on/off,
|
||||
hideRulers: false // hide or show rulers on first loading (presentation or document editor)
|
||||
hideNotes: false // hide or show notes panel on first loading (presentation editor)
|
||||
uiTheme: 'theme-dark' // set interface theme: id or default-dark/default-light
|
||||
},
|
||||
coEditing: {
|
||||
mode: 'fast', // <coauthoring mode>, 'fast' or 'strict'. if 'fast' and 'customization.autosave'=false -> set 'customization.autosave'=true
|
||||
|
|
@ -175,6 +177,9 @@
|
|||
"speech/config.json",
|
||||
"clipart/config.json",
|
||||
]
|
||||
},
|
||||
wopi: { // only for wopi
|
||||
FileNameMaxLength: 250 // max filename length for rename, 250 by default
|
||||
}
|
||||
},
|
||||
events: {
|
||||
|
|
@ -688,6 +693,22 @@
|
|||
});
|
||||
};
|
||||
|
||||
var _grabFocus = function(data) {
|
||||
setTimeout(function(){
|
||||
_sendCommand({
|
||||
command: 'grabFocus',
|
||||
data: data
|
||||
});
|
||||
}, 10);
|
||||
};
|
||||
|
||||
var _blurFocus = function(data) {
|
||||
_sendCommand({
|
||||
command: 'blurFocus',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
var _serviceCommand = function(command, data) {
|
||||
_sendCommand({
|
||||
command: 'internalCommand',
|
||||
|
|
@ -720,7 +741,9 @@
|
|||
setMailMergeRecipients: _setMailMergeRecipients,
|
||||
setRevisedFile : _setRevisedFile,
|
||||
setFavorite : _setFavorite,
|
||||
requestClose : _requestClose
|
||||
requestClose : _requestClose,
|
||||
grabFocus : _grabFocus,
|
||||
blurFocus : _blurFocus
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -843,7 +866,8 @@
|
|||
path += app + "/";
|
||||
path += (config.type === "mobile" || isSafari_mobile)
|
||||
? "mobile"
|
||||
: config.type === "embedded"
|
||||
: (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) &&
|
||||
(config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view'))
|
||||
? "embed"
|
||||
: "main";
|
||||
|
||||
|
|
|
|||
355
apps/api/wopi/editor-wopi.ejs
Normal file
355
apps/api/wopi/editor-wopi.ejs
Normal file
|
|
@ -0,0 +1,355 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="mobile-web-app-capable" content="yes" />
|
||||
<!--
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2021
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
-->
|
||||
<title>ONLYOFFICE</title>
|
||||
<style type="text/css">
|
||||
html {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
background: #fff;
|
||||
color: #333;
|
||||
font-family: Arial, Tahoma,sans-serif;
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
overflow-y: hidden;
|
||||
padding: 0;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.form {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
div {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.app-error-panel {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
background-color: #f4f4f4;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.message-block {
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.message-inner {
|
||||
width: 550px;
|
||||
margin: auto;
|
||||
padding: 30px;
|
||||
background-color: #e3e3e3;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 24px;
|
||||
margin: 0 0 14px;
|
||||
}
|
||||
|
||||
.text {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="form">
|
||||
<div id="iframeEditor">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript" src="../../web-apps/apps/api/documents/api.js"></script>
|
||||
<script type="text/javascript" language="javascript">
|
||||
|
||||
var docEditor;
|
||||
var postMessageOrigin;
|
||||
var lang = "en-US";
|
||||
var startTime;
|
||||
var documentChanged;
|
||||
var sendNotificationTimer;
|
||||
var sessionId;
|
||||
var fileInfo;
|
||||
|
||||
var innerAlert = function (message) {
|
||||
if (console && console.log)
|
||||
console.log(message);
|
||||
};
|
||||
|
||||
var commandMap = {
|
||||
'Blur_Focus': function (data) {
|
||||
innerAlert('Blur_Focus');
|
||||
docEditor.blurFocus();
|
||||
},
|
||||
'Grab_Focus': function (data) {
|
||||
innerAlert('Grab_Focus');
|
||||
docEditor.grabFocus();
|
||||
},
|
||||
'Host_PostmessageReady': function (data) {
|
||||
innerAlert('Host_PostmessageReady');
|
||||
}
|
||||
};
|
||||
|
||||
var _postMessage = function(msgId, msgData) {
|
||||
if (window.parent && window.JSON) {
|
||||
msgData = msgData || {};
|
||||
msgData["ui-language"] = lang;
|
||||
msgData["wdUserSession"] = sessionId;
|
||||
var msg = {
|
||||
"MessageId": msgId,
|
||||
"SendTime": Date.now(),
|
||||
"Values": msgData
|
||||
};
|
||||
window.parent.postMessage(window.JSON.stringify(msg), postMessageOrigin);
|
||||
}
|
||||
};
|
||||
|
||||
var _onMessage = function(msg) {
|
||||
if (msg.origin !== postMessageOrigin) return;
|
||||
|
||||
var data = msg.data;
|
||||
if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) {
|
||||
return;
|
||||
}
|
||||
|
||||
var cmd, handler;
|
||||
|
||||
try {
|
||||
cmd = window.JSON.parse(data)
|
||||
} catch(e) {
|
||||
cmd = '';
|
||||
}
|
||||
|
||||
if (cmd) {
|
||||
handler = commandMap[cmd.MessageId];
|
||||
if (handler) {
|
||||
handler.call(this, cmd);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var fn = function(e) { _onMessage(e); };
|
||||
|
||||
if (window.attachEvent) {
|
||||
window.attachEvent('onmessage', fn);
|
||||
} else {
|
||||
window.addEventListener('message', fn, false);
|
||||
}
|
||||
|
||||
var onAppReady = function () {
|
||||
_postMessage('App_LoadingStatus', {
|
||||
"DocumentLoadedTime": Date.now() - startTime
|
||||
});
|
||||
innerAlert("App ready");
|
||||
};
|
||||
|
||||
var sendEditNotification = function () {
|
||||
documentChanged && _postMessage('Edit_Notification', {});
|
||||
documentChanged = false;
|
||||
};
|
||||
|
||||
var onDocumentStateChange = function (event) {
|
||||
if (event.data) {
|
||||
documentChanged = true;
|
||||
if (sendNotificationTimer===undefined) {
|
||||
sendNotificationTimer = setInterval(sendEditNotification, 30000);
|
||||
sendEditNotification();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var onRequestRename = function (event) {
|
||||
if (event.data) {
|
||||
_postMessage('File_Rename', {
|
||||
"NewName": event.data
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
var onRequestClose = function () {
|
||||
if (fileInfo.ClosePostMessage)
|
||||
_postMessage('UI_Close', {});
|
||||
else if (fileInfo.CloseUrl)
|
||||
window.parent.location.href = fileInfo.CloseUrl;
|
||||
};
|
||||
|
||||
var onRequestEditRights = function () {
|
||||
if (fileInfo.EditModePostMessage)
|
||||
_postMessage('UI_Edit', {});
|
||||
else if (fileInfo.HostEditUrl)
|
||||
window.open(fileInfo.HostEditUrl, "_blank");
|
||||
};
|
||||
|
||||
var onRequestSharingSettings = function (event) {
|
||||
if (fileInfo.FileSharingPostMessage)
|
||||
_postMessage('UI_Sharing', {});
|
||||
else if (fileInfo.FileSharingUrl)
|
||||
window.open(fileInfo.FileSharingUrl, "_blank");
|
||||
};
|
||||
|
||||
var onRequestHistory = function (event) {
|
||||
if (fileInfo.FileVersionPostMessage)
|
||||
_postMessage('UI_FileVersions', {});
|
||||
else if (fileInfo.FileVersionUrl)
|
||||
window.open(fileInfo.FileVersionUrl, "_blank");
|
||||
};
|
||||
|
||||
var onError = function (event) {
|
||||
if (event)
|
||||
innerAlert(event.data);
|
||||
};
|
||||
|
||||
var connectEditor = function () {
|
||||
|
||||
fileInfo = <%- JSON.stringify(fileInfo) %>;
|
||||
|
||||
var key = "<%- key %>";
|
||||
var userAuth = <%- JSON.stringify(userAuth) %>;
|
||||
var token = "<%- token %>";
|
||||
var queryParams = <%- JSON.stringify(queryParams) %>;
|
||||
|
||||
if (!fileInfo.BaseFileName) {
|
||||
showError();
|
||||
return;
|
||||
}
|
||||
|
||||
var fileType = fileInfo.BaseFileName ? fileInfo.BaseFileName.substr(fileInfo.BaseFileName.lastIndexOf('.') + 1) : "";
|
||||
var config = {
|
||||
"width": "100%",
|
||||
"height": "100%",
|
||||
"type": "desktop",
|
||||
"documentType": queryParams.documenttype,
|
||||
"token": token,
|
||||
"document": {
|
||||
"title": fileInfo.BreadcrumbDocName || fileInfo.BaseFileName,
|
||||
"url": userAuth.wopiSrc,
|
||||
"fileType": fileInfo.FileExtension ? fileInfo.FileExtension.substr(1) : fileType,
|
||||
"key": key,
|
||||
"info": {
|
||||
"folder": fileInfo.BreadcrumbFolderName
|
||||
},
|
||||
"permissions": {
|
||||
"edit": !fileInfo.ReadOnly && fileInfo.UserCanWrite,
|
||||
"review": (fileInfo.SupportsReviewing===false) ? false : (fileInfo.UserCanReview===false ? false : fileInfo.UserCanReview),
|
||||
"copy": fileInfo.CopyPasteRestrictions!=="CurrentDocumentOnly" && fileInfo.CopyPasteRestrictions!=="BlockAll",
|
||||
"print": !fileInfo.DisablePrint && !fileInfo.HidePrintOption
|
||||
}
|
||||
},
|
||||
"editorConfig": {
|
||||
"mode": queryParams.mode,
|
||||
"lang": queryParams.lang || queryParams.ui || "en-US",
|
||||
"region": queryParams.rs,
|
||||
"callbackUrl": JSON.stringify(userAuth),
|
||||
"user": {
|
||||
"id": fileInfo.UserId,
|
||||
"name": fileInfo.IsAnonymousUser ? "" : fileInfo.UserFriendlyName
|
||||
},
|
||||
"customization": {
|
||||
"about": true,
|
||||
"goback": {
|
||||
"url": fileInfo.BreadcrumbFolderUrl
|
||||
},
|
||||
"customer": {
|
||||
"name": fileInfo.BreadcrumbBrandName,
|
||||
"www": fileInfo.BreadcrumbBrandUrl
|
||||
},
|
||||
"chat": queryParams.dchat!=="1",
|
||||
"uiTheme": queryParams.thm==="1" ? "default-light" : (queryParams.thm==="2" ? "default-dark" : undefined)
|
||||
},
|
||||
"coEditing": {
|
||||
"mode": "fast",
|
||||
"change": false
|
||||
},
|
||||
"wopi": {
|
||||
"FileNameMaxLength": fileInfo.FileNameMaxLength && fileInfo.FileNameMaxLength>0 ? fileInfo.FileNameMaxLength : 250
|
||||
}
|
||||
},
|
||||
"events": {
|
||||
"onAppReady": onAppReady,
|
||||
"onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
|
||||
'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
|
||||
"onError": onError,
|
||||
"onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
|
||||
"onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,
|
||||
"onRequestSharingSettings": fileInfo.FileSharingPostMessage || fileInfo.FileSharingUrl ? onRequestSharingSettings : undefined,
|
||||
"onRequestHistory": fileInfo.FileVersionUrl || fileInfo.FileVersionPostMessage ? onRequestHistory : undefined
|
||||
}
|
||||
};
|
||||
|
||||
postMessageOrigin = fileInfo.PostMessageOrigin;
|
||||
if (postMessageOrigin && (typeof postMessageOrigin === 'string') && postMessageOrigin.charAt(postMessageOrigin.length-1)=='/')
|
||||
postMessageOrigin = postMessageOrigin.substring(0, postMessageOrigin.length - 1);
|
||||
lang = config.editorConfig.lang;
|
||||
sessionId = userAuth.userSessionId;
|
||||
|
||||
startTime = Date.now();
|
||||
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
|
||||
|
||||
fixSize();
|
||||
};
|
||||
|
||||
var fixSize = function () {
|
||||
var wrapEl = document.getElementsByClassName("form");
|
||||
if (wrapEl.length) {
|
||||
wrapEl[0].style.height = screen.availHeight + "px";
|
||||
window.scrollTo(0, -1);
|
||||
wrapEl[0].style.height = window.innerHeight + "px";
|
||||
}
|
||||
};
|
||||
|
||||
var showError = function(msg, title) {
|
||||
msg = msg || 'Sorry, editor could not be loaded. Please contact your administrator.';
|
||||
|
||||
var newDiv = document.createElement("div");
|
||||
newDiv.className = "app-error-panel";
|
||||
newDiv.innerHTML = '<div class="message-block">' +
|
||||
'<div class="message-inner">' +
|
||||
(title ? '<div class="title">' + title + '</div>' : '') +
|
||||
'<div class="text">' + msg + '</div>' +
|
||||
'</div>' +
|
||||
'</div>';
|
||||
document.body.appendChild(newDiv);
|
||||
};
|
||||
|
||||
if (window.addEventListener) {
|
||||
window.addEventListener("load", connectEditor);
|
||||
window.addEventListener("resize", fixSize);
|
||||
} else if (window.attachEvent) {
|
||||
window.attachEvent("onload", connectEditor);
|
||||
window.attachEvent("onresize", fixSize);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
if (Common === undefined)
|
||||
var Common = {};
|
||||
if (window.Common === undefined)
|
||||
window.Common = {};
|
||||
|
||||
Common.component = Common.component || {};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
if (Common === undefined) {
|
||||
var Common = {};
|
||||
if (window.Common === undefined) {
|
||||
window.Common = {};
|
||||
}
|
||||
|
||||
Common.Gateway = new(function() {
|
||||
|
|
@ -130,6 +130,14 @@ if (Common === undefined) {
|
|||
|
||||
'requestClose': function(data) {
|
||||
$me.trigger('requestclose', data);
|
||||
},
|
||||
|
||||
'blurFocus': function(data) {
|
||||
$me.trigger('blurfocus', data);
|
||||
},
|
||||
|
||||
'grabFocus': function(data) {
|
||||
$me.trigger('grabfocus', data);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -143,7 +151,7 @@ if (Common === undefined) {
|
|||
|
||||
var _onMessage = function(msg) {
|
||||
// TODO: check message origin
|
||||
if (msg.origin !== window.parentOrigin && msg.origin !== window.location.origin) return;
|
||||
if (msg.origin !== window.parentOrigin && msg.origin !== window.location.origin && !(msg.origin==="null" && (window.parentOrigin==="file://" || window.location.origin==="file://"))) return;
|
||||
|
||||
var data = msg.data;
|
||||
if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) {
|
||||
|
|
|
|||
137
apps/common/embed/lib/util/LocalStorage.js
Normal file
137
apps/common/embed/lib/util/LocalStorage.js
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2021
|
||||
*
|
||||
* 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
|
||||
*
|
||||
*/
|
||||
|
||||
!window.common && (window.common = {});
|
||||
|
||||
common.localStorage = new (function() {
|
||||
var _storeName, _filter;
|
||||
var _store = {};
|
||||
|
||||
var ongetstore = function(data) {
|
||||
if (data.type == 'localstorage') {
|
||||
_store = data.keys;
|
||||
}
|
||||
};
|
||||
|
||||
Common.Gateway.on('internalcommand', ongetstore);
|
||||
|
||||
var _refresh = function() {
|
||||
if (!_lsAllowed)
|
||||
Common.Gateway.internalMessage('localstorage', {cmd:'get', keys:_filter});
|
||||
};
|
||||
|
||||
var _save = function() {
|
||||
if (!_lsAllowed)
|
||||
Common.Gateway.internalMessage('localstorage', {cmd:'set', keys:_store});
|
||||
};
|
||||
|
||||
var _setItem = function(name, value, just) {
|
||||
if (_lsAllowed) {
|
||||
try
|
||||
{
|
||||
localStorage.setItem(name, value);
|
||||
}
|
||||
catch (error){}
|
||||
|
||||
} else {
|
||||
_store[name] = value;
|
||||
|
||||
if (just===true) {
|
||||
Common.Gateway.internalMessage('localstorage', {
|
||||
cmd:'set',
|
||||
keys: {
|
||||
name: value
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var _setItemAsBool = function(name, value, just) {
|
||||
_setItem(name, value ? 1 : 0, just);
|
||||
};
|
||||
|
||||
var _getItem = function(name) {
|
||||
if (_lsAllowed)
|
||||
return localStorage.getItem(name);
|
||||
else
|
||||
return _store[name]===undefined ? null : _store[name];
|
||||
};
|
||||
|
||||
var _getItemAsBool = function (name, defValue) {
|
||||
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;
|
||||
} catch (e) {
|
||||
_lsAllowed = false;
|
||||
}
|
||||
|
||||
return {
|
||||
getId: function() {
|
||||
return _storeName;
|
||||
},
|
||||
setId: function(name) {
|
||||
_storeName = name;
|
||||
},
|
||||
getItem: _getItem,
|
||||
getBool: _getItemAsBool,
|
||||
setBool: _setItemAsBool,
|
||||
setItem: _setItem,
|
||||
removeItem: _removeItem,
|
||||
setKeysFilter: function(value) {
|
||||
_filter = value;
|
||||
},
|
||||
getKeysFilter: function() {
|
||||
return _filter;
|
||||
},
|
||||
itemExists: _getItemExists,
|
||||
sync: _refresh,
|
||||
save: _save
|
||||
};
|
||||
})();
|
||||
|
|
@ -74,6 +74,24 @@
|
|||
},
|
||||
htmlEncode: function(value) {
|
||||
return $('<div/>').text(value).html();
|
||||
},
|
||||
|
||||
fillUserInfo: function(info, lang, defname, defid) {
|
||||
var _user = info || {};
|
||||
_user.anonymous = !_user.id;
|
||||
!_user.id && (_user.id = defid);
|
||||
_user.fullname = !_user.name ? defname : _user.name;
|
||||
_user.group && (_user.fullname = (_user.group).toString() + AscCommon.UserInfoParser.getSeparator() + _user.fullname);
|
||||
_user.guest = !_user.name;
|
||||
return _user;
|
||||
},
|
||||
|
||||
fixedDigits: function(num, digits, fill) {
|
||||
(fill===undefined) && (fill = '0');
|
||||
var strfill = "",
|
||||
str = num.toString();
|
||||
for (var i=str.length; i<digits; i++) strfill += fill;
|
||||
return strfill + str;
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
|
|
|||
101
apps/common/embed/lib/view/LoadMask.js
Normal file
101
apps/common/embed/lib/view/LoadMask.js
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2021
|
||||
*
|
||||
* 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
|
||||
*
|
||||
*/
|
||||
/**
|
||||
* LoadMask.js
|
||||
*
|
||||
* Displays loading mask over selected element(s) or component. Accepts both single and multiple selectors.
|
||||
*
|
||||
* Created by Julia Radzhabova 24.06.2021
|
||||
* Copyright (c) 2021 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
|
||||
!window.common && (window.common = {});
|
||||
!common.view && (common.view = {});
|
||||
|
||||
common.view.LoadMask = function(owner) {
|
||||
var tpl = '<div class="asc-loadmask-body" role="presentation" tabindex="-1">' +
|
||||
'<i id="loadmask-spinner" class="asc-loadmask-image"></i>' +
|
||||
'<div class="asc-loadmask-title"></div>' +
|
||||
'</div>';
|
||||
var ownerEl = owner || $(document.body),
|
||||
loaderEl,
|
||||
maskedEl,
|
||||
title = '',
|
||||
timerId = 0,
|
||||
rendered = false;
|
||||
return {
|
||||
|
||||
show: function(){
|
||||
if (!loaderEl || !maskedEl) {
|
||||
loaderEl = $(tpl);
|
||||
maskedEl = $('<div class="asc-loadmask"></div>');
|
||||
}
|
||||
|
||||
$('.asc-loadmask-title', loaderEl).html(title);
|
||||
|
||||
// show mask after 500 ms if it wont be hided
|
||||
if (!rendered) {
|
||||
rendered = true;
|
||||
timerId = setTimeout(function () {
|
||||
ownerEl.append(maskedEl);
|
||||
ownerEl.append(loaderEl);
|
||||
|
||||
loaderEl.css('min-width', $('.asc-loadmask-title', loaderEl).width() + 105);
|
||||
},500);
|
||||
}
|
||||
},
|
||||
|
||||
hide: function() {
|
||||
if (timerId) {
|
||||
clearTimeout(timerId);
|
||||
timerId = 0;
|
||||
}
|
||||
maskedEl && maskedEl.remove();
|
||||
loaderEl && loaderEl.remove();
|
||||
maskedEl = loaderEl = null;
|
||||
rendered = false;
|
||||
},
|
||||
|
||||
setTitle: function(text) {
|
||||
title = text;
|
||||
|
||||
if (ownerEl && loaderEl){
|
||||
var el = $('.asc-loadmask-title', loaderEl);
|
||||
el.html(title);
|
||||
loaderEl.css('min-width', el.width() + 105);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1,80 +1,152 @@
|
|||
<svg width="260" height="40" viewBox="0 0 260 40" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon-menu-sprite">
|
||||
<svg width="380" height="40" viewBox="0 0 380 40" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="icon-menu-sprite Embedded Viewer">
|
||||
<g id="view-settings">
|
||||
<path d="M17 26H3V27H17V26Z" fill="white"/>
|
||||
<path d="M17 30H3V31H17V30Z" fill="white"/>
|
||||
<path d="M3 34H17V35H3V34Z" fill="white"/>
|
||||
<path id="Vector" d="M17 26H3V27H17V26Z" fill="white"/>
|
||||
<path id="Vector_2" d="M17 30H3V31H17V30Z" fill="white"/>
|
||||
<path id="Vector_3" d="M17 34H3V35H17V34Z" fill="white"/>
|
||||
</g>
|
||||
<g id="download">
|
||||
<path d="M30 22H31V33.2929L35.6464 28.6464L36.3535 29.3536L30.5 35.2071L24.6464 29.3536L25.3535 28.6464L30 33.2929V22Z" fill="white"/>
|
||||
<path d="M37 36H24V37H37V36Z" fill="white"/>
|
||||
<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M31 22H30V33.2929L25.3536 28.6464L24.6465 29.3536L30.1465 34.8536L30.5 35.2071L30.8536 34.8536L36.3536 29.3536L35.6465 28.6464L31 33.2929V22Z" fill="white"/>
|
||||
<rect id="Rectangle 88" x="24" y="36" width="13" height="1" fill="white"/>
|
||||
</g>
|
||||
<g id="share">
|
||||
<path id="share_2" d="M56 25C56 26.1046 55.1046 27 54 27C53.4663 27 52.9815 26.791 52.6229 26.4503L47.9076 29.3974C47.9676 29.5875 48 29.79 48 30C48 30.21 47.9676 30.4125 47.9076 30.6026L52.6229 33.5497C52.9815 33.209 53.4663 33 54 33C55.1046 33 56 33.8954 56 35C56 36.1046 55.1046 37 54 37C52.8954 37 52 36.1046 52 35C52 34.79 52.0324 34.5875 52.0924 34.3974L47.3771 31.4503C47.0185 31.791 46.5337 32 46 32C44.8954 32 44 31.1046 44 30C44 28.8954 44.8954 28 46 28C46.5337 28 47.0185 28.209 47.3771 28.5497L52.0924 25.6026C52.0324 25.4125 52 25.21 52 25C52 23.8954 52.8954 23 54 23C55.1046 23 56 23.8954 56 25Z" fill="white"/>
|
||||
</g>
|
||||
<path id="share" d="M56 25C56 26.1046 55.1046 27 54 27C53.4663 27 52.9815 26.791 52.6229 26.4503L47.9076 29.3974C47.9676 29.5875 48 29.79 48 30C48 30.21 47.9676 30.4125 47.9076 30.6026L52.6229 33.5497C52.9815 33.209 53.4663 33 54 33C55.1046 33 56 33.8954 56 35C56 36.1046 55.1046 37 54 37C52.8954 37 52 36.1046 52 35C52 34.79 52.0324 34.5875 52.0924 34.3974L47.3771 31.4503C47.0185 31.791 46.5337 32 46 32C44.8954 32 44 31.1046 44 30C44 28.8954 44.8954 28 46 28C46.5337 28 47.0185 28.209 47.3771 28.5497L52.0924 25.6026C52.0324 25.4125 52 25.21 52 25C52 23.8954 52.8954 23 54 23C55.1046 23 56 23.8954 56 25Z" fill="white"/>
|
||||
<g id="embed ">
|
||||
<path d="M67.8536 25.3536L67.1465 24.6465L62.2929 29.5L67.1465 34.3536L67.8536 33.6465L63.7071 29.5L67.8536 25.3536Z" fill="white"/>
|
||||
<path d="M72.1465 25.3536L72.8536 24.6465L77.7071 29.5L72.8536 34.3536L72.1465 33.6465L76.2929 29.5L72.1465 25.3536Z" fill="white"/>
|
||||
<g id="embed _2">
|
||||
<path d="M67.8536 25.3536L67.1465 24.6465L62.293 29.5L67.1465 34.3536L67.8536 33.6465L63.7072 29.5L67.8536 25.3536Z" fill="white"/>
|
||||
<path d="M72.1465 25.3536L72.8536 24.6465L77.7072 29.5L72.8536 34.3536L72.1465 33.6465L76.293 29.5L72.1465 25.3536Z" fill="white"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="full-screen">
|
||||
<path d="M97 23V26H96V24L94 24V23L97 23Z" fill="white"/>
|
||||
<path d="M86 23H83V26H84V24H86V23Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M86 26V34H94V26H86ZM93 27H87V33H93V27Z" fill="white"/>
|
||||
<path d="M94 37H97V34H96V36H94V37Z" fill="white"/>
|
||||
<path d="M83 37L83 34H84L84 36H86V37H83Z" fill="white"/>
|
||||
<path id="Rectangle 81 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M93 27H87V33H93V27ZM86 26V34H94V26H86Z" fill="white"/>
|
||||
<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M86 23H83V26H84V24H86V23Z" fill="white"/>
|
||||
<path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd" d="M97 26L97 23L94 23L94 24L96 24L96 26L97 26Z" fill="white"/>
|
||||
<path id="Subtract_3" fill-rule="evenodd" clip-rule="evenodd" d="M94 37L97 37L97 34L96 34L96 36L94 36L94 37Z" fill="white"/>
|
||||
<path id="Subtract_4" fill-rule="evenodd" clip-rule="evenodd" d="M83 34L83 37L86 37L86 36L84 36L84 34L83 34Z" fill="white"/>
|
||||
</g>
|
||||
<g id="zoom-in">
|
||||
<path id="Union_2" fill-rule="evenodd" clip-rule="evenodd" d="M111 25H110V30H105V31H110V36H111V31H116V30H111V25Z" fill="white"/>
|
||||
</g>
|
||||
<g id="zoom-out">
|
||||
<rect id="Rectangle 44.8" x="135" y="30" width="1" height="10" transform="rotate(90 135 30)" fill="white"/>
|
||||
</g>
|
||||
<path id="zoom-in" fill-rule="evenodd" clip-rule="evenodd" d="M111 25H110V30H105V31H110V36H111V31H116V30H111V25Z" fill="white"/>
|
||||
<rect id="zoom-out" x="135" y="30" width="1" height="10" transform="rotate(90 135 30)" fill="white"/>
|
||||
<g id="scroll-to-first-sheet">
|
||||
<path d="M146 25H145V35H146V25Z" fill="white"/>
|
||||
<path d="M147 30L155 25V35L147 30Z" fill="white"/>
|
||||
<path id="Vector 13 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M155 25L147 30L155 35V25Z" fill="white"/>
|
||||
<path id="Rectangle 225" d="M145 25H146V35H145V25Z" fill="white"/>
|
||||
</g>
|
||||
<g id="scroll-to-last-sheet">
|
||||
<path d="M173 30L165 35V25L173 30Z" fill="white"/>
|
||||
<path d="M175 35H174V25H175V35Z" fill="white"/>
|
||||
<path id="Vector 13 (Stroke)_2" fill-rule="evenodd" clip-rule="evenodd" d="M165 35L173 30L165 25V35Z" fill="white"/>
|
||||
<path id="Rectangle 225 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M174 35H175V25H174V35Z" fill="white"/>
|
||||
</g>
|
||||
<g id="play">
|
||||
<path id="Vector 8 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M185 23L198 30L185 37V23Z" fill="white"/>
|
||||
</g>
|
||||
<path id="play" fill-rule="evenodd" clip-rule="evenodd" d="M185 23L198 30L185 37V23Z" fill="white"/>
|
||||
<g id="pause">
|
||||
<path d="M205 35V25H209V35H205Z" fill="white"/>
|
||||
<path d="M211 35V25H215V35H211Z" fill="white"/>
|
||||
<path id="Rectangle 81 (Stroke)_2" fill-rule="evenodd" clip-rule="evenodd" d="M205 25V35H209V25H205Z" fill="white"/>
|
||||
<path id="Rectangle 81.1 (Stroke)" fill-rule="evenodd" clip-rule="evenodd" d="M211 25V35H215V25H211Z" fill="white"/>
|
||||
</g>
|
||||
<g id=" print">
|
||||
<path id="Union_3" fill-rule="evenodd" clip-rule="evenodd" d="M226 24H234V26H226V24ZM225 26V24C225 23.4477 225.448 23 226 23H234C234.552 23 235 23.4477 235 24V26H237C237.552 26 238 26.4477 238 27V33C238 33.5523 237.552 34 237 34H235V36C235 36.5523 234.552 37 234 37H226C225.448 37 225 36.5523 225 36V34H223C222.448 34 222 33.5523 222 33V27C222 26.4477 222.448 26 223 26H225ZM225 33V31C225 30.4477 225.448 30 226 30H234C234.552 30 235 30.4477 235 31V33H237V27H234H226H223V33H225ZM225 28H224V29H225V28ZM234 31H226V36H234V31ZM227 32H233V33H227V32ZM233 34H227V35H233V34Z" fill="white"/>
|
||||
</g>
|
||||
<g id="clear-style">
|
||||
<path id="Union_4" fill-rule="evenodd" clip-rule="evenodd" d="M253.268 24.5608C252.291 23.5845 250.708 23.5845 249.732 24.5608L243.561 30.7324C242.584 31.7087 242.584 33.2916 243.561 34.268L245.146 35.8537L245.293 36.0002L245.5 36.0002H249.5L249.707 36.0002L255 36.0002V35.0002H250.707L255.439 30.268C256.416 29.2916 256.416 27.7087 255.439 26.7324L253.268 24.5608ZM249.293 35.0002L252.793 31.5002L248.5 27.2073L244.268 31.4395C243.682 32.0253 243.682 32.9751 244.268 33.5609L245.707 35.0002L249.293 35.0002ZM249.207 26.5002L253.5 30.7931L254.732 29.5608C255.318 28.9751 255.318 28.0253 254.732 27.4395L252.561 25.268C251.975 24.6822 251.025 24.6822 250.439 25.268L249.207 26.5002Z" fill="white"/>
|
||||
</g>
|
||||
<path id="print" fill-rule="evenodd" clip-rule="evenodd" d="M226 24H234V26H226V24ZM225 26V24C225 23.4477 225.448 23 226 23H234C234.552 23 235 23.4477 235 24V26H237C237.552 26 238 26.4477 238 27V33C238 33.5523 237.552 34 237 34H235V36C235 36.5523 234.552 37 234 37H226C225.448 37 225 36.5523 225 36V34H223C222.448 34 222 33.5523 222 33V27C222 26.4477 222.448 26 223 26H225ZM225 33V31C225 30.4477 225.448 30 226 30H234C234.552 30 235 30.4477 235 31V33H237V27H234H226H223V33H225ZM225 28H224V29H225V28ZM234 31H226V36H234V31ZM227 32H233V33H227V32ZM233 34H227V35H233V34Z" fill="white"/>
|
||||
<path id="close" fill-rule="evenodd" clip-rule="evenodd" d="M249.439 29.5L245.47 25.5303L246.53 24.4697L250.5 28.4393L254.47 24.4697L255.53 25.5303L251.561 29.5L255.53 33.4697L254.47 34.5303L250.5 30.5607L246.53 34.5303L245.47 33.4697L249.439 29.5Z" fill="white"/>
|
||||
<g id="view-settings_2">
|
||||
<path d="M17 6H3V7H17V6Z" fill="black"/>
|
||||
<path d="M17 10H3V11H17V10Z" fill="black"/>
|
||||
<path d="M3 14H17V15H3V14Z" fill="black"/>
|
||||
<path id="Vector_4" d="M17 6H3V7H17V6Z" fill="black"/>
|
||||
<path id="Vector_5" d="M17 10H3V11H17V10Z" fill="black"/>
|
||||
<path id="Vector_6" d="M17 14H3V15H17V14Z" fill="black"/>
|
||||
</g>
|
||||
<g id="download_2">
|
||||
<path d="M30 2H31V13.2929L35.6464 8.64645L36.3535 9.35355L30.5 15.2071L24.6464 9.35355L25.3535 8.64645L30 13.2929V2Z" fill="black"/>
|
||||
<path d="M37 16H24V17H37V16Z" fill="black"/>
|
||||
<path id="Union_5" fill-rule="evenodd" clip-rule="evenodd" d="M31 2H30V13.2929L25.3536 8.64645L24.6465 9.35355L30.1465 14.8536L30.5 15.2071L30.8536 14.8536L36.3536 9.35355L35.6465 8.64645L31 13.2929V2Z" fill="black"/>
|
||||
<rect id="Rectangle 88_2" x="24" y="16" width="13" height="1" fill="black"/>
|
||||
</g>
|
||||
<g id="share_3">
|
||||
<path id="share_4" d="M56 5C56 6.10457 55.1046 7 54 7C53.4663 7 52.9815 6.79098 52.6229 6.45034L47.9076 9.39737C47.9676 9.58754 48 9.78999 48 10C48 10.21 47.9676 10.4125 47.9076 10.6026L52.6229 13.5497C52.9815 13.209 53.4663 13 54 13C55.1046 13 56 13.8954 56 15C56 16.1046 55.1046 17 54 17C52.8954 17 52 16.1046 52 15C52 14.79 52.0324 14.5875 52.0924 14.3974L47.3771 11.4503C47.0185 11.791 46.5337 12 46 12C44.8954 12 44 11.1046 44 10C44 8.89543 44.8954 8 46 8C46.5337 8 47.0185 8.20902 47.3771 8.54966L52.0924 5.60264C52.0324 5.41246 52 5.21001 52 5C52 3.89543 52.8954 3 54 3C55.1046 3 56 3.89543 56 5Z" fill="black"/>
|
||||
</g>
|
||||
<g id="embed _3">
|
||||
<g id="embed _4">
|
||||
<path d="M67.8536 5.35359L67.1465 4.64648L62.293 9.50004L67.1465 14.3536L67.8536 13.6465L63.7072 9.50004L67.8536 5.35359Z" fill="black"/>
|
||||
<path d="M72.1465 5.35359L72.8536 4.64648L77.7072 9.50004L72.8536 14.3536L72.1465 13.6465L76.293 9.50004L72.1465 5.35359Z" fill="black"/>
|
||||
</g>
|
||||
<path id="Union" d="M56 5C56 6.10457 55.1046 7 54 7C53.4663 7 52.9815 6.79098 52.6229 6.45034L47.9076 9.39737C47.9676 9.58754 48 9.78999 48 10C48 10.21 47.9676 10.4125 47.9076 10.6026L52.6229 13.5497C52.9815 13.209 53.4663 13 54 13C55.1046 13 56 13.8954 56 15C56 16.1046 55.1046 17 54 17C52.8954 17 52 16.1046 52 15C52 14.79 52.0324 14.5875 52.0924 14.3974L47.3771 11.4503C47.0185 11.791 46.5337 12 46 12C44.8954 12 44 11.1046 44 10C44 8.89543 44.8954 8 46 8C46.5337 8 47.0185 8.20902 47.3771 8.54966L52.0924 5.60264C52.0324 5.41246 52 5.21001 52 5C52 3.89543 52.8954 3 54 3C55.1046 3 56 3.89543 56 5Z" fill="black"/>
|
||||
<g id="embed _2">
|
||||
<path d="M67.8536 5.35359L67.1465 4.64648L62.2929 9.50004L67.1465 14.3536L67.8536 13.6465L63.7071 9.50004L67.8536 5.35359Z" fill="black"/>
|
||||
<path d="M72.1465 5.35359L72.8536 4.64648L77.7071 9.50004L72.8536 14.3536L72.1465 13.6465L76.2929 9.50004L72.1465 5.35359Z" fill="black"/>
|
||||
</g>
|
||||
<g id="full-screen_2">
|
||||
<path d="M97 3V6H96V4L94 4V3L97 3Z" fill="black"/>
|
||||
<path d="M86 3H83V6H84V4H86V3Z" fill="black"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M86 6V14H94V6H86ZM93 7H87V13H93V7Z" fill="black"/>
|
||||
<path d="M94 17H97V14H96V16H94V17Z" fill="black"/>
|
||||
<path d="M83 17L83 14H84L84 16H86V17H83Z" fill="black"/>
|
||||
<path id="Rectangle 81 (Stroke)_3" fill-rule="evenodd" clip-rule="evenodd" d="M93 7H87V13H93V7ZM86 6V14H94V6H86Z" fill="black"/>
|
||||
<path id="Subtract_5" fill-rule="evenodd" clip-rule="evenodd" d="M86 3H83V6H84V4H86V3Z" fill="black"/>
|
||||
<path id="Subtract_6" fill-rule="evenodd" clip-rule="evenodd" d="M97 6L97 3L94 3L94 4L96 4L96 6L97 6Z" fill="black"/>
|
||||
<path id="Subtract_7" fill-rule="evenodd" clip-rule="evenodd" d="M94 17L97 17L97 14L96 14L96 16L94 16L94 17Z" fill="black"/>
|
||||
<path id="Subtract_8" fill-rule="evenodd" clip-rule="evenodd" d="M83 14L83 17L86 17L86 16L84 16L84 14L83 14Z" fill="black"/>
|
||||
</g>
|
||||
<g id="zoom-in_2">
|
||||
<path id="Union_6" fill-rule="evenodd" clip-rule="evenodd" d="M111 5H110V10H105V11H110V16H111V11H116V10H111V5Z" fill="black"/>
|
||||
</g>
|
||||
<g id="zoom-out_2">
|
||||
<rect id="Rectangle 44.8_2" x="135" y="10" width="1" height="10" transform="rotate(90 135 10)" fill="black"/>
|
||||
</g>
|
||||
<path id="zoom-in_2" fill-rule="evenodd" clip-rule="evenodd" d="M111 5H110V10H105V11H110V16H111V11H116V10H111V5Z" fill="black"/>
|
||||
<rect id="zoom-out_2" x="135" y="10" width="1" height="10" transform="rotate(90 135 10)" fill="black"/>
|
||||
<g id="scroll-to-first-sheet_2">
|
||||
<path d="M146 5H145V15H146V5Z" fill="black"/>
|
||||
<path d="M147 10L155 5V15L147 10Z" fill="black"/>
|
||||
<path id="Vector 13 (Stroke)_3" fill-rule="evenodd" clip-rule="evenodd" d="M155 5L147 10L155 15V5Z" fill="black"/>
|
||||
<path id="Rectangle 225_2" d="M145 5H146V15H145V5Z" fill="black"/>
|
||||
</g>
|
||||
<g id="scroll-to-last-sheet_2">
|
||||
<path d="M173 10L165 15V5L173 10Z" fill="black"/>
|
||||
<path d="M175 15H174V5H175V15Z" fill="black"/>
|
||||
<path id="Vector 13 (Stroke)_4" fill-rule="evenodd" clip-rule="evenodd" d="M165 15L173 10L165 5V15Z" fill="black"/>
|
||||
<path id="Rectangle 225 (Stroke)_2" fill-rule="evenodd" clip-rule="evenodd" d="M174 15H175V5H174V15Z" fill="black"/>
|
||||
</g>
|
||||
<g id="play_2">
|
||||
<path id="Vector 8 (Stroke)_2" fill-rule="evenodd" clip-rule="evenodd" d="M185 3L198 10L185 17V3Z" fill="black"/>
|
||||
</g>
|
||||
<path id="play_2" fill-rule="evenodd" clip-rule="evenodd" d="M185 3L198 10L185 17V3Z" fill="black"/>
|
||||
<g id="pause_2">
|
||||
<path d="M205 15V5H209V15H205Z" fill="black"/>
|
||||
<path d="M211 15V5H215V15H211Z" fill="black"/>
|
||||
<path id="Rectangle 81 (Stroke)_4" fill-rule="evenodd" clip-rule="evenodd" d="M205 5V15H209V5H205Z" fill="black"/>
|
||||
<path id="Rectangle 81.1 (Stroke)_2" fill-rule="evenodd" clip-rule="evenodd" d="M211 5V15H215V5H211Z" fill="black"/>
|
||||
</g>
|
||||
<g id=" print_2">
|
||||
<path id="Union_7" fill-rule="evenodd" clip-rule="evenodd" d="M226 4H234V6H226V4ZM225 6V4C225 3.44772 225.448 3 226 3H234C234.552 3 235 3.44772 235 4V6H237C237.552 6 238 6.44772 238 7V13C238 13.5523 237.552 14 237 14H235V16C235 16.5523 234.552 17 234 17H226C225.448 17 225 16.5523 225 16V14H223C222.448 14 222 13.5523 222 13V7C222 6.44772 222.448 6 223 6H225ZM225 13V11C225 10.4477 225.448 10 226 10H234C234.552 10 235 10.4477 235 11V13H237V7H234H226H223V13H225ZM225 8H224V9H225V8ZM234 11H226V16H234V11ZM227 12H233V13H227V12ZM233 14H227V15H233V14Z" fill="black"/>
|
||||
</g>
|
||||
<g id="clear-style_2">
|
||||
<path id="Union_8" fill-rule="evenodd" clip-rule="evenodd" d="M253.268 4.56085C252.291 3.58454 250.708 3.58453 249.732 4.56085L243.561 10.7324C242.584 11.7087 242.584 13.2916 243.561 14.268L245.146 15.8537L245.293 16.0002L245.5 16.0002H249.5L249.707 16.0002L255 16.0002V15.0002H250.707L255.439 10.268C256.416 9.29164 256.416 7.70873 255.439 6.73242L253.268 4.56085ZM249.293 15.0002L252.793 11.5002L248.5 7.20729L244.268 11.4395C243.682 12.0253 243.682 12.9751 244.268 13.5609L245.707 15.0002L249.293 15.0002ZM249.207 6.50019L253.5 10.7931L254.732 9.56085C255.318 8.97506 255.318 8.02531 254.732 7.43953L252.561 5.26795C251.975 4.68217 251.025 4.68217 250.439 5.26795L249.207 6.50019Z" fill="black"/>
|
||||
</g>
|
||||
<g id="edit">
|
||||
<path id="Vector_7" d="M263 34V37H266L274 29L271 26L263 34Z" fill="white"/>
|
||||
<path id="Vector 2" d="M275 28L272 25L274 23H275L277 25V26L275 28Z" fill="white"/>
|
||||
</g>
|
||||
<g id="more-vertical">
|
||||
<circle id="Ellipse" cx="290" cy="26" r="1" transform="rotate(90 290 26)" fill="white"/>
|
||||
<circle id="Ellipse_2" cx="290" cy="30" r="1" transform="rotate(90 290 30)" fill="white"/>
|
||||
<circle id="Ellipse_3" cx="290" cy="34" r="1" transform="rotate(90 290 34)" fill="white"/>
|
||||
</g>
|
||||
<g id="go-to-location">
|
||||
<path id="Vector_8" d="M317 26H311V25C311 24.45 310.55 24 310 24H303C302.45 24 302 24.45 302 25V36C302 36.55 302.45 37 303 37H317C317.55 37 318 36.55 318 36V27C318 26.45 317.55 26 317 26ZM317 36H303V25H310V27H317V36Z" fill="white"/>
|
||||
<path id="Union_9" fill-rule="evenodd" clip-rule="evenodd" d="M309.646 33.6465L310.354 34.3536L313.207 31.5L310.354 28.6465L309.646 29.3536L311.268 30.9747H306V31.9747H311.318L309.646 33.6465Z" fill="white"/>
|
||||
</g>
|
||||
<g id="arrow-down">
|
||||
<path id="Union_10" fill-rule="evenodd" clip-rule="evenodd" d="M331 23H330V34.2929L325.354 29.6464L324.646 30.3536L330.146 35.8536L330.5 36.2071L330.854 35.8536L336.354 30.3536L335.646 29.6464L331 34.2929V23Z" fill="white"/>
|
||||
</g>
|
||||
<g id="edit_2">
|
||||
<path id="Vector_9" d="M263 14V17H266L274 9L271 6L263 14Z" fill="black"/>
|
||||
<path id="Vector 2_2" d="M275 8L272 5L274 3H275L277 5V6L275 8Z" fill="black"/>
|
||||
</g>
|
||||
<g id="more-vertical_2">
|
||||
<circle id="Ellipse_4" cx="290" cy="6" r="1" transform="rotate(90 290 6)" fill="black"/>
|
||||
<circle id="Ellipse_5" cx="290" cy="10" r="1" transform="rotate(90 290 10)" fill="black"/>
|
||||
<circle id="Ellipse_6" cx="290" cy="14" r="1" transform="rotate(90 290 14)" fill="black"/>
|
||||
</g>
|
||||
<g id="go-to-location_2">
|
||||
<path id="Vector_10" d="M317 6H311V5C311 4.45 310.55 4 310 4H303C302.45 4 302 4.45 302 5V16C302 16.55 302.45 17 303 17H317C317.55 17 318 16.55 318 16V7C318 6.45 317.55 6 317 6ZM317 16H303V5H310V7H317V16Z" fill="black"/>
|
||||
<path id="Union_11" fill-rule="evenodd" clip-rule="evenodd" d="M309.646 13.6465L310.354 14.3536L313.207 11.5L310.354 8.64648L309.646 9.35359L311.268 10.9747H306V11.9747H311.318L309.646 13.6465Z" fill="black"/>
|
||||
</g>
|
||||
<g id="arrow-down_2">
|
||||
<path id="Union_12" fill-rule="evenodd" clip-rule="evenodd" d="M331 3H330V14.2929L325.354 9.64645L324.646 10.3536L330.146 15.8536L330.5 16.2071L330.854 15.8536L336.354 10.3536L335.646 9.64645L331 14.2929V3Z" fill="black"/>
|
||||
</g>
|
||||
<g id="arrow-up">
|
||||
<path id="Union_13" fill-rule="evenodd" clip-rule="evenodd" d="M350 36.207L351 36.207L351 24.9141L355.646 29.5606L356.354 28.8535L350.854 23.3535L350.5 22.9999L350.146 23.3535L344.646 28.8535L345.354 29.5606L350 24.9141L350 36.207Z" fill="white"/>
|
||||
</g>
|
||||
<g id="arrow-up_2">
|
||||
<path id="Union_14" fill-rule="evenodd" clip-rule="evenodd" d="M350 16.207L351 16.207L351 4.91414L355.646 9.56059L356.354 8.85348L350.854 3.35348L350.5 2.99993L350.146 3.35348L344.646 8.85348L345.354 9.56059L350 4.91414L350 16.207Z" fill="black"/>
|
||||
</g>
|
||||
<g id="close">
|
||||
<path id="Vector 73" d="M366 25L375 34M375 25L366 34" stroke="white" stroke-width="1.5"/>
|
||||
</g>
|
||||
<g id="close_2">
|
||||
<path id="Vector 73_2" d="M366 5L375 14M375 5L366 14" stroke="black" stroke-width="1.5"/>
|
||||
</g>
|
||||
<path id="print_2" fill-rule="evenodd" clip-rule="evenodd" d="M226 4H234V6H226V4ZM225 6V4C225 3.44772 225.448 3 226 3H234C234.552 3 235 3.44772 235 4V6H237C237.552 6 238 6.44772 238 7V13C238 13.5523 237.552 14 237 14H235V16C235 16.5523 234.552 17 234 17H226C225.448 17 225 16.5523 225 16V14H223C222.448 14 222 13.5523 222 13V7C222 6.44772 222.448 6 223 6H225ZM225 13V11C225 10.4477 225.448 10 226 10H234C234.552 10 235 10.4477 235 11V13H237V7H234H226H223V13H225ZM225 8H224V9H225V8ZM234 11H226V16H234V11ZM227 12H233V13H227V12ZM233 14H227V15H233V14Z" fill="black"/>
|
||||
<path id="close_2" fill-rule="evenodd" clip-rule="evenodd" d="M249.439 9.5L245.47 5.53033L246.53 4.46967L250.5 8.43934L254.47 4.46967L255.53 5.53033L251.561 9.5L255.53 13.4697L254.47 14.5303L250.5 10.5607L246.53 14.5303L245.47 13.4697L249.439 9.5Z" fill="black"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 12 KiB |
BIN
apps/common/embed/resources/img/next-field.png
Normal file
BIN
apps/common/embed/resources/img/next-field.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 323 B |
BIN
apps/common/embed/resources/img/previous-field.png
Normal file
BIN
apps/common/embed/resources/img/previous-field.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 323 B |
|
|
@ -53,16 +53,24 @@
|
|||
@import "../../../../../vendor/bootstrap/less/responsive-utilities.less";
|
||||
|
||||
|
||||
@import "loadmask.less";
|
||||
|
||||
@toolbarBorderColor: #dbdbdb;
|
||||
@toolbarBorderShadowColor: #FAFAFA;
|
||||
@toolbarTopColor: #EBEBEB;
|
||||
@toolbarTopColor: #F7F7F7;
|
||||
@toolbarBottomColor: #CCCCCC;
|
||||
@toolbarHoverColor: #7698DE;
|
||||
@toolbarFontSize: 12px;
|
||||
@buttonFontSize: 11px;
|
||||
@controlBtnHoverTopColor: #6180C4;
|
||||
@controlBtnHoverBottomColor: #8AACF1;
|
||||
@btnColor: #d8dadc;
|
||||
@btnActiveColor: #7d858c;
|
||||
@btnColored: #446995;
|
||||
@btnActiveColored: #293F59;
|
||||
@btnHoverColored: #375478;
|
||||
@notificationColor: #fcfed7;
|
||||
|
||||
@iconSpriteCommonPath: "../../../../common/embed/resources/img/glyphicons.png";
|
||||
@icon-socnet-size: 40px;
|
||||
|
||||
|
|
@ -91,13 +99,13 @@
|
|||
right: 0;
|
||||
|
||||
&.top {
|
||||
top: 32px;
|
||||
top: 48px;
|
||||
bottom: 0;
|
||||
}
|
||||
|
||||
&.bottom {
|
||||
top: 0;
|
||||
bottom: 30px;
|
||||
bottom: 46px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -110,11 +118,15 @@
|
|||
z-index: 100;
|
||||
background-color: @toolbarTopColor;
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
|
||||
&.top {
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 32px;
|
||||
height: 48px;
|
||||
|
||||
-webkit-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
|
||||
//-moz-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
|
||||
|
|
@ -125,7 +137,7 @@
|
|||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
height: 46px;
|
||||
|
||||
-webkit-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
|
||||
//-moz-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
|
||||
|
|
@ -133,11 +145,6 @@
|
|||
}
|
||||
|
||||
.group {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
|
|
@ -161,6 +168,11 @@
|
|||
.item {
|
||||
float: left;
|
||||
}
|
||||
|
||||
& > div {
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
|
||||
&.right {
|
||||
|
|
@ -168,13 +180,21 @@
|
|||
padding-right: 10px;
|
||||
|
||||
.item {
|
||||
float: left;
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
&.center {
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-grow: 1;
|
||||
overflow: hidden;
|
||||
padding: 0 20px;
|
||||
|
||||
#title-doc-name {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
|
||||
.separator {
|
||||
|
|
@ -199,6 +219,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
.margin-right-small {
|
||||
margin-right: 8px;
|
||||
}
|
||||
.margin-right-large {
|
||||
margin-right: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
// Logo
|
||||
|
|
@ -219,17 +245,49 @@
|
|||
background-color: transparent;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 2px;
|
||||
//margin: 0;
|
||||
|
||||
&.no-caption {
|
||||
padding: 1px 2px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
background-origin: content-box;
|
||||
padding: 0 1px;
|
||||
font-size: @buttonFontSize;
|
||||
|
||||
&.has-caption {
|
||||
width: auto;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
// Hover state
|
||||
&:hover {
|
||||
color: @toolbarHoverColor;
|
||||
&.colored {
|
||||
padding: 0 16px;
|
||||
height: 28px;
|
||||
background-color: @btnColored;
|
||||
border-radius: 3px;
|
||||
color: #ffffff;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
// Hover state
|
||||
&:hover:not(:disabled) {
|
||||
text-decoration: none;
|
||||
text-shadow: 0 1px 0 @toolbarBorderShadowColor;
|
||||
background-color: @btnColor;
|
||||
|
||||
&.colored {
|
||||
background-color: @btnHoverColored;
|
||||
}
|
||||
}
|
||||
|
||||
&:active:not(:disabled) {
|
||||
&, .btn-icon {
|
||||
background-position-y: -@icon-height !important;
|
||||
}
|
||||
|
||||
&.has-caption {
|
||||
color: #ffffff
|
||||
}
|
||||
|
||||
&.colored {
|
||||
background-color: @btnActiveColored;
|
||||
}
|
||||
}
|
||||
|
||||
// Focus state for keyboard and accessibility
|
||||
|
|
@ -239,12 +297,16 @@
|
|||
}
|
||||
|
||||
// Active state
|
||||
&.active,
|
||||
&:active {
|
||||
&.active:not(:disabled),
|
||||
&:active:not(:disabled) {
|
||||
outline: none;
|
||||
border: 1px solid @btnActiveColor;
|
||||
background-color: @btnActiveColor;
|
||||
}
|
||||
|
||||
&[disabled] {
|
||||
opacity: 0.4;
|
||||
}
|
||||
}
|
||||
|
||||
// Overlay control
|
||||
|
|
@ -435,7 +497,7 @@
|
|||
@icon-height: 20px;
|
||||
.svg-icon {
|
||||
background: data-uri('../../../../common/embed/resources/img/icon-menu-sprite.svg') no-repeat;
|
||||
background-size: @icon-width*13 @icon-height*2;
|
||||
background-size: @icon-width*19 @icon-height*2;
|
||||
|
||||
&.download {
|
||||
background-position: -@icon-width 0;
|
||||
|
|
@ -473,14 +535,35 @@
|
|||
&.print {
|
||||
background-position: -@icon-width*11 0;
|
||||
}
|
||||
|
||||
&.arrow-up {
|
||||
background-position: -@icon-width*17 0;
|
||||
}
|
||||
&.arrow-down {
|
||||
background-position: -@icon-width*16 0;
|
||||
}
|
||||
&.clear-style {
|
||||
background-position: -@icon-width*12 0;
|
||||
}
|
||||
&.go-to-location {
|
||||
background-position: -@icon-width*15 0;
|
||||
}
|
||||
&.more-vertical {
|
||||
background-position: -@icon-width*14 0;
|
||||
}
|
||||
}
|
||||
|
||||
.mi-icon {
|
||||
width: @icon-width;
|
||||
height: @icon-height;
|
||||
//display: inline-block;
|
||||
float: left;
|
||||
margin: 0 15px 0 -15px;
|
||||
margin: -3px 4px 0 -24px;
|
||||
}
|
||||
.btn-icon {
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.btn, button {
|
||||
|
|
@ -547,35 +630,30 @@
|
|||
|
||||
.dropdown-menu {
|
||||
> li > a {
|
||||
padding: 8px 20px 8px 31px;
|
||||
padding: 8px 20px 8px 28px;
|
||||
&:hover, &:focus {
|
||||
background-color: @btnColor;
|
||||
outline: 0 none;
|
||||
}
|
||||
font-size: @buttonFontSize;
|
||||
}
|
||||
|
||||
.divider {
|
||||
margin: 4px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.dropdown {
|
||||
&.open {
|
||||
> button {
|
||||
background-color: @btnActiveColor;
|
||||
background-position: 0 -@icon-height;
|
||||
background-color: @btnActiveColor !important;
|
||||
background-position: -@icon-width*14 -@icon-height;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#box-tools {
|
||||
button {
|
||||
width: 24px;
|
||||
height: 22px;
|
||||
background-origin: content-box;
|
||||
padding: 0 1px;
|
||||
|
||||
&:active {
|
||||
background-position: 0 -@icon-height;
|
||||
}
|
||||
}
|
||||
|
||||
display: inline-block;
|
||||
a {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
@ -607,9 +685,13 @@
|
|||
border: 1px solid rgba(0,0,0,0.15);
|
||||
color: #333;
|
||||
font-weight: bold;
|
||||
line-height: 26px;
|
||||
font-size: 11px;
|
||||
box-shadow: 0 6px 12px rgba(0,0,0,0.175);
|
||||
|
||||
padding: 5px 12px;
|
||||
white-space: pre-wrap;
|
||||
text-align: left;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.tooltip-arrow {
|
||||
|
|
@ -623,3 +705,77 @@
|
|||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
.submit-tooltip {
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
top: 58px;
|
||||
right: 15px;
|
||||
|
||||
padding: 7px 15px;
|
||||
border-radius: 5px;
|
||||
background-color: @notificationColor;
|
||||
-webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.required-tooltip {
|
||||
position: absolute;
|
||||
z-index: 1000;
|
||||
|
||||
padding: 15px;
|
||||
border-radius: 5px;
|
||||
background-color: @btnColored;
|
||||
color: #fff;
|
||||
-webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
|
||||
font-size: 11px;
|
||||
|
||||
&.bottom-left {
|
||||
border-top-right-radius: 0;
|
||||
margin: 15px 0 0 0;
|
||||
|
||||
.tip-arrow {
|
||||
position: absolute;
|
||||
overflow: hidden;
|
||||
right: 0;
|
||||
top: -15px;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
.box-shadow(8px 5px 8px -5px rgba(0, 0, 0, 0.2));
|
||||
|
||||
&:after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
left: 8px;
|
||||
background-color: @btnColored;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
|
||||
-moz-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
-webkit-transform: rotate(45deg);
|
||||
-o-transform: rotate(45deg);
|
||||
transform: rotate(45deg);
|
||||
.box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
|
||||
}
|
||||
}
|
||||
}
|
||||
.close-div {
|
||||
display: inline-block;
|
||||
border: 1px solid #fff;
|
||||
border-radius: 2px;
|
||||
padding: 3px 12px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.tooltip {
|
||||
.tooltip-inner {
|
||||
.toolbar & {
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
74
apps/common/embed/resources/less/loadmask.less
Normal file
74
apps/common/embed/resources/less/loadmask.less
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
@loadmask-zindex: 10000;
|
||||
@loadmask-image-height: 28px;
|
||||
@loadmask-image-width: 28px;
|
||||
@loadmask-small-image-height: 20px;
|
||||
@loadmask-small-image-width: 20px;
|
||||
@background-loader-ie: fade(#000, 65%);
|
||||
@background-loader: fade(#181818, 90%);
|
||||
@text-contrast-background-ie: #fff;
|
||||
@text-contrast-background: #fff;
|
||||
|
||||
.asc-loadmask {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
zoom: 1;
|
||||
background-color: transparent;
|
||||
z-index: @loadmask-zindex;
|
||||
}
|
||||
|
||||
.asc-loadmask-body {
|
||||
position: absolute;
|
||||
z-index: @loadmask-zindex + 1;
|
||||
padding: 24px;
|
||||
line-height: @loadmask-image-height;
|
||||
border: none;
|
||||
background-image: none;
|
||||
background-color: @background-loader-ie;
|
||||
background-color: @background-loader;
|
||||
color: @text-contrast-background-ie;
|
||||
color: @text-contrast-background;
|
||||
border-radius: 6px;
|
||||
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%);
|
||||
|
||||
& > div {
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.asc-loadmask-image {
|
||||
background-image: ~"url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOCAyOCI+PGNpcmNsZSBjeD0iMTQiIGN5PSIxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iMTAuMjUiIHN0cm9rZS1kYXNoYXJyYXk9IjE2MCUsIDQwJSIgLz48L3N2Zz4=)";
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
float: left;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.asc-loadmask-title {
|
||||
font-size: 13px;
|
||||
margin: 0 8px 0 12px;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes rotation {
|
||||
from {
|
||||
transform: rotate(0);
|
||||
}
|
||||
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
#loadmask-spinner {
|
||||
animation-duration: .8s;
|
||||
animation-name: rotation;
|
||||
animation-iteration-count: infinite;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
|
|
@ -44,16 +44,15 @@ define([
|
|||
template :
|
||||
_.template([
|
||||
'<div id="calendar" class="calendar-box">',
|
||||
'<div class="calendar-header">',
|
||||
'<div class="top-row">',
|
||||
'<div id="prev-arrow"><button type="button"><i class="arrow-prev img-commonctrl"> </i></button></div>',
|
||||
'<div class="title"></div>',
|
||||
'<div id="next-arrow"><button type="button"><i class="arrow-next img-commonctrl"> </i></button></div>',
|
||||
'</div>',
|
||||
'<div class="bottom-row">',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'<div class="calendar-content"></div>',
|
||||
'<div class="calendar-header">',
|
||||
'<div class="top-row">',
|
||||
'<div id="prev-arrow"><button type="button"><i class="arrow-prev img-commonctrl"></i></button></div>',
|
||||
'<div class="title"></div>',
|
||||
'<div id="next-arrow"><button type="button"><i class="arrow-next img-commonctrl" /></button></div>',
|
||||
'</div>',
|
||||
'<div class="bottom-row"></div>',
|
||||
'</div>',
|
||||
'<div class="calendar-content"></div>',
|
||||
'</div>'
|
||||
].join('')),
|
||||
|
||||
|
|
@ -179,6 +178,7 @@ define([
|
|||
year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear());
|
||||
|
||||
me._state = 2;
|
||||
me.$el.removeClass('view-days view-months').addClass('view-years');
|
||||
|
||||
var firstYear = year,
|
||||
lastYear = year;
|
||||
|
|
@ -248,6 +248,7 @@ define([
|
|||
|
||||
me._state = 1;
|
||||
me.currentDate = curDate;
|
||||
me.$el.removeClass('view-years view-days').addClass('view-months');
|
||||
|
||||
// Number of year
|
||||
me.topTitle = _.template([
|
||||
|
|
@ -329,6 +330,7 @@ define([
|
|||
curYear = curDate.getFullYear();
|
||||
|
||||
me.currentDate = curDate;
|
||||
me.$el.removeClass('view-years view-months').addClass('view-days');
|
||||
|
||||
// Name month
|
||||
me.topTitle = _.template([
|
||||
|
|
|
|||
|
|
@ -356,19 +356,20 @@ 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(name);
|
||||
me.onApiChangeFontInternal(me.__name);
|
||||
me.__nameId = null;
|
||||
}, 100);
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
onApiChangeFontInternal: function(name) {
|
||||
if (this.inFormControl) return;
|
||||
|
||||
this.__name = name;
|
||||
if (this.getRawValue() !== name) {
|
||||
var record = this.store.findWhere({
|
||||
name: name
|
||||
|
|
|
|||
|
|
@ -54,11 +54,12 @@ define([
|
|||
showLast: true,
|
||||
simpleAddMode: false,
|
||||
keyMoveDirection: 'vertical',
|
||||
itemTemplate: _.template('<div id="<%= id %>" class="list-item" style=""><%= value %></div>')
|
||||
itemTemplate: _.template('<div id="<%= id %>" class="list-item" style=""><%= value %></div>'),
|
||||
cls: ''
|
||||
},
|
||||
|
||||
template: _.template([
|
||||
'<div class="listview inner"></div>'
|
||||
'<div class="listview inner <%= cls %>"></div>'
|
||||
].join('')),
|
||||
|
||||
onResetItems : function() {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ define([
|
|||
values: [0, 100],
|
||||
colorValues: ['#000000', '#ffffff'],
|
||||
currentThumb: 0,
|
||||
thumbTemplate: '<div class="thumb img-commonctrl" style="">' +
|
||||
thumbTemplate: '<div class="thumb" style="">' +
|
||||
'<div class="thumb-top"><div class="thumb-top-inner"></div></div>' +
|
||||
'<div class="thumb-bottom"><div class="thumb-bottom-inner"></div></div>' +
|
||||
'</div>'
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ define([
|
|||
'</div>',
|
||||
'</div>',
|
||||
|
||||
'<div style="position: absolute; left: 0; bottom: 0; width: <%=scope.tablePadding%>px; height: <%=scope.tablePadding%>px; border-top: 1pt dotted gray; border-right: 1pt dotted gray;"></div>',
|
||||
'<div style="position: absolute; left: 0; bottom: 0; width: <%=scope.tablePadding%>px; height: <%=scope.tablePadding%>px; border-top: 1px dotted gray; border-right: 1px dotted gray;"></div>',
|
||||
'<div style="position: absolute; left: <%=scope.tablePadding%>px; bottom: 0; right: <%=scope.tablePadding%>px; height: <%=scope.tablePadding%>px;">',
|
||||
'<div id="<%=scope.id%>-table-bottom-border-selector" style="position: absolute; z-index: 1; height: <%=scope.tablePadding%>px; left: 0; right: 0; bottom: <%=scope.tablePadding * .5%>px;">',
|
||||
'<table width="100%" height="100%">',
|
||||
|
|
@ -430,7 +430,7 @@ define([
|
|||
'</table>',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'<div style="position: absolute; bottom: 0; right: 0; width: <%=scope.tablePadding%>px; height: <%=scope.tablePadding%>px; border-top: 1pt dotted gray; border-left: 1pt dotted gray;"></div>',
|
||||
'<div style="position: absolute; bottom: 0; right: 0; width: <%=scope.tablePadding%>px; height: <%=scope.tablePadding%>px; border-top: 1px dotted gray; border-left: 1px dotted gray;"></div>',
|
||||
'</div>'
|
||||
].join('')),
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ define([
|
|||
'<% 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>' +
|
||||
'<% } else if (me.isSeparator(item)) { %> </div><div class="palette-color-separator" style="width:100%;height:1px;float:left;border-bottom: 1px solid #E0E0E0"></div><div style="padding: 12px;">' +
|
||||
'<% } else if (me.isSeparator(item)) { %> </div><div class="divider" style="width:100%;float:left;"></div><div style="padding: 12px;">' +
|
||||
'<% } else if (me.isColor(item)) { %> ' +
|
||||
'<a class="palette-color color-<%=item%>" style="background:#<%=item%>" hidefocus="on">' +
|
||||
'<em><span style="background:#<%=item%>;" unselectable="on"> </span></em>' +
|
||||
|
|
|
|||
|
|
@ -176,11 +176,11 @@ define([
|
|||
'<div class="tree-caret img-commonctrl ' + '<% if (!isExpanded) { %>' + 'up' + '<% } %>' + '" style="margin-left: <%= level*16 %>px;"></div>',
|
||||
'<% } %>',
|
||||
'<% if (isNotHeader) { %>',
|
||||
'<div class="name not-header"><%= name %></div>',
|
||||
'<div class="name not-header"><%= Common.Utils.String.htmlEncode(name) %></div>',
|
||||
'<% } else if (isEmptyItem) { %>',
|
||||
'<div class="name empty">' + options.emptyItemText + '</div>',
|
||||
'<% } else { %>',
|
||||
'<div class="name"><%= name %></div>',
|
||||
'<div class="name"><%= Common.Utils.String.htmlEncode(name) %></div>',
|
||||
'<% } %>',
|
||||
'</div>'
|
||||
].join(''));
|
||||
|
|
|
|||
|
|
@ -769,6 +769,9 @@ define([
|
|||
'-o-transform': 'scale(1)',
|
||||
'opacity': '1'
|
||||
});
|
||||
setTimeout(function () {
|
||||
me.fireEvent('animate:after', me);
|
||||
}, 210);
|
||||
}, 1);
|
||||
|
||||
setTimeout(function () {
|
||||
|
|
@ -779,6 +782,9 @@ define([
|
|||
this.$window.css({opacity: 1});
|
||||
this.$window.addClass('notransform');
|
||||
this.fireEvent('show', this);
|
||||
setTimeout(function () {
|
||||
me.fireEvent('animate:after', me);
|
||||
}, 10);
|
||||
}
|
||||
|
||||
Common.NotificationCenter.trigger('window:show', this);
|
||||
|
|
|
|||
|
|
@ -814,8 +814,7 @@ define([
|
|||
showReplyInPopover : false,
|
||||
scope : t.view,
|
||||
editable : (t.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canEditComment(data.asc_getReply(i).asc_getUserName()),
|
||||
removable : (t.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getReply(i).asc_getUserName()),
|
||||
hide : !AscCommon.UserInfoParser.canViewComment(data.asc_getReply(i).asc_getUserName())
|
||||
removable : (t.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getReply(i).asc_getUserName())
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
@ -1310,8 +1309,7 @@ define([
|
|||
showReplyInPopover : false,
|
||||
scope : this.view,
|
||||
editable : (this.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canEditComment(data.asc_getReply(i).asc_getUserName()),
|
||||
removable : (this.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getReply(i).asc_getUserName()),
|
||||
hide : !AscCommon.UserInfoParser.canViewComment(data.asc_getReply(i).asc_getUserName())
|
||||
removable : (this.mode.canDeleteComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getReply(i).asc_getUserName())
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ define([
|
|||
uithemes: true
|
||||
};
|
||||
|
||||
var native = window.AscDesktopEditor;
|
||||
var native = window.desktop || window.AscDesktopEditor;
|
||||
!!native && native.execCommand('webapps:features', JSON.stringify(features));
|
||||
|
||||
var Desktop = function () {
|
||||
|
|
@ -86,6 +86,9 @@ define([
|
|||
$('.asc-window.modal').css('top', obj.skiptoparea);
|
||||
|
||||
Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea);
|
||||
} else
|
||||
if ( obj.lockthemes != undefined ) {
|
||||
Common.UI.Themes.setAvailable(!obj.lockthemes);
|
||||
}
|
||||
} else
|
||||
if (/editor:config/.test(cmd)) {
|
||||
|
|
@ -243,7 +246,9 @@ define([
|
|||
'modal:show': _onModalDialog.bind(this, 'open'),
|
||||
'modal:close': _onModalDialog.bind(this, 'close')
|
||||
, 'uitheme:changed' : function (name) {
|
||||
native.execCommand("uitheme:changed", name);
|
||||
var theme = Common.UI.Themes.get(name);
|
||||
if ( theme )
|
||||
native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type}));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ define([
|
|||
|
||||
|
||||
var createExternalEditor = function() {
|
||||
!!customization && (customization.uiTheme = Common.localStorage.getItem("ui-theme", "theme-light"));
|
||||
!!customization && (customization.uiTheme = Common.localStorage.getItem("ui-theme-id", "theme-light"));
|
||||
externalEditor = new DocsAPI.DocEditor('id-diagram-editor-placeholder', {
|
||||
width : '100%',
|
||||
height : '100%',
|
||||
|
|
@ -245,7 +245,7 @@ define([
|
|||
|
||||
showExternalEditor: function () {
|
||||
if ( externalEditor ) {
|
||||
var value = Common.localStorage.getItem("ui-theme", "theme-light");
|
||||
var value = Common.localStorage.getItem("ui-theme-id", "theme-light");
|
||||
externalEditor.serviceCommand('theme:change', value);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -167,8 +167,9 @@ define([
|
|||
return this;
|
||||
},
|
||||
|
||||
setMode: function(mode) {
|
||||
setMode: function(mode, api) {
|
||||
this.appOptions = mode;
|
||||
this.api = api;
|
||||
this.customPluginsComplete = !this.appOptions.canBrandingExt;
|
||||
if (this.appOptions.canBrandingExt)
|
||||
this.getAppCustomPlugins(this.configPlugins);
|
||||
|
|
@ -205,7 +206,7 @@ define([
|
|||
plugin.set_Name(item.get('name'));
|
||||
plugin.set_Guid(item.get('guid'));
|
||||
plugin.set_BaseUrl(item.get('baseUrl'));
|
||||
plugin.set_MinVersion(item.get('minVersion'));
|
||||
plugin.set_MinVersion && plugin.set_MinVersion(item.get('minVersion'));
|
||||
|
||||
var variations = item.get('variations'),
|
||||
variationsArr = [];
|
||||
|
|
@ -383,7 +384,8 @@ define([
|
|||
isCustomWindow = variation.get_CustomWindow(),
|
||||
arrBtns = variation.get_Buttons(),
|
||||
newBtns = [],
|
||||
size = variation.get_Size();
|
||||
size = variation.get_Size(),
|
||||
isModal = variation.get_Modal();
|
||||
if (!size || size.length<2) size = [800, 600];
|
||||
|
||||
if (_.isArray(arrBtns)) {
|
||||
|
|
@ -404,7 +406,8 @@ define([
|
|||
frameId : frameId,
|
||||
buttons: isCustomWindow ? undefined : newBtns,
|
||||
toolcallback: _.bind(this.onToolClose, this),
|
||||
help: !!help
|
||||
help: !!help,
|
||||
modal: isModal!==undefined ? isModal : true
|
||||
});
|
||||
me.pluginDlg.on({
|
||||
'render:after': function(obj){
|
||||
|
|
@ -513,7 +516,7 @@ define([
|
|||
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
|
||||
isEdit = me.appOptions.isEdit,
|
||||
editor = me.editor,
|
||||
apiVersion = me.api.GetVersion();
|
||||
apiVersion = me.api ? me.api.GetVersion() : undefined;
|
||||
if ( pluginsdata instanceof Array ) {
|
||||
var arr = [], arrUI = [],
|
||||
lang = me.appOptions.lang.split(/[\-_]/)[0];
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ define([
|
|||
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
|
||||
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
|
||||
}
|
||||
if (this.appConfig.canReview && !this.appConfig.isReviewOnly)
|
||||
if (this.appConfig.canReview)
|
||||
this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this));
|
||||
this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this));
|
||||
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this));
|
||||
|
|
@ -557,6 +557,7 @@ define([
|
|||
this.view.turnChanges(true);
|
||||
} else
|
||||
if ( this.appConfig.canReview ) {
|
||||
state = (state=='off') ? false : state; // support of prev. version (on/off)
|
||||
if (!!global) {
|
||||
this.api.asc_SetLocalTrackRevisions(null);
|
||||
this.api.asc_SetGlobalTrackRevisions(!!state);
|
||||
|
|
|
|||
|
|
@ -7,26 +7,39 @@ define([
|
|||
], function () {
|
||||
'use strict';
|
||||
|
||||
Common.UI.Themes = new (function() {
|
||||
var sdk_themes_alias = {
|
||||
'theme-light': 'flat',
|
||||
'theme-dark': 'flatDark'
|
||||
};
|
||||
|
||||
Common.UI.Themes = new (function(locale) {
|
||||
!locale && (locale = {});
|
||||
var themes_map = {
|
||||
'theme-light': 'light',
|
||||
'theme-dark': 'dark'
|
||||
'theme-light': {
|
||||
text: locale.txtThemeLight || 'Light',
|
||||
type: 'light',
|
||||
source: 'static',
|
||||
},
|
||||
'theme-classic-light': {
|
||||
text: locale.txtThemeClassicLight || 'Classic Light',
|
||||
type: 'light',
|
||||
source: 'static',
|
||||
},
|
||||
'theme-dark': {
|
||||
text: locale.txtThemeDark || 'Dark',
|
||||
type: 'dark',
|
||||
source: 'static',
|
||||
},
|
||||
}
|
||||
|
||||
sdk_themes_alias.contains = function (name) {
|
||||
return !!this[name];
|
||||
if ( !!window.currentLoaderTheme ) {
|
||||
themes_map[currentLoaderTheme.id] = {};
|
||||
window.currentLoaderTheme = undefined;
|
||||
}
|
||||
|
||||
themes_map.contains = function (name) {
|
||||
return !!this[name];
|
||||
}
|
||||
var id_default_light_theme = 'theme-classic-light',
|
||||
id_default_dark_theme = 'theme-dark';
|
||||
|
||||
var name_colors = [
|
||||
"toolbar-header-document",
|
||||
"toolbar-header-spreadsheet",
|
||||
"toolbar-header-presentation",
|
||||
|
||||
"background-normal",
|
||||
"background-toolbar",
|
||||
"background-toolbar-additional",
|
||||
|
|
@ -61,6 +74,9 @@ define([
|
|||
"text-secondary",
|
||||
"text-tertiary",
|
||||
"text-link",
|
||||
"text-link-hover",
|
||||
"text-link-active",
|
||||
"text-link-visited",
|
||||
"text-inverse",
|
||||
"text-toolbar-header",
|
||||
"text-contrast-background",
|
||||
|
|
@ -126,96 +142,189 @@ define([
|
|||
return out_object;
|
||||
}
|
||||
|
||||
var refresh_sdk_colors = function () {
|
||||
if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) {
|
||||
var style = getComputedStyle(document.body);
|
||||
if ( !!window.DE ) {
|
||||
var color_background_normal = style.getPropertyValue('--background-normal');
|
||||
this.api.asc_setSkin({
|
||||
"RulerOutline": style.getPropertyValue('--border-toolbar'),
|
||||
"RulerMarkersFillColor": color_background_normal,
|
||||
"RulerMarkersFillColorOld": color_background_normal,
|
||||
"RulerTableColor1": color_background_normal,
|
||||
"RulerLight": style.getPropertyValue("--canvas-ruler-background"),
|
||||
"RulerDark": style.getPropertyValue("--canvas-ruler-margins-background"),
|
||||
"RulerTextColor": style.getPropertyValue("--canvas-ruler-mark"),
|
||||
"RulerTableColor2": style.getPropertyValue("--canvas-ruler-handle-border"),
|
||||
"RulerTableColor2Old": style.getPropertyValue("--canvas-ruler-handle-border-disabled"),
|
||||
"RulerTabsColor": style.getPropertyValue("--canvas-high-contrast"),
|
||||
"RulerTabsColorOld": style.getPropertyValue("--canvas-high-contrast-disabled"),
|
||||
});
|
||||
var create_colors_css = function (id, colors) {
|
||||
if ( !!colors && !!id ) {
|
||||
var _css_array = [':root .', id, '{'];
|
||||
for (var c in colors) {
|
||||
_css_array.push('--', c, ':', colors[c], ';');
|
||||
}
|
||||
|
||||
_css_array.push('}');
|
||||
return _css_array.join('');
|
||||
}
|
||||
}
|
||||
return {
|
||||
THEME_LIGHT_ID: 'theme-light',
|
||||
THEME_DARK_ID: 'theme-dark',
|
||||
|
||||
var write_theme_css = function (css) {
|
||||
if ( !!css ) {
|
||||
var style = document.createElement('style');
|
||||
style.type = 'text/css';
|
||||
style.innerHTML = css;
|
||||
document.getElementsByTagName('head')[0].appendChild(style);
|
||||
}
|
||||
}
|
||||
|
||||
var parse_themes_object = function (obj) {
|
||||
if ( !!obj.themes && obj.themes instanceof Array ) {
|
||||
obj.themes.forEach(function (item) {
|
||||
if ( !!item.id ) {
|
||||
themes_map[item.id] = {text: item.name, type: item.type};
|
||||
write_theme_css(create_colors_css(item.id, item.colors));
|
||||
} else
|
||||
if ( typeof item == 'string' ) {
|
||||
get_themes_config(item)
|
||||
}
|
||||
});
|
||||
} else
|
||||
if ( obj.id ) {
|
||||
themes_map[obj.id] = {text: obj.name, type: obj.type};
|
||||
write_theme_css( create_colors_css(obj.id, obj.colors) );
|
||||
}
|
||||
}
|
||||
|
||||
var get_themes_config = function (url) {
|
||||
Common.Utils.loadConfig(url,
|
||||
function ( obj ) {
|
||||
if ( obj != 'error' ) {
|
||||
parse_themes_object(obj);
|
||||
}
|
||||
}
|
||||
);
|
||||
// fetch(url, {
|
||||
// method: 'get',
|
||||
// headers: {
|
||||
// 'Accept': 'application/json',
|
||||
// },
|
||||
// }).then(function(response) {
|
||||
// if (!response.ok) {
|
||||
// throw new Error('server error');
|
||||
// }
|
||||
// return response.json();
|
||||
// }).then(function(response) {
|
||||
// if ( response.then ) {
|
||||
// // return response.json();
|
||||
// } else {
|
||||
// parse_themes_object(response);
|
||||
//
|
||||
// /* to break promises chain */
|
||||
// throw new Error('loaded');
|
||||
// }
|
||||
// }).catch(function(e) {
|
||||
// if ( e.message == 'loaded' ) {
|
||||
// } else console.log('fetch error: ' + e);
|
||||
// });
|
||||
}
|
||||
|
||||
var on_document_ready = function (el) {
|
||||
get_themes_config('../../common/main/resources/themes/themes.json');
|
||||
}
|
||||
|
||||
var get_ui_theme_name = function (objtheme) {
|
||||
if ( typeof(objtheme) == 'string' &&
|
||||
objtheme.startsWith("{") && objtheme.endsWith("}") )
|
||||
{
|
||||
objtheme = JSON.parse(objtheme);
|
||||
}
|
||||
|
||||
if ( objtheme && typeof(objtheme) == 'object' )
|
||||
return objtheme.id;
|
||||
|
||||
return objtheme;
|
||||
}
|
||||
|
||||
return {
|
||||
init: function (api) {
|
||||
var me = this;
|
||||
refresh_sdk_colors = refresh_sdk_colors.bind(this);
|
||||
|
||||
$(window).on('storage', function (e) {
|
||||
if ( e.key == 'ui-theme' ) {
|
||||
if ( e.key == 'ui-theme' || e.key == 'ui-theme-id' ) {
|
||||
me.setTheme(e.originalEvent.newValue);
|
||||
}
|
||||
})
|
||||
|
||||
this.api = api;
|
||||
var theme_name = Common.localStorage.getItem('ui-theme', 'theme-light');
|
||||
var theme_name = get_ui_theme_name(Common.localStorage.getItem('ui-theme'));
|
||||
if ( !themes_map[theme_name] )
|
||||
theme_name = id_default_light_theme;
|
||||
|
||||
if ( !$('body').hasClass(theme_name) ) {
|
||||
$('body').addClass(theme_name);
|
||||
}
|
||||
|
||||
var obj = get_current_theme_colors(name_colors);
|
||||
obj.type = themes_map[theme_name];
|
||||
obj.type = themes_map[theme_name].type;
|
||||
obj.name = theme_name;
|
||||
api.asc_setSkin(obj);
|
||||
|
||||
// app.eventbus.addListeners({
|
||||
// 'FileMenu': {
|
||||
// 'settings:apply': function (menu) {
|
||||
// }
|
||||
// }
|
||||
// }, {id: 'Themes'});
|
||||
|
||||
// getComputedStyle(document.documentElement).getPropertyValue('--background-normal');
|
||||
Common.NotificationCenter.on('document:ready', on_document_ready.bind(this));
|
||||
},
|
||||
|
||||
available: function () {
|
||||
return !Common.Utils.isIE;
|
||||
return !Common.Utils.isIE && !this.locked;
|
||||
},
|
||||
|
||||
current: function () {
|
||||
return Common.localStorage.getItem('ui-theme') || 'theme-light';
|
||||
setAvailable: function (value) {
|
||||
this.locked = value;
|
||||
},
|
||||
|
||||
map: function () {
|
||||
return themes_map
|
||||
},
|
||||
|
||||
get: function (id) {
|
||||
return themes_map[id]
|
||||
},
|
||||
|
||||
currentThemeId: function () {
|
||||
return get_ui_theme_name(Common.localStorage.getItem('ui-theme')) || id_default_light_theme;
|
||||
},
|
||||
|
||||
defaultThemeId: function (type) {
|
||||
return type == 'dark' ? id_default_dark_theme : id_default_light_theme;
|
||||
},
|
||||
|
||||
defaultTheme: function (type) {
|
||||
return themes_map[this.defaultThemeId(type)]
|
||||
},
|
||||
|
||||
isDarkTheme: function () {
|
||||
return themes_map[this.current()] == 'dark';
|
||||
return themes_map[this.currentThemeId()].type == 'dark';
|
||||
},
|
||||
|
||||
setTheme: function (name) {
|
||||
if ( themes_map.contains(name) ) {
|
||||
var classname = document.documentElement.className.replace(/theme-\w+\s?/, '');
|
||||
setTheme: function (obj, force) {
|
||||
var id = get_ui_theme_name(obj);
|
||||
if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
|
||||
var classname = document.body.className.replace(/theme-\w+\s?/, '');
|
||||
document.body.className = classname;
|
||||
|
||||
$('body').addClass(name);
|
||||
$('body').addClass(id);
|
||||
|
||||
var obj = get_current_theme_colors(name_colors);
|
||||
obj.type = themes_map[name];
|
||||
obj.name = name;
|
||||
obj.type = themes_map[id].type;
|
||||
obj.name = id;
|
||||
|
||||
this.api.asc_setSkin(obj);
|
||||
|
||||
Common.localStorage.setItem('ui-theme', name);
|
||||
Common.NotificationCenter.trigger('uitheme:changed', name);
|
||||
if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) {
|
||||
var theme_obj = {
|
||||
id: id,
|
||||
type: obj.type,
|
||||
};
|
||||
|
||||
if ( themes_map[id].source != 'static' ) {
|
||||
theme_obj.colors = obj;
|
||||
}
|
||||
|
||||
Common.localStorage.setItem('ui-theme', JSON.stringify(theme_obj));
|
||||
}
|
||||
|
||||
Common.localStorage.setItem('ui-theme-id', id);
|
||||
Common.NotificationCenter.trigger('uitheme:changed', id);
|
||||
}
|
||||
},
|
||||
|
||||
toggleTheme: function () {
|
||||
this.setTheme(this.current() == 'theme-dark' ? 'theme-light' : 'theme-dark');
|
||||
this.setTheme( this.isDarkTheme() ? id_default_light_theme : id_default_dark_theme );
|
||||
}
|
||||
}
|
||||
})();
|
||||
})(Common.UI.Themes);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ define([
|
|||
EditorsSupport: ["word", "cell", "slide"],
|
||||
isVisual: false,
|
||||
isCustomWindow: false,
|
||||
isModal: false,
|
||||
isModal: true,
|
||||
isInsideMode: false,
|
||||
initDataType: 0,
|
||||
initData: "",
|
||||
|
|
|
|||
|
|
@ -81,6 +81,12 @@
|
|||
</div>
|
||||
<div id="id-autocorrect-dialog-settings-sse-autoformat" class="settings-panel">
|
||||
<div class="inner-content" style="width: 100%;">
|
||||
<div class="padding-small">
|
||||
<label class="header"><%= scope.textReplaceText %></label>
|
||||
</div>
|
||||
<div class="padding-large">
|
||||
<div id="id-autocorrect-dialog-chk-hyperlink"></div>
|
||||
</div>
|
||||
<div class="padding-small">
|
||||
<label class="header"><%= scope.textApplyAsWork %></label>
|
||||
</div>
|
||||
|
|
@ -89,3 +95,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="id-autocorrect-dialog-settings-autocorrect" class="settings-panel">
|
||||
<div class="inner-content" style="width: 100%;">
|
||||
<div class="padding-large">
|
||||
<div id="id-autocorrect-dialog-chk-fl-sentence"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -38,10 +38,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
if (Common === undefined) {
|
||||
var Common = {};
|
||||
if ( window.Common === undefined ) {
|
||||
window.Common = {};
|
||||
}
|
||||
|
||||
// TODO: move to Common.Utils
|
||||
Common.util = Common.util||{};
|
||||
|
||||
Common.util.LanguageInfo = new(function() {
|
||||
|
|
|
|||
|
|
@ -32,10 +32,25 @@ var params = (function() {
|
|||
return urlParams;
|
||||
})();
|
||||
|
||||
if ( !!params.uitheme && localStorage.getItem("ui-theme") != params.uitheme)
|
||||
localStorage.setItem("ui-theme", params.uitheme);
|
||||
if ( !!params.uitheme && !localStorage.getItem("ui-theme-id") ) {
|
||||
// const _t = params.uitheme.match(/([\w-]+)/g);
|
||||
|
||||
var ui_theme_name = localStorage.getItem("ui-theme");
|
||||
if ( params.uitheme == 'default-dark' )
|
||||
params.uitheme = 'theme-dark';
|
||||
else
|
||||
if ( params.uitheme == 'default-light' )
|
||||
params.uitheme = 'theme-classic-light';
|
||||
|
||||
localStorage.setItem("ui-theme-id", params.uitheme);
|
||||
}
|
||||
|
||||
var ui_theme_name = localStorage.getItem("ui-theme-id");
|
||||
if ( !ui_theme_name ) {
|
||||
if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
|
||||
ui_theme_name = 'theme-dark';
|
||||
localStorage.setItem("ui-theme-id", ui_theme_name);
|
||||
}
|
||||
}
|
||||
if ( !!ui_theme_name ) {
|
||||
document.body.classList.add(ui_theme_name);
|
||||
}
|
||||
|
|
|
|||
28
apps/common/main/lib/util/themeinit.js
Normal file
28
apps/common/main/lib/util/themeinit.js
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
|
||||
+function init_themes() {
|
||||
var objtheme = localStorage.getItem("ui-theme");
|
||||
if ( typeof(objtheme) == 'string' &&
|
||||
objtheme.startsWith("{") && objtheme.endsWith("}") )
|
||||
{
|
||||
objtheme = JSON.parse(objtheme);
|
||||
}
|
||||
|
||||
var ui_theme_name = objtheme && typeof(objtheme) == 'object' ? objtheme.id :
|
||||
typeof(objtheme) == 'string' ? objtheme : localStorage.getItem("ui-theme-id");
|
||||
|
||||
if ( !!ui_theme_name ) {
|
||||
if ( !!objtheme && !!objtheme.colors ) {
|
||||
var colors = [];
|
||||
for ( var c in objtheme.colors ) {
|
||||
colors.push('--' + c + ':' + objtheme.colors[c]);
|
||||
}
|
||||
|
||||
var style = document.createElement('style');
|
||||
style.type = 'text/css';
|
||||
style.innerHTML = '.' + ui_theme_name + '{'+ colors.join(';') +';}';
|
||||
document.getElementsByTagName('head')[0].appendChild(style);
|
||||
|
||||
window.currentLoaderTheme = objtheme;
|
||||
}
|
||||
}
|
||||
}();
|
||||
|
|
@ -30,15 +30,26 @@
|
|||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
if (Common === undefined) {
|
||||
var Common = {};
|
||||
if (window.Common === undefined) {
|
||||
window.Common = {};
|
||||
}
|
||||
|
||||
if (Common.Utils === undefined) {
|
||||
Common.Utils = {};
|
||||
}
|
||||
|
||||
Common.Utils = _.extend(new(function() {
|
||||
function _extend_object(dest, source) {
|
||||
if ( typeof _ != "undefined" ) {
|
||||
return _.extend({}, dest, source);
|
||||
} else
|
||||
if ( !!Object ) {
|
||||
return Object.assign({}, dest, source);
|
||||
}
|
||||
|
||||
return source;
|
||||
}
|
||||
|
||||
var utils = new(function() {
|
||||
var userAgent = navigator.userAgent.toLowerCase(),
|
||||
check = function(regex){
|
||||
return regex.test(userAgent);
|
||||
|
|
@ -121,9 +132,10 @@ Common.Utils = _.extend(new(function() {
|
|||
me = this,
|
||||
checkSize = function() {
|
||||
var scale = {};
|
||||
if ( !!window.AscCommon && !!window.AscCommon.checkDeviceScale )
|
||||
if ( !!window.AscCommon && !!window.AscCommon.checkDeviceScale ) {
|
||||
scale = window.AscCommon.checkDeviceScale();
|
||||
else {
|
||||
AscCommon.correctApplicationScale(scale);
|
||||
} else {
|
||||
var str_mq_150 = "screen and (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), " +
|
||||
"screen and (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx)";
|
||||
var str_mq_200 = "screen and (-webkit-min-device-pixel-ratio: 2), " +
|
||||
|
|
@ -237,7 +249,9 @@ Common.Utils = _.extend(new(function() {
|
|||
croppedGeometry: function() {return {left:0, top: Common.Utils.InternalSettings.get('window-inactive-area-top'),
|
||||
width: me.innerWidth, height: me.innerHeight - Common.Utils.InternalSettings.get('window-inactive-area-top')}}
|
||||
}
|
||||
})(), Common.Utils || {});
|
||||
})();
|
||||
|
||||
Common.Utils = _extend_object(Common.Utils, utils);
|
||||
|
||||
Common.Utils.ThemeColor = new(function() {
|
||||
return {
|
||||
|
|
@ -322,7 +336,7 @@ Common.Utils.ThemeColor = new(function() {
|
|||
}
|
||||
})();
|
||||
|
||||
Common.Utils.Metric = _.extend( new(function() {
|
||||
var metrics = new(function() {
|
||||
var me = this;
|
||||
|
||||
me.c_MetricUnits = {
|
||||
|
|
@ -393,7 +407,9 @@ Common.Utils.Metric = _.extend( new(function() {
|
|||
return value;
|
||||
}
|
||||
}
|
||||
})(), Common.Utils.Metric || {});
|
||||
})();
|
||||
|
||||
Common.Utils.Metric = _extend_object(Common.Utils.Metric, metrics);
|
||||
|
||||
Common.Utils.RGBColor = function(colorString) {
|
||||
var r, g, b;
|
||||
|
|
@ -572,7 +588,8 @@ Common.Utils.String = new (function() {
|
|||
},
|
||||
|
||||
htmlEncode: function(string) {
|
||||
return _.escape(string);
|
||||
return (typeof _ !== 'undefined') ? _.escape(string) :
|
||||
string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
||||
},
|
||||
|
||||
htmlDecode: function(string) {
|
||||
|
|
@ -624,6 +641,14 @@ Common.Utils.String = new (function() {
|
|||
var nTrailingChar = 0xDC00 | (nUnicode & 0x3FF);
|
||||
return String.fromCharCode(nLeadingChar) + String.fromCharCode(nTrailingChar);
|
||||
}
|
||||
},
|
||||
|
||||
fixedDigits: function(num, digits, fill) {
|
||||
(fill===undefined) && (fill = '0');
|
||||
var strfill = "",
|
||||
str = num.toString();
|
||||
for (var i=str.length; i<digits; i++) strfill += fill;
|
||||
return strfill + str;
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
|
@ -724,12 +749,13 @@ Common.Utils.applyCustomizationPlugins = function(plugins) {
|
|||
});
|
||||
};
|
||||
|
||||
Common.Utils.fillUserInfo = function(info, lang, defname) {
|
||||
Common.Utils.fillUserInfo = function(info, lang, defname, defid) {
|
||||
var _user = info || {};
|
||||
!_user.id && (_user.id = ('uid-' + Date.now()));
|
||||
_user.fullname = _.isEmpty(_user.name) ? defname : _user.name;
|
||||
_user.anonymous = !_user.id;
|
||||
!_user.id && (_user.id = defid);
|
||||
_user.fullname = !_user.name ? defname : _user.name;
|
||||
_user.group && (_user.fullname = (_user.group).toString() + AscCommon.UserInfoParser.getSeparator() + _user.fullname);
|
||||
_user.guest = _.isEmpty(_user.name);
|
||||
_user.guest = !_user.name;
|
||||
return _user;
|
||||
};
|
||||
|
||||
|
|
@ -771,10 +797,12 @@ Common.Utils.getConfigJson = function (url) {
|
|||
};
|
||||
|
||||
Common.Utils.loadConfig = function(url, callback) {
|
||||
"use strict";
|
||||
|
||||
fetch(url)
|
||||
.then(function(response){
|
||||
fetch(url, {
|
||||
method: 'get',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
},
|
||||
}).then(function(response){
|
||||
if ( response.ok )
|
||||
return response.json();
|
||||
else return 'error';
|
||||
|
|
@ -984,3 +1012,35 @@ Common.Utils.ModalWindow = new(function() {
|
|||
}
|
||||
}
|
||||
})();
|
||||
|
||||
Common.Utils.UserInfoParser = new(function() {
|
||||
var parse = false;
|
||||
var separator = String.fromCharCode(160);
|
||||
return {
|
||||
setParser: function(value) {
|
||||
parse = !!value;
|
||||
},
|
||||
|
||||
getSeparator: function() {
|
||||
return separator;
|
||||
},
|
||||
|
||||
getParsedName: function(username) {
|
||||
if (parse && username) {
|
||||
return username.substring(username.indexOf(separator)+1);
|
||||
} else
|
||||
return username;
|
||||
},
|
||||
|
||||
getParsedGroups: function(username) {
|
||||
if (parse && username) {
|
||||
var idx = username.indexOf(separator),
|
||||
groups = (idx>-1) ? username.substring(0, idx).split(',') : [];
|
||||
for (var i=0; i<groups.length; i++)
|
||||
groups[i] = groups[i].trim();
|
||||
return groups;
|
||||
} else
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ define([
|
|||
var $window = this.getChild();
|
||||
$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
|
||||
|
||||
this.on('animate:after', _.bind(this.onAnimateAfter, this));
|
||||
|
||||
this.btnsCategory = [];
|
||||
_.each($window.find('.btn-category'), function(item, index) {
|
||||
var btnEl = $(item);
|
||||
|
|
@ -173,6 +175,10 @@ define([
|
|||
if (this.storageName)
|
||||
Common.localStorage.setItem(this.storageName, this.getActiveCategory());
|
||||
Common.UI.Window.prototype.close.call(this, suppressevent);
|
||||
},
|
||||
|
||||
onAnimateAfter: function() {
|
||||
|
||||
}
|
||||
}, Common.Views.AdvancedSettingsWindow || {}));
|
||||
});
|
||||
|
|
@ -64,9 +64,11 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
{panelId: 'id-autocorrect-dialog-settings-math', panelCaption: this.textMathCorrect},
|
||||
{panelId: 'id-autocorrect-dialog-settings-recognized', panelCaption: this.textRecognized}
|
||||
];
|
||||
if (this.appPrefix=='de-' || this.appPrefix=='pe-')
|
||||
if (this.appPrefix=='de-' || this.appPrefix=='pe-') {
|
||||
items.push({panelId: 'id-autocorrect-dialog-settings-de-autoformat', panelCaption: this.textAutoFormat});
|
||||
else if (this.appPrefix=='sse-')
|
||||
items.push({panelId: 'id-autocorrect-dialog-settings-autocorrect', panelCaption: this.textAutoCorrect});
|
||||
|
||||
} else if (this.appPrefix=='sse-')
|
||||
items.push({panelId: 'id-autocorrect-dialog-settings-sse-autoformat', panelCaption: this.textAutoFormat});
|
||||
|
||||
_.extend(this.options, {
|
||||
|
|
@ -322,6 +324,19 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-numbered", checked);
|
||||
me.api.asc_SetAutomaticNumberedLists(checked);
|
||||
});
|
||||
// AutoCorrect
|
||||
this.chFLSentence = new Common.UI.CheckBox({
|
||||
el: $('#id-autocorrect-dialog-chk-fl-sentence'),
|
||||
labelText: this.textFLSentence,
|
||||
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-sentence")
|
||||
}).on('change', function(field, newValue, oldValue, eOpts){
|
||||
var checked = (field.getValue()==='checked');
|
||||
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-fl-sentence", checked);
|
||||
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-fl-sentence", checked);
|
||||
me.api.asc_SetAutoCorrectFirstLetterOfSentences && me.api.asc_SetAutoCorrectFirstLetterOfSentences(checked);
|
||||
});
|
||||
|
||||
this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false));
|
||||
} else if (this.appPrefix=='sse-') {
|
||||
this.chNewRows = new Common.UI.CheckBox({
|
||||
el: $('#id-autocorrect-dialog-chk-new-rows'),
|
||||
|
|
@ -333,6 +348,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-new-rows", checked);
|
||||
me.api.asc_setIncludeNewRowColTable(checked);
|
||||
});
|
||||
|
||||
this.chHyperlink = new Common.UI.CheckBox({
|
||||
el: $('#id-autocorrect-dialog-chk-hyperlink'),
|
||||
labelText: this.textHyperlink,
|
||||
value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyperlink")
|
||||
}).on('change', function(field, newValue, oldValue, eOpts){
|
||||
var checked = (field.getValue()==='checked');
|
||||
Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked);
|
||||
Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked);
|
||||
me.api.asc_setAutoCorrectHyperlinks(checked);
|
||||
});
|
||||
}
|
||||
|
||||
this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false));
|
||||
|
|
@ -354,9 +380,11 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
getFocusedComponents: function() {
|
||||
var arr = [
|
||||
this.chReplaceType, this.inputReplace, this.inputBy, this.mathList, this.btnReset, this.btnEdit, this.btnDelete, // 0 tab
|
||||
this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec // 1 tab
|
||||
this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec, // 1 tab
|
||||
this.chFLSentence // 3 tab
|
||||
];
|
||||
arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
|
||||
arr = arr.concat(this.chNewRows ? [this.chHyperlink, this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
|
||||
arr = arr.concat(this.chFLSentence ? [this.chFLSentence] : []);
|
||||
return arr;
|
||||
},
|
||||
|
||||
|
|
@ -399,6 +427,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
if (value==0) this.onMathCategoryClick(true);
|
||||
else if (value==1) this.onRecCategoryClick(true);
|
||||
else if (value==2) this.onAutoformatCategoryClick(true);
|
||||
else if (value==3) this.onAutocorrectCategoryClick(true);
|
||||
},
|
||||
|
||||
close: function() {
|
||||
|
|
@ -424,7 +453,14 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
onAutoformatCategoryClick: function(delay) {
|
||||
var me = this;
|
||||
_.delay(function(){
|
||||
me.chNewRows ? me.chNewRows.focus() : me.chQuotes.focus();
|
||||
me.chHyperlink ? me.chHyperlink.focus() : me.chQuotes.focus();
|
||||
},delay ? 50 : 0);
|
||||
},
|
||||
|
||||
onAutocorrectCategoryClick: function(delay) {
|
||||
var me = this;
|
||||
_.delay(function(){
|
||||
me.chFLSentence.focus();
|
||||
},delay ? 50 : 0);
|
||||
},
|
||||
|
||||
|
|
@ -790,7 +826,10 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
|
|||
textBulleted: 'Automatic bulleted lists',
|
||||
textNumbered: 'Automatic numbered lists',
|
||||
textApplyAsWork: 'Apply as you work',
|
||||
textNewRowCol: 'Include new rows and columns in table'
|
||||
textNewRowCol: 'Include new rows and columns in table',
|
||||
textAutoCorrect: 'AutoCorrect',
|
||||
textFLSentence: 'Capitalize first letter of sentences',
|
||||
textHyperlink: 'Internet and network paths with hyperlinks'
|
||||
|
||||
}, Common.Views.AutoCorrectDialog || {}))
|
||||
});
|
||||
|
|
|
|||
|
|
@ -272,16 +272,8 @@ define([
|
|||
|
||||
me.fireEvent('comment:resolve', [commentId]);
|
||||
|
||||
readdresolves();
|
||||
} else if (btn.hasClass('btn-resolve-check', false)) {
|
||||
var tip = btn.data('bs.tooltip');
|
||||
if (tip) tip.dontShow = true;
|
||||
|
||||
me.fireEvent('comment:resolve', [commentId]);
|
||||
|
||||
readdresolves();
|
||||
} else if (!btn.hasClass('msg-reply') &&
|
||||
!btn.hasClass('btn-resolve-check') &&
|
||||
!btn.hasClass('btn-resolve')) {
|
||||
var isTextSelected = false;
|
||||
if (btn.hasClass('user-message')) {
|
||||
|
|
@ -377,12 +369,12 @@ define([
|
|||
}
|
||||
|
||||
var arr = [],
|
||||
btns = $(view.el).find('.btn-resolve');
|
||||
btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
|
||||
btns.tooltip({title: me.textResolve, placement: 'cursor'});
|
||||
btns.each(function(idx, item){
|
||||
arr.push($(item).data('bs.tooltip').tip());
|
||||
});
|
||||
btns = $(view.el).find('.btn-resolve-check');
|
||||
btns = $(view.el).find('.comment-resolved');
|
||||
btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
|
||||
btns.each(function(idx, item){
|
||||
arr.push($(item).data('bs.tooltip').tip());
|
||||
|
|
|
|||
|
|
@ -791,8 +791,8 @@ define([
|
|||
textAdvSettings: 'Advanced Settings',
|
||||
tipViewSettings: 'View Settings',
|
||||
textRemoveFavorite: 'Remove from Favorites',
|
||||
textDarkTheme: 'Dark theme',
|
||||
textAddFavorite: 'Mark as favorite'
|
||||
textAddFavorite: 'Mark as favorite',
|
||||
textHideNotes: 'Hide Notes'
|
||||
}
|
||||
}(), Common.Views.Header || {}))
|
||||
});
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ define([
|
|||
'<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
|
||||
'<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></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">'].concat(itemsTemplate).concat([
|
||||
'</ul>',
|
||||
'</div>'
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ define([
|
|||
type: 'password',
|
||||
allowBlank : false,
|
||||
style : 'width: 100%;',
|
||||
maxLength: 255,
|
||||
validateOnBlur: false
|
||||
});
|
||||
this.repeatPwd = new Common.UI.InputField({
|
||||
|
|
@ -106,6 +107,7 @@ define([
|
|||
type: 'password',
|
||||
allowBlank : false,
|
||||
style : 'width: 100%;',
|
||||
maxLength: 255,
|
||||
validateOnBlur: false,
|
||||
validation : function(value) {
|
||||
return me.txtIncorrectPwd;
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ define([
|
|||
|
||||
parseIcons: function(icons) {
|
||||
if (icons.length && typeof icons[0] !== 'string') {
|
||||
var theme = Common.UI.Themes.current().toLowerCase(),
|
||||
var theme = Common.UI.Themes.currentThemeId().toLowerCase(),
|
||||
style = Common.UI.Themes.isDarkTheme() ? 'dark' : 'light',
|
||||
idx = -1;
|
||||
for (var i=0; i<icons.length; i++) {
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ define([
|
|||
el : $('#id-dlg-newname'),
|
||||
style : 'width: 100%;',
|
||||
validateOnBlur: false,
|
||||
maxLength: me.options.maxLength,
|
||||
validation : function(value) {
|
||||
return (/[\t*\+:\"<>?|\\\\/]/gim.test(value)) ? me.txtInvalidName + "*+:\"<>?|\/" : true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -258,12 +258,12 @@ define([
|
|||
}
|
||||
|
||||
var arr = [],
|
||||
btns = $(view.el).find('.btn-resolve');
|
||||
btns = $(view.el).find('.btn-resolve:not(.comment-resolved)');
|
||||
btns.tooltip({title: me.textResolve, placement: 'cursor'});
|
||||
btns.each(function (idx, item) {
|
||||
arr.push($(item).data('bs.tooltip').tip());
|
||||
});
|
||||
btns = $(view.el).find('.btn-resolve-check');
|
||||
btns = $(view.el).find('.comment-resolved');
|
||||
btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
|
||||
btns.each(function (idx, item) {
|
||||
arr.push($(item).data('bs.tooltip').tip());
|
||||
|
|
@ -451,14 +451,7 @@ define([
|
|||
|
||||
readdresolves();
|
||||
|
||||
} else if (btn.hasClass('btn-resolve', false)) {
|
||||
var tip = btn.data('bs.tooltip');
|
||||
if (tip) tip.dontShow = true;
|
||||
|
||||
me.fireEvent('comment:resolve', [commentId]);
|
||||
|
||||
readdresolves();
|
||||
} else if (btn.hasClass('btn-resolve-check', false)) {
|
||||
} else if (btn.hasClass('btn-resolve')) {
|
||||
var tip = btn.data('bs.tooltip');
|
||||
if (tip) tip.dontShow = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
'<div class="separator horizontal"></div>',
|
||||
'<div class="footer right">',
|
||||
'<button class="btn normal dlg-btn" result="replace">'+this.txtBtnReplace+'</button>',
|
||||
'<button class="btn normal dlg-btn" result="replaceall" style="margin-left: 6px;">'+this.txtBtnReplaceAll+'</button>',
|
||||
'<button class="btn normal dlg-btn" result="replaceall" style="margin-left: 6px;width: auto;">'+this.txtBtnReplaceAll+'</button>',
|
||||
'<button class="btn normal dlg-btn iconic" result="back"><span class="icon img-commonctrl back"></span></button>',
|
||||
'<button class="btn normal dlg-btn iconic" result="next" style="margin-left: 6px;"><span class="icon img-commonctrl next"></span></button>',
|
||||
'</div>'
|
||||
|
|
|
|||
|
|
@ -752,9 +752,9 @@ define([
|
|||
el: $window.find('#symbol-table-special-list'),
|
||||
store: new Common.UI.DataViewStore(data),
|
||||
simpleAddMode: true,
|
||||
template: _.template(['<div class="listview inner" style=""></div>'].join('')),
|
||||
cls: 'dbl-clickable',
|
||||
itemTemplate: _.template([
|
||||
'<div id="<%= id %>" class="list-item" style="pointer-events:none;width: 100%;display:flex;">',
|
||||
'<div id="<%= id %>" class="list-item" style="width: 100%;display:flex;">',
|
||||
'<div style="width:70px;text-align: center; padding-right: 5px;"><%= symbol %></div>',
|
||||
'<div style="flex-grow:1;padding-right: 5px;"><%= description %></div>',
|
||||
'<% if (' + this.showShortcutKey + ') { %>',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7249 13.8022C62.4284 15.6827 61.3173 18.5757 61.3173 22.4089C61.3173 26.2422 62.4284 29.1352 64.7249 31.088C67.0213 33.0408 69.614 33.981 72.6512 33.981C75.6143 33.981 78.2812 33.0408 80.5035 31.088C82.7258 29.2075 83.837 26.3145 83.837 22.4813C83.837 18.5757 82.7258 15.755 80.5035 13.8022C78.2812 11.8494 75.6884 10.9092 72.6512 10.9092C69.614 10.9092 66.9472 11.8494 64.7249 13.8022ZM67.688 28.195C66.725 26.9654 66.2064 25.085 66.2064 22.4089C66.2064 19.8052 66.725 17.8524 67.688 16.7675C68.7251 15.538 69.8362 14.7424 71.0215 14.4531L71.0215 14.4531C71.3178 14.3808 71.6141 14.3085 71.8364 14.3085C72.0586 14.2362 72.2808 14.2362 72.5771 14.2362C72.7253 14.2362 72.8549 14.2542 72.9846 14.2723C73.1142 14.2904 73.2438 14.3085 73.392 14.3085C73.6142 14.3085 73.9105 14.3808 74.2069 14.4531C75.3921 14.7424 76.5033 15.538 77.4663 16.7675C78.4293 17.9971 78.9479 19.8775 78.9479 22.4813C78.9479 25.0126 78.4293 26.9654 77.4663 28.195C76.5033 29.4245 75.3921 30.2201 74.2069 30.5094C74.1561 30.5218 74.1075 30.5342 74.0604 30.5462L74.0601 30.5462L74.0601 30.5462C73.8321 30.6044 73.6375 30.654 73.392 30.654C73.0957 30.7264 72.8734 30.7264 72.5771 30.7264C72.466 30.7264 72.3364 30.7083 72.2067 30.6902C72.0771 30.6721 71.9475 30.654 71.8364 30.654C71.5909 30.654 71.3962 30.6044 71.1682 30.5462L71.168 30.5462L71.1676 30.5461C71.1206 30.5341 71.0721 30.5217 71.0215 30.5094C69.8362 30.2201 68.7251 29.4245 67.688 28.195ZM92.356 11.1262H86.2816V33.6918H90.9485V20.3839L90.8745 16.406H90.9485L92.1338 18.9374L100.134 33.6918H106.209V11.1262H101.542V24.3618L101.616 28.412H101.542L100.356 25.302L92.356 11.1262ZM111.024 11.1262H115.691V29.8585H124.876V33.6918H111.024V11.1262ZM127.395 11.1262H121.987L130.506 24.4341V33.6918H135.173V24.5064L143.544 11.1262H138.581L133.766 19.0097L133.025 20.6009H132.877L132.136 19.0097L127.395 11.1262ZM142.951 22.4089C142.951 18.5757 144.063 15.6827 146.359 13.8022C148.581 11.8494 151.248 10.9092 154.285 10.9092C157.323 10.9092 159.915 11.8494 162.138 13.8022C164.36 15.755 165.471 18.5757 165.471 22.4812C165.471 26.3145 164.36 29.2075 162.138 31.088C159.915 33.0408 157.248 33.981 154.285 33.981C151.248 33.981 148.655 33.0408 146.359 31.088C144.137 29.1352 142.951 26.2422 142.951 22.4089ZM147.841 22.4089C147.841 25.085 148.359 26.9654 149.322 28.195C150.359 29.4245 151.396 30.2201 152.656 30.5094C152.697 30.5196 152.738 30.5298 152.777 30.5398L152.802 30.5462C153.03 30.6044 153.225 30.654 153.471 30.654C153.582 30.654 153.711 30.6721 153.841 30.6902C153.971 30.7083 154.1 30.7264 154.211 30.7264C154.508 30.7264 154.73 30.7264 155.026 30.654C155.272 30.654 155.466 30.6044 155.694 30.5462L155.695 30.5461C155.742 30.5341 155.79 30.5217 155.841 30.5094C157.026 30.2201 158.137 29.4245 159.1 28.195C160.063 26.9654 160.582 25.0126 160.582 22.4812C160.582 19.8775 160.063 17.9971 159.1 16.7675C158.137 15.538 157.026 14.7424 155.841 14.4531C155.545 14.3808 155.248 14.3085 155.026 14.3085C154.878 14.3085 154.748 14.2904 154.619 14.2723C154.489 14.2542 154.359 14.2361 154.211 14.2361C153.915 14.2361 153.693 14.2362 153.471 14.3085C153.248 14.3085 152.952 14.3808 152.656 14.4531C151.47 14.7424 150.359 15.538 149.322 16.7675C148.359 17.8524 147.841 19.8052 147.841 22.4089ZM181.62 11.1262H168.73V33.6918H173.397V24.2171H181.25V20.3839H173.397V14.8871H181.62V11.1262ZM185.102 11.1262H197.991V14.8871H189.769V20.3839H197.621V24.2171H189.769V33.6918H185.102V11.1262ZM200.732 11.1262V33.6918H205.399V11.1262H200.732ZM225.963 11.6323V15.5379C225.148 15.2486 224.333 15.0316 223.444 14.887C222.555 14.7423 221.518 14.67 220.481 14.67C218.036 14.67 216.184 15.3932 214.851 16.9121C213.518 18.3586 212.851 20.239 212.851 22.4811C212.851 24.6509 213.443 26.459 214.703 27.9055C215.962 29.352 217.74 30.1476 220.036 30.1476C220.741 30.1476 221.445 30.0936 222.245 30.0323C222.37 30.0226 222.498 30.0128 222.629 30.003C223.592 29.8583 224.555 29.6413 225.592 29.2074L225.889 33.0406C225.74 33.113 225.518 33.1853 225.296 33.2576C225 33.33 224.703 33.4023 224.333 33.4746C223.95 33.568 223.506 33.6312 223 33.7033L223 33.7033C222.722 33.7428 222.426 33.785 222.111 33.8362C221.222 33.9086 220.333 33.9809 219.37 33.9809H218.999H218.629C215.962 33.8362 213.518 32.8237 211.295 31.0879C209.073 29.2797 207.962 26.459 207.962 22.6981C207.962 19.0095 209.073 16.1165 211.221 14.0914C213.369 12.0663 216.333 11.0537 219.962 11.0537C220.925 11.0537 221.814 11.0537 222.555 11.126C223.26 11.1886 223.91 11.3054 224.6 11.4295L224.601 11.4296C224.708 11.4488 224.816 11.4682 224.926 11.4877C225 11.5238 225.092 11.5419 225.185 11.56C225.277 11.5781 225.37 11.5962 225.444 11.6323C225.539 11.5862 225.633 11.5989 225.747 11.6141C225.811 11.6228 225.882 11.6323 225.963 11.6323ZM243.519 11.1262H229.667V33.6918H243.519V30.1478H234.408V23.7832H242.63V20.3116H234.408V14.6702H243.519V11.1262Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="white" fill-opacity="0.5"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="white" fill-opacity="0.75"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="#FF6F3D"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="#95C038"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="#5DC0E8"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 6 KiB After Width: | Height: | Size: 5.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 208 B After Width: | Height: | Size: 201 B |
Binary file not shown.
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 228 B |
Binary file not shown.
|
Before Width: | Height: | Size: 694 B After Width: | Height: | Size: 223 B |
BIN
apps/common/main/resources/img/controls/Scroll_center@1.5x.png
Normal file
BIN
apps/common/main/resources/img/controls/Scroll_center@1.5x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 110 B |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 8.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 213 B After Width: | Height: | Size: 367 B |
Binary file not shown.
|
Before Width: | Height: | Size: 577 B After Width: | Height: | Size: 546 B |
Binary file not shown.
|
Before Width: | Height: | Size: 513 B After Width: | Height: | Size: 977 B |
13
apps/common/main/resources/img/toolbar/1.25x/.css.handlebars
Normal file
13
apps/common/main/resources/img/toolbar/1.25x/.css.handlebars
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{{#spritesheet}}
|
||||
@media only screen {
|
||||
@media (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.4),
|
||||
(min-resolution: 1.25dppx) and (max-resolution: 1.4dppx),
|
||||
(min-resolution: 120dpi) and (max-resolution: 143dpi)
|
||||
{
|
||||
.toolbar__icon, .menu__icon {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{scaled width 1.25}}px auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{{#spritesheet}}
|
||||
@media only screen {
|
||||
@media (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.4),
|
||||
(min-resolution: 1.25dppx) and (max-resolution: 1.4dppx),
|
||||
(min-resolution: 120dpi) and (max-resolution: 143dpi)
|
||||
{
|
||||
.x-huge .toolbar__icon {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{scaled width 1.25}}px auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.toolbar__icon.toolbar__icon-big {
|
||||
background-size: 56px auto;
|
||||
background-size: var(--big-icon-background-image-width) auto;
|
||||
}
|
||||
{{/spritesheet}}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 478 B |
BIN
apps/common/main/resources/img/toolbar/1.25x/btn-arrow-down.png
Normal file
BIN
apps/common/main/resources/img/toolbar/1.25x/btn-arrow-down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 244 B |
BIN
apps/common/main/resources/img/toolbar/1.25x/btn-arrow-up.png
Normal file
BIN
apps/common/main/resources/img/toolbar/1.25x/btn-arrow-up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 234 B |
Binary file not shown.
|
Before Width: | Height: | Size: 356 B |
Binary file not shown.
|
Before Width: | Height: | Size: 349 B |
|
|
@ -0,0 +1,6 @@
|
|||
{{#spritesheet}}
|
||||
.options__icon.options__icon-huge {
|
||||
background-size: 80px auto;
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{{#spritesheet}}
|
||||
@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)
|
||||
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.7),
|
||||
(min-resolution: 1.5dppx) and (max-resolution: 1.7dppx),
|
||||
(min-resolution: 144dpi) and (max-resolution: 167dpi)
|
||||
{
|
||||
.toolbar__icon, .menu__icon {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{{#spritesheet}}
|
||||
@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)
|
||||
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.7),
|
||||
(min-resolution: 1.5dppx) and (max-resolution: 1.7dppx),
|
||||
(min-resolution: 144dpi) and (max-resolution: 167dpi)
|
||||
{
|
||||
.x-huge .toolbar__icon {
|
||||
.x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{scaled width 1.5}}px auto;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
{{#spritesheet}}
|
||||
.options__icon.options__icon-huge {
|
||||
background-size: 80px auto;
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
@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)
|
||||
{
|
||||
.options__icon.options__icon-huge {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: 80px auto;
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
|
|||
13
apps/common/main/resources/img/toolbar/1.75x/.css.handlebars
Normal file
13
apps/common/main/resources/img/toolbar/1.75x/.css.handlebars
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{{#spritesheet}}
|
||||
@media only screen {
|
||||
@media (-webkit-min-device-pixel-ratio: 1.75) and (-webkit-max-device-pixel-ratio: 1.9),
|
||||
(min-resolution: 1.75dppx) and (max-resolution: 1.9dppx),
|
||||
(min-resolution: 168dpi) and (max-resolution: 191dpi)
|
||||
{
|
||||
.toolbar__icon, .menu__icon {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{scaled width 1.75}}px auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{{#spritesheet}}
|
||||
@media only screen {
|
||||
@media (-webkit-min-device-pixel-ratio: 1.75) and (-webkit-max-device-pixel-ratio: 1.9),
|
||||
(min-resolution: 1.75dppx) and (max-resolution: 1.9dppx),
|
||||
(min-resolution: 168dpi) and (max-resolution: 191dpi)
|
||||
{
|
||||
.x-huge .toolbar__icon {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{scaled width 1.75}}px auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.toolbar__icon.toolbar__icon-big {
|
||||
background-size: 56px auto;
|
||||
background-size: var(--big-icon-background-image-width) auto;
|
||||
}
|
||||
{{/spritesheet}}
|
||||
BIN
apps/common/main/resources/img/toolbar/1.75x/btn-arrow-down.png
Normal file
BIN
apps/common/main/resources/img/toolbar/1.75x/btn-arrow-down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 277 B |
BIN
apps/common/main/resources/img/toolbar/1.75x/btn-arrow-up.png
Normal file
BIN
apps/common/main/resources/img/toolbar/1.75x/btn-arrow-up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 261 B |
Binary file not shown.
|
Before Width: | Height: | Size: 424 B |
Binary file not shown.
|
Before Width: | Height: | Size: 453 B |
|
|
@ -0,0 +1,6 @@
|
|||
{{#spritesheet}}
|
||||
.options__icon.options__icon-huge {
|
||||
background-size: 80px auto;
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
&.active, &:active {
|
||||
&:not(:disabled):not(.disabled) {
|
||||
.toolbar__icon {
|
||||
@btn-active-icon-offset: 0;
|
||||
@btn-active-icon-offset: -20px;
|
||||
background-position-x: @btn-active-icon-offset;
|
||||
|
||||
background-position-x: var(--button-small-active-icon-offset-x, 0);
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
}
|
||||
.menu__icon {
|
||||
.no-checkmark.checked & {
|
||||
background-position-x: 0;
|
||||
background-position-x: -20px;
|
||||
background-position-x: @menu-icon-item-checked-offset-x;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
&.active, &:active {
|
||||
&:not(:disabled):not(.disabled) {
|
||||
.toolbar__icon {
|
||||
background-position-x: 0;
|
||||
background-position-x: -28px;
|
||||
background-position-x: var(--button-xhuge-active-icon-offset-x,0);
|
||||
}
|
||||
}
|
||||
|
|
@ -14,18 +14,15 @@
|
|||
&.active, &:active {
|
||||
&:not(:disabled):not(.disabled) {
|
||||
.toolbar__icon.toolbar__icon-big {
|
||||
background-position-x: 0;
|
||||
background-position-x: -28px;
|
||||
background-position-x: var(--button-xhuge-active-icon-offset-x,0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.x-huge .toolbar__icon {
|
||||
.x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
}
|
||||
.toolbar__icon.toolbar__icon-big {
|
||||
background-image: var(--big-icon-background-image);
|
||||
}
|
||||
{{/spritesheet}}
|
||||
{{#sprites}}
|
||||
{{#parselang name}}.x-huge .{{name}}{{/parselang}},
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{{#spritesheet}}
|
||||
.btn {
|
||||
.options__icon.options__icon-huge {
|
||||
background-position-x: 0;
|
||||
background-position-x: -40px;
|
||||
background-position-x: var(--button-huge-normal-icon-offset-x,0);
|
||||
}
|
||||
|
||||
&.active, &:active {
|
||||
&:not(:disabled):not(.disabled) {
|
||||
.options__icon.options__icon-huge {
|
||||
@btn-active-icon-offset: 0;
|
||||
@btn-active-icon-offset: -40px;
|
||||
background-position-x: @btn-active-icon-offset;
|
||||
background-position-x: var(--button-huge-active-icon-offset-x,0);
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
}
|
||||
|
||||
.options__icon.options__icon-huge {
|
||||
background-image: var(--huge-icon-background-image);
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
}
|
||||
{{/spritesheet}}
|
||||
{{#sprites}}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
@media (-webkit-min-device-pixel-ratio: 2),
|
||||
(min-resolution: 2dppx), (min-resolution: 192dpi)
|
||||
{
|
||||
.x-huge .toolbar__icon {
|
||||
.x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: {{half width}}px auto;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{{#spritesheet}}
|
||||
.options__icon.options__icon-huge {
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
@media only screen {
|
||||
@media (-webkit-min-device-pixel-ratio: 2),
|
||||
(min-resolution: 2dppx), (min-resolution: 192dpi)
|
||||
{
|
||||
.options__icon.options__icon-huge {
|
||||
background-image: url(resources/{{{escaped_image}}});
|
||||
background-size: var(--huge-icon-background-image-width) auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
{{/spritesheet}}
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@
|
|||
&.active:not(.disabled){
|
||||
.caret {
|
||||
transform: rotate(45deg);
|
||||
border-color: @icon-normal-pressed-ie;
|
||||
border-color: @icon-normal-pressed;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -227,7 +229,7 @@
|
|||
|
||||
.inner-box-caption {
|
||||
line-height: 18px;
|
||||
padding: 0 4px;
|
||||
padding: 0 2px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
|
|
@ -301,6 +303,14 @@
|
|||
}
|
||||
}
|
||||
|
||||
.icon-top.btn-group {
|
||||
&.x-huge, .x-huge {
|
||||
.inner-box-caption {
|
||||
padding-right: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.icon-top {
|
||||
&.x-huge {
|
||||
.btn&, .btn-group& .btn-toolbar {
|
||||
|
|
@ -361,8 +371,8 @@
|
|||
|
||||
&:active:not(.disabled),
|
||||
&.active:not(.disabled) {
|
||||
color: @text-normal-ie;
|
||||
color: @text-normal;
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
background-color: @highlight-button-pressed-ie;
|
||||
background-color: @highlight-button-pressed;
|
||||
}
|
||||
|
|
@ -423,8 +433,8 @@
|
|||
height: 3px;
|
||||
background-color: red;
|
||||
&.bordered {
|
||||
border: 1px solid @border-regular-control-ie;
|
||||
border: 1px solid @border-regular-control;
|
||||
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
|
||||
border: @scaled-one-px-value solid @border-regular-control;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -566,8 +576,8 @@
|
|||
|
||||
&.over:not(.disabled),
|
||||
&.open {
|
||||
box-shadow: inset 0 0 0 1px @highlight-button-hover-ie;
|
||||
box-shadow: inset 0 0 0 1px @highlight-button-hover;
|
||||
box-shadow: inset 0 0 0 @scaled-one-px-value-ie @highlight-button-hover-ie;
|
||||
box-shadow: inset 0 0 0 @scaled-one-px-value @highlight-button-hover;
|
||||
|
||||
button:not(.active):not(.btn-text-split-default) {
|
||||
background-color: transparent;
|
||||
|
|
@ -723,6 +733,12 @@
|
|||
background-color: @highlight-button-pressed-ie;
|
||||
background-color: @highlight-button-pressed;
|
||||
}
|
||||
|
||||
&.large {
|
||||
min-width: 28px;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-text-default {
|
||||
|
|
@ -901,10 +917,6 @@
|
|||
&.template-table {
|
||||
width: 92px;
|
||||
}
|
||||
&.sheet-template-table {
|
||||
width: 83px;
|
||||
height: 54px;
|
||||
}
|
||||
|
||||
.icon-template-slicer.icon {
|
||||
min-width: 36px;
|
||||
|
|
@ -925,6 +937,17 @@
|
|||
position: relative;
|
||||
}
|
||||
|
||||
&.sheet-template-table {
|
||||
width: 83px;
|
||||
height: 54px;
|
||||
|
||||
.icon {
|
||||
border: none;
|
||||
.box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie);
|
||||
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
|
||||
}
|
||||
}
|
||||
|
||||
svg.icon {
|
||||
vertical-align: middle;
|
||||
width: 52px;
|
||||
|
|
@ -943,6 +966,12 @@
|
|||
&.active {
|
||||
background-color: @background-normal-ie !important;
|
||||
background-color: @background-normal !important;
|
||||
|
||||
&:not(:disabled) {
|
||||
svg.icon {
|
||||
opacity: inherit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:active:not(.disabled),
|
||||
|
|
@ -958,6 +987,57 @@
|
|||
}
|
||||
}
|
||||
|
||||
.cnt-lang {
|
||||
color: @text-normal-ie;
|
||||
color: @text-normal;
|
||||
height: 20px;
|
||||
line-height: 18px;
|
||||
border: 0;
|
||||
.border-radius(1px);
|
||||
vertical-align: middle;
|
||||
|
||||
.dropdown-toggle {
|
||||
margin: 0 6px 0 4px;
|
||||
}
|
||||
|
||||
&:hover:not(.disabled) {
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
}
|
||||
|
||||
&[disabled], &.disabled {
|
||||
opacity: @component-disabled-opacity;
|
||||
}
|
||||
|
||||
.caret {
|
||||
width: 4px;
|
||||
height: 4px;
|
||||
border: solid 1px @icon-normal-ie;
|
||||
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);
|
||||
}
|
||||
|
||||
&.open:not(.disabled){
|
||||
&, .status-label {
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
}
|
||||
|
||||
background-color: @highlight-button-pressed-ie;
|
||||
background-color: @highlight-button-pressed;
|
||||
|
||||
.caret {
|
||||
transform: rotate(45deg);
|
||||
border-color: @icon-normal-pressed-ie;
|
||||
border-color: @icon-normal-pressed;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Dialog buttons
|
||||
// ------------------------
|
||||
|
||||
|
|
@ -968,8 +1048,8 @@
|
|||
color: @text-normal;
|
||||
background-color: @background-normal-ie;
|
||||
background-color: @background-normal;
|
||||
border: 1px solid @border-regular-control-ie;
|
||||
border: 1px solid @border-regular-control;
|
||||
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
|
||||
border: @scaled-one-px-value solid @border-regular-control;
|
||||
|
||||
&:hover:not(.disabled),
|
||||
&.hover:not(.disabled) {
|
||||
|
|
|
|||
|
|
@ -6,60 +6,89 @@
|
|||
box-shadow: none;
|
||||
}
|
||||
.calendar-box {
|
||||
width: 198px;
|
||||
height: 220px;
|
||||
border: 1px solid @calendar-bg-color;
|
||||
width: 212px;
|
||||
height: 244px;
|
||||
box-shadow: 0px 2px 5px @background-scrim-ie;
|
||||
box-shadow: 0px 2px 5px @background-scrim;
|
||||
border-radius: 2px;
|
||||
background-color: @background-normal-ie;
|
||||
background-color: @background-normal;
|
||||
|
||||
.top-row {
|
||||
padding: 0 5px;
|
||||
}
|
||||
.btn {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
margin-top: 4px;
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
.icon {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
display: block;
|
||||
position: relative;
|
||||
&.arrow-prev {
|
||||
background-position: -55px -96px;
|
||||
background-position: -38px -96px;
|
||||
}
|
||||
&.arrow-next {
|
||||
background-position: -52px -112px;
|
||||
background-position: -36px -112px;
|
||||
}
|
||||
}
|
||||
&:hover {
|
||||
background-color: rgba(255,255,255,0.2);
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
&:active {
|
||||
background-color: @highlight-button-pressed-ie;
|
||||
background-color: @highlight-button-pressed;
|
||||
}
|
||||
}
|
||||
.calendar-header {
|
||||
height: 50px;
|
||||
background-color: @calendar-bg-color;
|
||||
color: #FFFFFF;
|
||||
height: 68px;
|
||||
color: @text-normal-ie;
|
||||
color: @text-normal;
|
||||
padding: 8px;
|
||||
padding-bottom: 0;
|
||||
|
||||
.top-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.bottom-row {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
padding: 0;
|
||||
height: 28px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.view-years &,
|
||||
.view-months & {
|
||||
height: 40px;
|
||||
|
||||
.bottom-row {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
width: 100%;
|
||||
margin: 4px 6px 3px 6px;
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
font-size: 11px;
|
||||
|
||||
label {
|
||||
padding: 2px 10px 0;
|
||||
display: block;
|
||||
font-weight: bold;
|
||||
//font-weight: bold;
|
||||
&:not(:last-of-type) {
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
|
@ -68,7 +97,8 @@
|
|||
height: 100%;
|
||||
width: 100%;
|
||||
&:hover {
|
||||
background-color: rgba(255,255,255,0.2);
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
cursor: pointer;
|
||||
label {
|
||||
cursor: pointer;
|
||||
|
|
@ -79,34 +109,40 @@
|
|||
}
|
||||
}
|
||||
.calendar-content {
|
||||
padding: 0 8px;
|
||||
|
||||
.item {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
height: auto;
|
||||
width: auto;
|
||||
box-shadow: none;
|
||||
border: 1px solid #fff;
|
||||
|
||||
.name-month, .name-year {
|
||||
height: 40px;
|
||||
width: 47px;
|
||||
background-color: #F1F1F1;
|
||||
height: 49px;
|
||||
width: 49px;
|
||||
background-color: @background-normal;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.number-day {
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
background-color: #F1F1F1;
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
.number-day, .name-month, .name-year {
|
||||
color: #fff;
|
||||
background-color: #7D858C;
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
background-color: @highlight-button-pressed-ie;
|
||||
background-color: @highlight-button-pressed;
|
||||
border-radius: 2px;
|
||||
}
|
||||
}
|
||||
.weekend {
|
||||
|
|
@ -118,7 +154,7 @@
|
|||
&:not(.disabled):not(.selected) {
|
||||
.number-day, .name-month, .name-year {
|
||||
&:hover {
|
||||
background-color: #D9D9D9;
|
||||
background-color: @highlight-button-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,8 +154,8 @@
|
|||
font-size: 12px;
|
||||
|
||||
&:focus {
|
||||
border-color: @border-preview-select-ie;
|
||||
border-color: @border-preview-select;
|
||||
border-color: @border-control-focus-ie;
|
||||
border-color: @border-control-focus;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
130
apps/common/main/resources/less/colors-table-classic.less
Normal file
130
apps/common/main/resources/less/colors-table-classic.less
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
|
||||
:root {
|
||||
.theme-classic-light {
|
||||
--toolbar-header-document: #446995;
|
||||
--toolbar-header-spreadsheet: #40865c;
|
||||
--toolbar-header-presentation: #aa5252;
|
||||
|
||||
--background-normal: #fff;
|
||||
--background-toolbar: #f1f1f1;
|
||||
--background-toolbar-additional: #f1f1f1;
|
||||
--background-primary-dialog-button: #7d858c;
|
||||
--background-tab-underline: #444;
|
||||
--background-notification-popover: #fcfed7;
|
||||
--background-notification-badge: #ffd112;
|
||||
--background-scrim: fade(#000, 20%);
|
||||
--background-loader: fade(#000, 65%);
|
||||
|
||||
--highlight-button-hover: #d8dadc;
|
||||
--highlight-button-pressed: #7d858c;
|
||||
--highlight-button-pressed-hover: #7d858c;
|
||||
--highlight-primary-dialog-button-hover: #666d73;
|
||||
--highlight-header-button-hover: fade(#fff, 20%);
|
||||
--highlight-header-button-pressed: fade(#000, 20%);
|
||||
--highlight-toolbar-tab-underline: #444;
|
||||
--highlight-text-select: #3494fb;
|
||||
|
||||
--border-toolbar: #cbcbcb;
|
||||
--border-divider: #cbcbcb;
|
||||
--border-regular-control: #cfcfcf;
|
||||
--border-toolbar-button-hover: #d8dadc;
|
||||
--border-preview-hover: #cfcfcf;
|
||||
--border-preview-select: #848484;
|
||||
--border-control-focus: #848484;
|
||||
--border-color-shading: fade(#000, 20%);
|
||||
--border-error: #d9534f;
|
||||
|
||||
--text-normal: #444;
|
||||
--text-normal-pressed: #fff;
|
||||
--text-secondary: #a5a5a5;
|
||||
--text-tertiary: #a5a5a5;
|
||||
--text-link: #445799;
|
||||
--text-link-hover: #445799;
|
||||
--text-link-active: #445799;
|
||||
--text-link-visited: #445799;
|
||||
--text-inverse: #fff;
|
||||
--text-toolbar-header: #fff;
|
||||
--text-contrast-background: #fff;
|
||||
|
||||
--icon-normal: #444;
|
||||
--icon-normal-pressed: #fff;
|
||||
--icon-inverse: #444;
|
||||
--icon-toolbar-header: fade(#fff, 80%);
|
||||
--icon-notification-badge: #000;
|
||||
--icon-contrast-popover: #fff;
|
||||
--icon-success: #5b9f27;
|
||||
|
||||
// Canvas
|
||||
|
||||
--canvas-background: #e2e2e2;
|
||||
--canvas-content-background: #fff;
|
||||
--canvas-page-border: #bbbec2;
|
||||
|
||||
--canvas-ruler-background: #fff;
|
||||
--canvas-ruler-margins-background: #d6d6d6;
|
||||
--canvas-ruler-mark: #585b5e;
|
||||
--canvas-ruler-handle-border: #555;
|
||||
--canvas-ruler-handle-border-disabled: #a9afb5;
|
||||
|
||||
--canvas-high-contrast: #000;
|
||||
--canvas-high-contrast-disabled: #82878f;
|
||||
|
||||
--canvas-cell-border: fade(#000, 10%);
|
||||
--canvas-cell-title-hover: #d6d6d6;
|
||||
--canvas-cell-title-selected: #c1c1c1;
|
||||
--canvas-cell-title-border: #cdcdcd;
|
||||
--canvas-cell-title-border-hover: #afafaf;
|
||||
--canvas-cell-title-border-selected: #929292;
|
||||
|
||||
--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: #f1f1f1;
|
||||
--canvas-scroll-thumb-hover: #cfcfcf;
|
||||
--canvas-scroll-thumb-pressed: #adadad;
|
||||
--canvas-scroll-thumb-border: #cfcfcf;
|
||||
--canvas-scroll-thumb-border-hover: #cfcfcf;
|
||||
--canvas-scroll-thumb-border-pressed: #adadad;
|
||||
--canvas-scroll-arrow: #adadad;
|
||||
--canvas-scroll-arrow-hover: #f1f1f1;
|
||||
--canvas-scroll-arrow-pressed: #f1f1f1;
|
||||
--canvas-scroll-thumb-target: #cfcfcf;
|
||||
--canvas-scroll-thumb-target-hover: #f1f1f1;
|
||||
--canvas-scroll-thumb-target-pressed: #f1f1f1;
|
||||
|
||||
// Others
|
||||
|
||||
--button-small-normal-icon-offset-x: 0;
|
||||
--button-small-active-icon-offset-x: -20px;
|
||||
--button-large-normal-icon-offset-x: 0;
|
||||
--button-large-active-icon-offset-x: -31px;
|
||||
--button-huge-normal-icon-offset-x: 0;
|
||||
--button-huge-active-icon-offset-x: -40px;
|
||||
--button-xhuge-normal-icon-offset-x: 0;
|
||||
--button-xhuge-active-icon-offset-x: -28px;
|
||||
//--button-xhuge-normal-icon-offset-x: -37px;
|
||||
//--button-xhuge-active-icon-offset-x: -37px;
|
||||
|
||||
--modal-window-mask-opacity: 0.6;
|
||||
--image-border-types-filter: none;
|
||||
--image-border-types-filter-selected: invert(100%) brightness(4);
|
||||
--component-normal-icon-filter: none;
|
||||
|
||||
--component-normal-icon-opacity: .8;
|
||||
--component-hover-icon-opacity: .8;
|
||||
--component-active-icon-opacity: 1;
|
||||
--component-active-hover-icon-opacity: 1;
|
||||
--component-disabled-opacity: .4;
|
||||
|
||||
--header-component-normal-icon-opacity: 1;
|
||||
--header-component-hover-icon-opacity: 1;
|
||||
--header-component-active-icon-opacity: 1;
|
||||
--header-component-active-hover-icon-opacity: 1;
|
||||
|
||||
--menu-icon-item-checked-offset-x: -20px;
|
||||
}
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
--background-alt-key-hint: #FFD938;
|
||||
|
||||
--highlight-button-hover: #555;
|
||||
--highlight-button-pressed: #606060;
|
||||
--highlight-button-pressed: #707070;
|
||||
--highlight-button-pressed-hover: #808080;
|
||||
--highlight-primary-dialog-button-hover: #fcfcfc;
|
||||
--highlight-header-button-hover: fade(#fff, 5%);
|
||||
|
|
@ -27,12 +27,12 @@
|
|||
|
||||
--border-toolbar: #2a2a2a;
|
||||
--border-divider: #505050;
|
||||
--border-regular-control: #666666;
|
||||
--border-regular-control: #666;
|
||||
--border-toolbar-button-hover: #5a5a5a;
|
||||
--border-preview-hover: #5a5a5a;
|
||||
--border-preview-select: #666666;
|
||||
--border-preview-hover: #757575;
|
||||
--border-preview-select: #bdbdbd;
|
||||
--border-control-focus: #ccc;
|
||||
--border-color-shading: fade(#fff, 5%);
|
||||
--border-color-shading: fade(#fff, 10%);
|
||||
--border-error: #f62211;
|
||||
|
||||
--text-normal: fade(#fff, 80%);
|
||||
|
|
@ -40,6 +40,9 @@
|
|||
--text-secondary: fade(#fff, 60%);
|
||||
--text-tertiary: fade(#fff, 40%);
|
||||
--text-link: #b5e4ff;
|
||||
--text-link-hover: #b5e4ff;
|
||||
--text-link-active: #b5e4ff;
|
||||
--text-link-visited: #b5e4ff;
|
||||
--text-inverse: #333;
|
||||
--text-toolbar-header: fade(#fff, 80%);
|
||||
--text-contrast-background: #fff;
|
||||
|
|
@ -52,8 +55,9 @@
|
|||
--icon-contrast-popover: #fff;
|
||||
--icon-success: #090;
|
||||
|
||||
// Canvas colors
|
||||
--canvas-background: #666666;
|
||||
// Canvas
|
||||
|
||||
--canvas-background: #666;
|
||||
--canvas-content-background: #fff;
|
||||
--canvas-page-border: #555;
|
||||
|
||||
|
|
@ -64,7 +68,7 @@
|
|||
--canvas-ruler-handle-border-disabled: #808080;
|
||||
|
||||
--canvas-high-contrast: #fff;
|
||||
--canvas-high-contrast-disabled: #888;
|
||||
--canvas-high-contrast-disabled: #ccc;
|
||||
|
||||
--canvas-cell-border: fade(#000, 10%);
|
||||
--canvas-cell-title-border: #757575;
|
||||
|
|
@ -115,7 +119,12 @@
|
|||
--component-hover-icon-opacity: .8;
|
||||
--component-active-icon-opacity: 1;
|
||||
--component-active-hover-icon-opacity: 1;
|
||||
--component-disabled-opacity: .3;
|
||||
--component-disabled-opacity: .4;
|
||||
|
||||
--header-component-normal-icon-opacity: .8;
|
||||
--header-component-hover-icon-opacity: .8;
|
||||
--header-component-active-icon-opacity: 1;
|
||||
--header-component-active-hover-icon-opacity: 1;
|
||||
|
||||
--menu-icon-item-checked-offset-x: -20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,51 +4,51 @@
|
|||
@toolbar-header-presentation-ie: #aa5252;
|
||||
|
||||
@background-normal-ie: #fff;
|
||||
@background-toolbar-ie: #f7f7f7;
|
||||
@background-toolbar-additional-ie: #efefef;
|
||||
@background-primary-dialog-button-ie: #444;
|
||||
@background-toolbar-ie: #f1f1f1;
|
||||
@background-toolbar-additional-ie: #f1f1f1;
|
||||
@background-primary-dialog-button-ie: #7d858c;
|
||||
@background-tab-underline-ie: #444;
|
||||
@background-notification-popover-ie: #fcfed7;
|
||||
@background-notification-badge-ie: #ffd112;
|
||||
@background-scrim-ie: fade(#000, 20%);
|
||||
@background-loader-ie: fade(#181818, 90%);
|
||||
@background-loader-ie: fade(#000, 65%);
|
||||
@background-alt-key-hint-ie: #FFD938;
|
||||
|
||||
@highlight-button-hover-ie: #e0e0e0;
|
||||
@highlight-button-pressed-ie: #ccc;
|
||||
@highlight-button-pressed-hover-ie: #bababa;
|
||||
@highlight-primary-dialog-button-hover-ie: #2b2b2b;
|
||||
@highlight-button-hover-ie: #d8dadc;
|
||||
@highlight-button-pressed-ie: #7d858c;
|
||||
@highlight-button-pressed-hover-ie: #7d858c;
|
||||
@highlight-primary-dialog-button-hover-ie: #666d73;
|
||||
@highlight-header-button-hover-ie: fade(#fff, 20%);
|
||||
@highlight-header-button-pressed-ie: fade(#fff, 25%);
|
||||
@highlight-header-button-pressed-ie: fade(#000, 20%);
|
||||
@highlight-toolbar-tab-underline-ie: #444;
|
||||
@highlight-text-select-ie: #3494fb;
|
||||
|
||||
@border-toolbar-ie: #cbcbcb;
|
||||
@border-divider-ie: #dfdfdf;
|
||||
@border-regular-control-ie: #c0c0c0;
|
||||
@border-toolbar-button-hover-ie: #e0e0e0;
|
||||
@border-divider-ie: #cbcbcb;
|
||||
@border-regular-control-ie: #cfcfcf;
|
||||
@border-toolbar-button-hover-ie: #d8dadc;
|
||||
@border-preview-hover-ie: #cfcfcf;
|
||||
@border-preview-select-ie: #aaa;
|
||||
@border-preview-select-ie: #848484;
|
||||
@border-control-focus-ie: #848484;
|
||||
@border-color-shading-ie: fade(#000, 10%);
|
||||
@border-error-ie: #f62211;
|
||||
@border-color-shading-ie: fade(#000, 20%);
|
||||
@border-error-ie: #d9534f;
|
||||
|
||||
@text-normal-ie: fade(#000, 80%);
|
||||
@text-normal-pressed-ie: fade(#000, 80%);
|
||||
@text-secondary-ie: fade(#000, 60%);
|
||||
@text-tertiary-ie: fade(#000, 40%);
|
||||
@text-link-ie: #445799;
|
||||
@text-normal-ie: #444;
|
||||
@text-normal-pressed-ie: #fff;
|
||||
@text-secondary-ie: #a5a5a5;
|
||||
@text-tertiary-ie: #a5a5a5;
|
||||
@text-link-ie: #acbfff;
|
||||
@text-inverse-ie: #fff;
|
||||
@text-toolbar-header-ie: #fff;
|
||||
@text-contrast-background-ie: #fff;
|
||||
|
||||
@icon-normal-ie: #444;
|
||||
@icon-normal-pressed-ie: #444;
|
||||
@icon-inverse-ie: #fff;
|
||||
@icon-toolbar-header-ie: #fff;
|
||||
@icon-normal-pressed-ie: #fff;
|
||||
@icon-inverse-ie: #444;
|
||||
@icon-toolbar-header-ie: fade(#fff, 80%);
|
||||
@icon-notification-badge-ie: #000;
|
||||
@icon-contrast-popover-ie: #fff;
|
||||
@icon-success-ie: #090;
|
||||
@icon-success-ie: #5b9f27;
|
||||
|
||||
@button-header-normal-icon-offset-x-ie: -20px;
|
||||
@button-header-active-icon-offset-x-ie: -20px;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
--background-alt-key-hint: #FFD938;
|
||||
|
||||
--highlight-button-hover: #e0e0e0;
|
||||
--highlight-button-pressed: #ccc;
|
||||
--highlight-button-pressed: #cbcbcb;
|
||||
--highlight-button-pressed-hover: #bababa;
|
||||
--highlight-primary-dialog-button-hover: #1c1c1c;
|
||||
--highlight-header-button-hover: fade(#fff, 15%);
|
||||
|
|
@ -39,10 +39,10 @@
|
|||
--border-divider: #dfdfdf;
|
||||
--border-regular-control: #c0c0c0;
|
||||
--border-toolbar-button-hover: #e0e0e0;
|
||||
--border-preview-hover: #cfcfcf;
|
||||
--border-preview-select: #aaa;
|
||||
--border-preview-hover: #bababa;
|
||||
--border-preview-select: #888;
|
||||
--border-control-focus: #848484;
|
||||
--border-color-shading: fade(#000, 10%);
|
||||
--border-color-shading: fade(#000, 15%);
|
||||
--border-error: #f62211;
|
||||
|
||||
--text-normal: fade(#000, 80%);
|
||||
|
|
@ -50,6 +50,9 @@
|
|||
--text-secondary: fade(#000, 60%);
|
||||
--text-tertiary: fade(#000, 40%);
|
||||
--text-link: #445799;
|
||||
--text-link-hover: #445799;
|
||||
--text-link-active: #445799;
|
||||
--text-link-visited: #445799;
|
||||
--text-inverse: #fff;
|
||||
--text-toolbar-header: #fff;
|
||||
--text-contrast-background: #fff;
|
||||
|
|
@ -75,14 +78,14 @@
|
|||
--canvas-ruler-handle-border-disabled: #aaa;
|
||||
|
||||
--canvas-high-contrast: #000;
|
||||
--canvas-high-contrast-disabled: #999;
|
||||
--canvas-high-contrast-disabled: #666;
|
||||
|
||||
--canvas-cell-border: fade(black, 10%);
|
||||
--canvas-cell-border: fade(#000, 10%);
|
||||
--canvas-cell-title-hover: #dfdfdf;
|
||||
--canvas-cell-title-selected: #cfcfcf;
|
||||
--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 ;
|
||||
|
|
@ -128,6 +131,11 @@
|
|||
--component-active-icon-opacity: 1;
|
||||
--component-active-hover-icon-opacity: 1;
|
||||
--component-disabled-opacity: .4;
|
||||
|
||||
--header-component-normal-icon-opacity: 1;
|
||||
--header-component-hover-icon-opacity: 1;
|
||||
--header-component-active-icon-opacity: 1;
|
||||
--header-component-active-hover-icon-opacity: 1;
|
||||
//--button-icon-opacity: 1;
|
||||
}
|
||||
|
||||
|
|
@ -174,6 +182,9 @@
|
|||
@text-secondary: var(--text-secondary);
|
||||
@text-tertiary: var(--text-tertiary);
|
||||
@text-link: var(--text-link);
|
||||
@text-link-hover: var(--text-link-hover);
|
||||
@text-link-active: var(--text-link-active);
|
||||
@text-link-visited: var(--text-link-visited);
|
||||
@text-inverse: var(--text-inverse);
|
||||
@text-toolbar-header: var(--text-toolbar-header);
|
||||
@text-contrast-background: var(--text-contrast-background);
|
||||
|
|
@ -209,8 +220,17 @@
|
|||
@component-disabled-opacity: var(--component-disabled-opacity, .4);
|
||||
//@button-icon-opacity: var(--button-icon-opacity, 1);
|
||||
|
||||
@header-component-normal-icon-opacity: var(--header-component-normal-icon-opacity, 1);
|
||||
@header-component-hover-icon-opacity: var(--header-component-hover-icon-opacity, 1);
|
||||
@header-component-active-icon-opacity: var(--header-component-active-icon-opacity, 1);
|
||||
@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1);
|
||||
|
||||
@menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0);
|
||||
@img-border-type-filter: var(--image-border-types-filter, none);
|
||||
@img-border-type-filter-selected: var(--image-border-types-filter-selected, none);
|
||||
|
||||
// Canvas
|
||||
// ---------------------------
|
||||
@canvas-background: var(--canvas-background);
|
||||
@canvas-content-background: var(--canvas-content-background);
|
||||
@canvas-page-border: var(--canvas-page-border);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,14 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
&.input-group-nr {
|
||||
.form-control:not(input) {
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
li {
|
||||
a {
|
||||
white-space: normal;
|
||||
|
|
@ -28,28 +36,19 @@
|
|||
height: 100%;
|
||||
display: inline-block;
|
||||
background-color: transparent;
|
||||
margin: -1px 0 0 -3px;
|
||||
margin: 0 0 0 -3px;
|
||||
}
|
||||
|
||||
img, .image {
|
||||
background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0";
|
||||
background-size: 60px auto;
|
||||
|
||||
@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)
|
||||
//{
|
||||
// background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
|
||||
// background-size: 60px auto;
|
||||
//}
|
||||
.pixel-ratio__1_5 & {
|
||||
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
|
||||
}
|
||||
|
||||
@media (-webkit-min-device-pixel-ratio: 2),
|
||||
(min-resolution: 2dppx),
|
||||
(min-resolution: 192dpi)
|
||||
{
|
||||
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
|
||||
background-size: 60px auto;
|
||||
}
|
||||
.pixel-ratio__2 & {
|
||||
background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@
|
|||
margin: 0 @minus-px-ie @minus-px-ie 0;
|
||||
margin: 0 @minus-px @minus-px 0;
|
||||
height: @combo-dataview-height;
|
||||
|
||||
background-color: @background-normal-ie;
|
||||
background-color: @background-normal;
|
||||
|
||||
&:hover {
|
||||
.box-inner-shadow(0 0 0 2px @border-preview-hover-ie);
|
||||
|
|
@ -143,8 +144,9 @@
|
|||
width: auto;
|
||||
position: relative;
|
||||
border: none;
|
||||
.box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie);
|
||||
.box-shadow(0 0 0 @scaled-one-px-value @background-normal);
|
||||
//.box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie);
|
||||
//.box-shadow(0 0 0 @scaled-one-px-value @background-normal);
|
||||
background-color: @canvas-content-background;
|
||||
|
||||
> div {
|
||||
background-repeat: no-repeat;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
@img-borders-filter: var(--image-border-types-filter);
|
||||
@img-borders-filter-selected: var(--image-border-types-filter-selected);
|
||||
|
||||
.combobox {
|
||||
display: block;
|
||||
|
|
@ -33,8 +31,8 @@
|
|||
float: none;
|
||||
|
||||
.image {
|
||||
-webkit-filter: @img-borders-filter;
|
||||
filter: @img-borders-filter;
|
||||
-webkit-filter: @img-border-type-filter;
|
||||
filter: @img-border-type-filter;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -68,16 +66,19 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.input-group-nr.open:not(.no-highlighted) {
|
||||
&.input-group-nr.open {
|
||||
& > .form-control,
|
||||
& > .btn {
|
||||
border-color: @border-control-focus-ie;
|
||||
border-color: @border-control-focus;
|
||||
|
||||
.caret {
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
}
|
||||
|
||||
&:not(.no-highlighted) > .form-control,
|
||||
&:not(.no-highlighted) > .btn {
|
||||
border-color: @border-control-focus-ie;
|
||||
border-color: @border-control-focus;
|
||||
}
|
||||
}
|
||||
|
||||
&.input-group-nr:not(.no-highlighted) > .form-control {
|
||||
|
|
@ -87,6 +88,23 @@
|
|||
border-color: @border-control-focus;
|
||||
}
|
||||
}
|
||||
&.input-group-nr.no-highlighted > .form-control {
|
||||
&:focus,
|
||||
&:focus ~ button.dropdown-toggle {
|
||||
border-color: @border-regular-control-ie;
|
||||
border-color: @border-regular-control;
|
||||
}
|
||||
}
|
||||
|
||||
&.input-group-nr {
|
||||
.btn {
|
||||
&:active {
|
||||
.caret {
|
||||
border-color: @icon-normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
li {
|
||||
a {
|
||||
|
|
@ -116,22 +134,22 @@
|
|||
// ------------------------
|
||||
li {
|
||||
img {
|
||||
-webkit-filter: @img-borders-filter;
|
||||
filter: @img-borders-filter;
|
||||
-webkit-filter: @img-border-type-filter;
|
||||
filter: @img-border-type-filter;
|
||||
}
|
||||
canvas {
|
||||
-webkit-filter: @img-borders-filter;
|
||||
filter: @img-borders-filter;
|
||||
-webkit-filter: @img-border-type-filter;
|
||||
filter: @img-border-type-filter;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
img {
|
||||
-webkit-filter: @img-borders-filter-selected;
|
||||
filter: @img-borders-filter-selected;
|
||||
-webkit-filter: @img-border-type-filter-selected;
|
||||
filter: @img-border-type-filter-selected;
|
||||
}
|
||||
canvas {
|
||||
-webkit-filter: @img-borders-filter-selected;
|
||||
filter: @img-borders-filter-selected;
|
||||
-webkit-filter: @img-border-type-filter-selected;
|
||||
filter: @img-border-type-filter-selected;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -173,4 +191,13 @@
|
|||
border-color: @border-control-focus;
|
||||
}
|
||||
}
|
||||
|
||||
&.input-group-nr {
|
||||
& > .form-control,
|
||||
& > .btn {
|
||||
.caret {
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
line-height: normal;
|
||||
border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
|
||||
border-bottom: @scaled-one-px-value dotted @text-normal;
|
||||
border-radius: 0;
|
||||
padding-top: 12px;
|
||||
outline: none;
|
||||
height: 29px;
|
||||
|
|
|
|||
|
|
@ -222,51 +222,52 @@ textarea {
|
|||
|
||||
.btn-edit-table,
|
||||
.btn-change-shape {
|
||||
.background-ximage-v2('right-panels/rowscols_icon.png', 84px);
|
||||
.background-ximage-v2('right-panels/rowscols_icon.png', 56px);
|
||||
margin-right: 2px !important;
|
||||
margin-bottom: 1px !important;
|
||||
|
||||
background-position-x: calc(@button-small-normal-icon-offset-x - 8px);
|
||||
|
||||
.btn-group.open &,
|
||||
button.active:not(.disabled) &,
|
||||
button:active:not(.disabled) &
|
||||
{
|
||||
background-position-x: calc(@button-small-active-icon-offset-x - 8px);
|
||||
}
|
||||
}
|
||||
|
||||
.btn-edit-table {
|
||||
background-position: 0 0;
|
||||
background-position-y: 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;
|
||||
background-position-y: -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;
|
||||
}
|
||||
}
|
||||
|
||||
.doc-content-color {
|
||||
background-color: @canvas-content-background;
|
||||
}
|
||||
|
||||
a {
|
||||
color: @text-link;
|
||||
|
||||
&:hover {
|
||||
color: @text-link-hover;
|
||||
}
|
||||
|
||||
&:active {
|
||||
color: @text-link-active;
|
||||
}
|
||||
|
||||
&:visited {
|
||||
color: @text-link-visited;
|
||||
}
|
||||
}
|
||||
|
|
@ -31,6 +31,10 @@
|
|||
.box-shadow(0 0 0 2px @border-preview-select-ie);
|
||||
.box-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
|
||||
}
|
||||
|
||||
.options__icon {
|
||||
opacity: @component-normal-icon-opacity;
|
||||
}
|
||||
}
|
||||
|
||||
.grouped-data {
|
||||
|
|
|
|||
|
|
@ -39,15 +39,15 @@
|
|||
|
||||
&:focus, &.focus {
|
||||
outline: 0;
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
color: @text-normal-ie;
|
||||
color: @text-normal;
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
color: @text-normal-ie;
|
||||
color: @text-normal;
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
}
|
||||
|
|
@ -55,14 +55,14 @@
|
|||
|
||||
&.over > a {
|
||||
text-decoration: none;
|
||||
color: @text-normal-pressed-ie;
|
||||
color: @text-normal-pressed;
|
||||
//color: @text-normal-pressed-ie;
|
||||
//color: @text-normal-pressed;
|
||||
background-color: @highlight-button-hover-ie;
|
||||
background-color: @highlight-button-hover;
|
||||
|
||||
&:after {
|
||||
border-left-color: @icon-normal-pressed-ie;
|
||||
border-left-color: @icon-normal-pressed;
|
||||
border-left-color: @icon-normal-ie;
|
||||
border-left-color: @icon-normal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -153,4 +153,15 @@
|
|||
background-color: @border-divider-ie;
|
||||
background-color: @border-divider;
|
||||
}
|
||||
|
||||
.dataview {
|
||||
.item {
|
||||
.options__icon {
|
||||
}
|
||||
|
||||
.options__icon-huge {
|
||||
background-position-x: var(--button-huge-normal-icon-offset-x, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -327,13 +327,24 @@
|
|||
}
|
||||
|
||||
.btn& {
|
||||
&:not(:disabled) .icon {
|
||||
opacity: @header-component-normal-icon-opacity;
|
||||
}
|
||||
|
||||
&:active, &.active {
|
||||
.icon.toolbar__icon {
|
||||
&.icon--inverse {
|
||||
background-position-x: @button-header-active-icon-offset-x-ie;
|
||||
opacity: @header-component-active-icon-opacity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:hover:not(:disabled) {
|
||||
.icon {
|
||||
opacity: @header-component-hover-icon-opacity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
svg.icon {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,9 @@
|
|||
.cnt-sat-arrow {
|
||||
width: 14px;
|
||||
height: 9px;
|
||||
margin: -4px -3px;
|
||||
margin-top: -4px;
|
||||
margin-left: -3px;
|
||||
margin-left: calc(-2px - @scaled-one-px-value);
|
||||
position: absolute;
|
||||
background-position: -11px -196px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,6 +79,10 @@
|
|||
opacity: @component-disabled-opacity;
|
||||
}
|
||||
}
|
||||
|
||||
.dbl-clickable& .list-item {
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.no-borders > .listview .item {
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
.asc-loadmask-title {
|
||||
.fontsize(@font-size-large);
|
||||
margin: 0 8px 0 12px;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.left-panel & {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
background-color: transparent;
|
||||
|
||||
.thumb {
|
||||
width: 13px;
|
||||
height: 15px;
|
||||
top: 18px;
|
||||
background: none;
|
||||
|
||||
|
|
@ -48,8 +50,8 @@
|
|||
border-radius: 2px;
|
||||
box-sizing: content-box;
|
||||
.thumb-bottom-inner {
|
||||
border: solid @scaled-one-px-value-ie @border-regular-control-ie;
|
||||
border: solid @scaled-one-px-value @border-regular-control;
|
||||
border: solid @scaled-one-px-value-ie @background-normal-ie;
|
||||
border: solid @scaled-one-px-value @background-normal;
|
||||
border-top: none;
|
||||
height: 100%;
|
||||
}
|
||||
|
|
@ -57,10 +59,10 @@
|
|||
|
||||
&.active {
|
||||
.thumb-top {
|
||||
border-top: solid @scaled-one-px-value-ie @border-regular-control-ie;
|
||||
border-top: solid @scaled-one-px-value @border-regular-control;
|
||||
border-left: solid @scaled-one-px-value-ie @border-regular-control-ie;
|
||||
border-left: solid @scaled-one-px-value @border-regular-control;
|
||||
border-top: solid @scaled-one-px-value-ie @border-control-focus-ie;
|
||||
border-top: solid @scaled-one-px-value @border-control-focus;
|
||||
border-left: solid @scaled-one-px-value-ie @border-control-focus-ie;
|
||||
border-left: solid @scaled-one-px-value @border-control-focus;
|
||||
}
|
||||
.thumb-bottom {
|
||||
border: solid @scaled-one-px-value-ie @border-control-focus-ie;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,12 @@
|
|||
.background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC',
|
||||
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px);
|
||||
|
||||
.pixel-ratio__1_5 & {
|
||||
//background-image: ~"url(@{common-image-const-path}/controls/Scroll_center@1.5x.png)";
|
||||
background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAATAgMAAAAG1X4lAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABNJREFUeNpjYAx14FrFgAboLAgAVgQJB86JyMQAAAAASUVORK5CYII=');
|
||||
background-size: 15px auto;
|
||||
}
|
||||
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0 center;
|
||||
.border-radius(2px);
|
||||
|
|
|
|||
|
|
@ -360,6 +360,16 @@
|
|||
color: @text-link-ie;
|
||||
color: @text-link;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover:not(:disabled) {
|
||||
color: @text-link-hover;
|
||||
border-bottom-color: dotted @text-link-hover;
|
||||
}
|
||||
|
||||
&:active {
|
||||
color: @text-link-active;
|
||||
border-bottom-color: dotted @text-link-hover;
|
||||
}
|
||||
}
|
||||
|
||||
.asc-synchronizetip .close {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
.table-styler {
|
||||
background-color: @canvas-content-background;
|
||||
|
||||
table {
|
||||
&.transparent {
|
||||
background-color: @canvas-content-background !important;
|
||||
|
|
@ -23,7 +25,16 @@
|
|||
|
||||
.tablestyler-cell .cell-content .content-text {
|
||||
display: block;
|
||||
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAECAQAAAAO5iayAAAAAXNSR0IArs4c6QAAAAJiS0dEAP+Hj8y/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4AkeChACzh0FVAAAABFJREFUCNdjPPCfgYGJAQUAACB0AcMrPC7hAAAAAElFTkSuQmCC') repeat 0 0 scroll;
|
||||
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAAEAQMAAACeIXx6AAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA1JREFUeNpjOMDEAAIABVQAw/N8ALEAAAAASUVORK5CYII=') repeat 0 0 scroll;
|
||||
background-size: 2px auto;
|
||||
height: 100%;
|
||||
|
||||
.pixel-ratio__1_5 & {
|
||||
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGAQMAAAA8K7ZPAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpjeMAAgmAAABesAqGy0C2BAAAAAElFTkSuQmCC');
|
||||
}
|
||||
|
||||
.pixel-ratio__2 & {
|
||||
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAIAQMAAADk/cxGAAAABlBMVEVMaXHAwMBbbSKjAAAAAXRSTlMAQObYZgAAAA5JREFUeNpj+MAAgVAAAC0QA8HkpvUHAAAAAElFTkSuQmCC');
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue