From 335ed667bb1958e6f310cfeb64bcd3156d60978b Mon Sep 17 00:00:00 2001 From: SamGondelman <samuel_gondelman@brown.edu> Date: Wed, 29 Jun 2016 16:05:17 -0700 Subject: [PATCH 01/28] dk2 snapshot takes picture of HMD window --- .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 14 ++++++++++++++ .../src/display-plugins/hmd/HmdDisplayPlugin.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index f1aa1edc81..38fb86dc28 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -38,6 +38,20 @@ QRect HmdDisplayPlugin::getRecommendedOverlayRect() const { return CompositorHelper::VIRTUAL_SCREEN_RECOMMENDED_OVERLAY_RECT; } +QImage HmdDisplayPlugin::getScreenshot() const { + using namespace oglplus; + QImage screenshot(_compositeFramebuffer->size.x, _compositeFramebuffer->size.y, QImage::Format_RGBA8888); + auto windowSize = toGlm(_container->getPrimaryWidget()->size()); + _compositeFramebuffer->Bound(Framebuffer::Target::Read, [&] { + Context::BlitFramebuffer( + 0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, + 0, 0, windowSize.x, windowSize.y, + BufferSelectBit::ColorBuffer, BlitFilter::Nearest); + Context::ReadPixels(0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, enums::PixelDataFormat::RGBA, enums::PixelDataType::UnsignedByte, screenshot.bits()); + }); + return screenshot.mirrored(false, true); +} + bool HmdDisplayPlugin::internalActivate() { _monoPreview = _container->getBoolSetting("monoPreview", DEFAULT_MONO_VIEW); diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h index fada15d864..9a8d89a2c8 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h @@ -27,6 +27,8 @@ public: void setEyeRenderPose(uint32_t frameIndex, Eye eye, const glm::mat4& pose) override final; bool isDisplayVisible() const override { return isHmdMounted(); } + QImage getScreenshot() const override; + QRect getRecommendedOverlayRect() const override final; virtual glm::mat4 getHeadPose() const override; From 40d584021a47e2c0d1960f13a07ac98115263cf1 Mon Sep 17 00:00:00 2001 From: SamGondelman <samuel_gondelman@brown.edu> Date: Wed, 29 Jun 2016 18:09:46 -0700 Subject: [PATCH 02/28] replace old code completely, removed unnecessary blit --- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 10 ++++++---- .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 14 -------------- .../src/display-plugins/hmd/HmdDisplayPlugin.h | 2 -- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index b72f52351f..8650c086e3 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -647,12 +647,14 @@ void OpenGLDisplayPlugin::withMainThreadContext(std::function<void()> f) const { } QImage OpenGLDisplayPlugin::getScreenshot() const { - QImage result; + using namespace oglplus; + QImage screenshot(_compositeFramebuffer->size.x, _compositeFramebuffer->size.y, QImage::Format_RGBA8888); withMainThreadContext([&] { - static auto widget = _container->getPrimaryWidget(); - result = widget->grabFrameBuffer(); + auto windowSize = toGlm(_container->getPrimaryWidget()->size()); + Framebuffer::Bind(Framebuffer::Target::Read, _compositeFramebuffer->fbo); + Context::ReadPixels(0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, enums::PixelDataFormat::RGBA, enums::PixelDataType::UnsignedByte, screenshot.bits()); }); - return result; + return screenshot.mirrored(false, true); } uint32_t OpenGLDisplayPlugin::getSceneTextureId() const { diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 38fb86dc28..f1aa1edc81 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -38,20 +38,6 @@ QRect HmdDisplayPlugin::getRecommendedOverlayRect() const { return CompositorHelper::VIRTUAL_SCREEN_RECOMMENDED_OVERLAY_RECT; } -QImage HmdDisplayPlugin::getScreenshot() const { - using namespace oglplus; - QImage screenshot(_compositeFramebuffer->size.x, _compositeFramebuffer->size.y, QImage::Format_RGBA8888); - auto windowSize = toGlm(_container->getPrimaryWidget()->size()); - _compositeFramebuffer->Bound(Framebuffer::Target::Read, [&] { - Context::BlitFramebuffer( - 0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, - 0, 0, windowSize.x, windowSize.y, - BufferSelectBit::ColorBuffer, BlitFilter::Nearest); - Context::ReadPixels(0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, enums::PixelDataFormat::RGBA, enums::PixelDataType::UnsignedByte, screenshot.bits()); - }); - return screenshot.mirrored(false, true); -} - bool HmdDisplayPlugin::internalActivate() { _monoPreview = _container->getBoolSetting("monoPreview", DEFAULT_MONO_VIEW); diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h index 9a8d89a2c8..fada15d864 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h @@ -27,8 +27,6 @@ public: void setEyeRenderPose(uint32_t frameIndex, Eye eye, const glm::mat4& pose) override final; bool isDisplayVisible() const override { return isHmdMounted(); } - QImage getScreenshot() const override; - QRect getRecommendedOverlayRect() const override final; virtual glm::mat4 getHeadPose() const override; From be102ba9265a8915ec947414bae05fb43933704f Mon Sep 17 00:00:00 2001 From: SamGondelman <samuel_gondelman@brown.edu> Date: Thu, 30 Jun 2016 10:05:57 -0700 Subject: [PATCH 03/28] remove unused variable --- .../display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 8650c086e3..18f39cd3df 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -650,7 +650,6 @@ QImage OpenGLDisplayPlugin::getScreenshot() const { using namespace oglplus; QImage screenshot(_compositeFramebuffer->size.x, _compositeFramebuffer->size.y, QImage::Format_RGBA8888); withMainThreadContext([&] { - auto windowSize = toGlm(_container->getPrimaryWidget()->size()); Framebuffer::Bind(Framebuffer::Target::Read, _compositeFramebuffer->fbo); Context::ReadPixels(0, 0, _compositeFramebuffer->size.x, _compositeFramebuffer->size.y, enums::PixelDataFormat::RGBA, enums::PixelDataType::UnsignedByte, screenshot.bits()); }); From 38776fe007220cc7b57fdc68e2ac975a359ae22e Mon Sep 17 00:00:00 2001 From: Ryan Huffman <ryanhuffman@gmail.com> Date: Thu, 30 Jun 2016 14:35:27 -0700 Subject: [PATCH 04/28] Fix multiple sessions being created for some users If a user didn't have send-data activated they don't have their session id sent in the header of requests, but instead send it inside the request body. The session id being send in the request included curly braces which the server considers invalid. --- interface/src/DiscoverabilityManager.cpp | 6 ++---- libraries/networking/src/AccountManager.h | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp index c4d985419e..6550edff18 100644 --- a/interface/src/DiscoverabilityManager.cpp +++ b/interface/src/DiscoverabilityManager.cpp @@ -80,8 +80,7 @@ void DiscoverabilityManager::updateLocation() { locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends)); // if we have a session ID add it now, otherwise add a null value - auto sessionID = accountManager->getSessionID(); - rootObject[SESSION_ID_KEY] = sessionID.isNull() ? QJsonValue() : sessionID.toString(); + rootObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces(); JSONCallbackParameters callbackParameters; callbackParameters.jsonCallbackReceiver = this; @@ -111,8 +110,7 @@ void DiscoverabilityManager::updateLocation() { callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse"; QJsonObject heartbeatObject; - auto sessionID = accountManager->getSessionID(); - heartbeatObject[SESSION_ID_KEY] = sessionID.isNull() ? QJsonValue() : sessionID.toString(); + heartbeatObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces(); accountManager->sendRequest(API_USER_HEARTBEAT_PATH, AccountManagerAuth::Optional, QNetworkAccessManager::PutOperation, callbackParameters, diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index c12f663d3e..7a8d2a72fa 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -24,6 +24,8 @@ #include <DependencyManager.h> +#include "UUID.h" + class JSONCallbackParameters { public: JSONCallbackParameters(QObject* jsonCallbackReceiver = nullptr, const QString& jsonCallbackMethod = QString(), @@ -86,6 +88,7 @@ public: static QJsonObject dataObjectFromResponse(QNetworkReply& requestReply); + QString getSessionIDWithoutCurlyBraces() const { return uuidStringWithoutCurlyBraces(_sessionID); } QUuid getSessionID() const { return _sessionID; } void setSessionID(const QUuid& sessionID) { _sessionID = sessionID; } From 49da7d9a61beae00f125694ca86dcc45c8a6b526 Mon Sep 17 00:00:00 2001 From: Ryan Huffman <ryanhuffman@gmail.com> Date: Thu, 30 Jun 2016 14:43:27 -0700 Subject: [PATCH 05/28] Remove sending of session id in request body in favor of header --- interface/src/DiscoverabilityManager.cpp | 9 +-------- libraries/networking/src/AccountManager.cpp | 8 ++------ libraries/networking/src/AccountManager.h | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp index 6550edff18..4051bd8a1e 100644 --- a/interface/src/DiscoverabilityManager.cpp +++ b/interface/src/DiscoverabilityManager.cpp @@ -79,9 +79,6 @@ void DiscoverabilityManager::updateLocation() { const QString FRIENDS_ONLY_KEY_IN_LOCATION = "friends_only"; locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends)); - // if we have a session ID add it now, otherwise add a null value - rootObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces(); - JSONCallbackParameters callbackParameters; callbackParameters.jsonCallbackReceiver = this; callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse"; @@ -109,12 +106,8 @@ void DiscoverabilityManager::updateLocation() { callbackParameters.jsonCallbackReceiver = this; callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse"; - QJsonObject heartbeatObject; - heartbeatObject[SESSION_ID_KEY] = accountManager->getSessionIDWithoutCurlyBraces(); - accountManager->sendRequest(API_USER_HEARTBEAT_PATH, AccountManagerAuth::Optional, - QNetworkAccessManager::PutOperation, callbackParameters, - QJsonDocument(heartbeatObject).toJson()); + QNetworkAccessManager::PutOperation, callbackParameters); } } diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index e49bf5d5a5..ed325b8d69 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -220,12 +220,8 @@ void AccountManager::sendRequest(const QString& path, networkRequest.setHeader(QNetworkRequest::UserAgentHeader, _userAgentGetter()); - // if we're allowed to send usage data, include whatever the current session ID is with this request - auto& activityLogger = UserActivityLogger::getInstance(); - if (activityLogger.isEnabled()) { - networkRequest.setRawHeader(METAVERSE_SESSION_ID_HEADER, - uuidStringWithoutCurlyBraces(_sessionID).toLocal8Bit()); - } + networkRequest.setRawHeader(METAVERSE_SESSION_ID_HEADER, + uuidStringWithoutCurlyBraces(_sessionID).toLocal8Bit()); QUrl requestURL = _authURL; diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 7a8d2a72fa..cdf7e3f1cd 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -88,7 +88,6 @@ public: static QJsonObject dataObjectFromResponse(QNetworkReply& requestReply); - QString getSessionIDWithoutCurlyBraces() const { return uuidStringWithoutCurlyBraces(_sessionID); } QUuid getSessionID() const { return _sessionID; } void setSessionID(const QUuid& sessionID) { _sessionID = sessionID; } From dd73f0c333116a1b78c8553206b8cc6262b15dec Mon Sep 17 00:00:00 2001 From: Ryan Huffman <ryanhuffman@gmail.com> Date: Thu, 30 Jun 2016 14:50:29 -0700 Subject: [PATCH 06/28] Remove unused header from AccountManager.h --- libraries/networking/src/AccountManager.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index cdf7e3f1cd..c12f663d3e 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -24,8 +24,6 @@ #include <DependencyManager.h> -#include "UUID.h" - class JSONCallbackParameters { public: JSONCallbackParameters(QObject* jsonCallbackReceiver = nullptr, const QString& jsonCallbackMethod = QString(), From 86f8b578412bf0f905aa9df05f10bf794a72dc9b Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Thu, 30 Jun 2016 15:16:28 -0700 Subject: [PATCH 07/28] Highlight controls based on activeFocus, not focus --- interface/resources/qml/controls-uit/SpinBox.qml | 12 ++++++------ interface/resources/qml/controls-uit/TextField.qml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml index 5d78cfc5a8..a1237d4bc7 100755 --- a/interface/resources/qml/controls-uit/SpinBox.qml +++ b/interface/resources/qml/controls-uit/SpinBox.qml @@ -36,15 +36,15 @@ SpinBox { id: spinStyle background: Rectangle { color: isLightColorScheme - ? (spinBox.focus ? hifi.colors.white : hifi.colors.lightGray) - : (spinBox.focus ? hifi.colors.black : hifi.colors.baseGrayShadow) + ? (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGray) + : (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayShadow) border.color: spinBoxLabelInside.visible ? spinBoxLabelInside.color : hifi.colors.primaryHighlight - border.width: spinBox.focus ? spinBoxLabelInside.visible ? 2 : 1 : 0 + border.width: spinBox.activeFocus ? spinBoxLabelInside.visible ? 2 : 1 : 0 } textColor: isLightColorScheme - ? (spinBox.focus ? hifi.colors.black : hifi.colors.lightGray) - : (spinBox.focus ? hifi.colors.white : hifi.colors.lightGrayText) + ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.lightGray) + : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText) selectedTextColor: hifi.colors.black selectionColor: hifi.colors.primaryHighlight @@ -96,7 +96,7 @@ SpinBox { anchors.fill: parent propagateComposedEvents: true onWheel: { - if(spinBox.focus) + if(spinBox.activeFocus) wheel.accepted = false else wheel.accepted = true diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml index 79027cdc3b..65fab00700 100644 --- a/interface/resources/qml/controls-uit/TextField.qml +++ b/interface/resources/qml/controls-uit/TextField.qml @@ -36,14 +36,14 @@ TextField { style: TextFieldStyle { textColor: isLightColorScheme - ? (textField.focus ? hifi.colors.black : hifi.colors.lightGray) - : (textField.focus ? hifi.colors.white : hifi.colors.lightGrayText) + ? (textField.activeFocus ? hifi.colors.black : hifi.colors.lightGray) + : (textField.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText) background: Rectangle { color: isLightColorScheme - ? (textField.focus ? hifi.colors.white : hifi.colors.textFieldLightBackground) - : (textField.focus ? hifi.colors.black : hifi.colors.baseGrayShadow) + ? (textField.activeFocus ? hifi.colors.white : hifi.colors.textFieldLightBackground) + : (textField.activeFocus ? hifi.colors.black : hifi.colors.baseGrayShadow) border.color: hifi.colors.primaryHighlight - border.width: textField.focus ? 1 : 0 + border.width: textField.activeFocus ? 1 : 0 radius: isSearchField ? textField.height / 2 : 0 HiFiGlyphs { From ce54f1b1d12dda0ff2b9ea14fff0d6f9d2a01311 Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Thu, 30 Jun 2016 15:18:14 -0700 Subject: [PATCH 08/28] Improve desktop 'unfocus' functionality --- interface/resources/qml/desktop/Desktop.qml | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml index 27fa9692b9..59d5b435ba 100644 --- a/interface/resources/qml/desktop/Desktop.qml +++ b/interface/resources/qml/desktop/Desktop.qml @@ -30,6 +30,7 @@ FocusScope { if (!repositionLocked) { d.handleSizeChanged(); } + } onHeightChanged: d.handleSizeChanged(); @@ -66,7 +67,6 @@ FocusScope { if (desktop.repositionLocked) { return; } - var oldRecommendedRect = recommendedRect; var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect(); var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, @@ -311,8 +311,8 @@ FocusScope { onPinnedChanged: { if (pinned) { - nullFocus.focus = true; - nullFocus.forceActiveFocus(); + desktop.focus = true; + desktop.forceActiveFocus(); // recalculate our non-pinned children hiddenChildren = d.findMatchingChildren(desktop, function(child){ @@ -486,17 +486,31 @@ FocusScope { } function unfocusWindows() { + // First find the active focus item, and unfocus it, all the way + // up the parent chain to the window + var currentFocus = offscreenWindow.activeFocusItem; + var targetWindow = d.getDesktopWindow(currentFocus); + while (currentFocus) { + if (currentFocus === targetWindow) { + break; + } + currentFocus.focus = false; + currentFocus = currentFocus.parent; + } + + // Unfocus all windows var windows = d.getTopLevelWindows(); for (var i = 0; i < windows.length; ++i) { windows[i].focus = false; } + + // For the desktop to have active focus desktop.focus = true; + desktop.forceActiveFocus(); } FocusHack { id: focusHack; } - FocusScope { id: nullFocus; } - Rectangle { id: focusDebugger; objectName: "focusDebugger" @@ -510,5 +524,5 @@ FocusScope { enabled: DebugQML onTriggered: focusDebugger.visible = !focusDebugger.visible } - + } From 167cb72a0ef03aadef3ba528f15202ee09ed4b14 Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Thu, 30 Jun 2016 15:18:59 -0700 Subject: [PATCH 09/28] Don't auto-focus the filter field in running scripts --- interface/resources/qml/hifi/dialogs/RunningScripts.qml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml index 5457caccf1..3f05a140ae 100644 --- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml +++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml @@ -53,11 +53,6 @@ ScrollingWindow { updateRunningScripts(); } - function setDefaultFocus() { - // Work around FocusScope of scrollable window. - filterEdit.forceActiveFocus(); - } - function updateRunningScripts() { var runningScripts = ScriptDiscoveryService.getRunning(); runningScriptsModel.clear() @@ -276,7 +271,6 @@ ScrollingWindow { isSearchField: true anchors.left: parent.left anchors.right: parent.right - focus: true colorScheme: hifi.colorSchemes.dark placeholderText: "Filter" onTextChanged: scriptsModel.filterRegExp = new RegExp("^.*" + text + ".*$", "i") From 14784a60888b4584d31db40d9c794ae9f653ee21 Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Thu, 30 Jun 2016 15:22:13 -0700 Subject: [PATCH 10/28] Remove default focus on text fields --- scripts/developer/tests/playaPerformanceTest.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/developer/tests/playaPerformanceTest.qml b/scripts/developer/tests/playaPerformanceTest.qml index cd8171a0f6..028cfc9e1a 100644 --- a/scripts/developer/tests/playaPerformanceTest.qml +++ b/scripts/developer/tests/playaPerformanceTest.qml @@ -125,7 +125,6 @@ Rectangle { TextField { id: addressLine - focus: true anchors { left: parent.left; right: parent.right; top: row.bottom; margins: 16; From b9f9b180838a94d86c821b8d0bd6fb00b1e2ba25 Mon Sep 17 00:00:00 2001 From: Seth Alves <seth.alves@gmail.com> Date: Thu, 30 Jun 2016 15:41:58 -0700 Subject: [PATCH 11/28] if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime --- libraries/entities/src/EntityTree.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 21e5865c09..ef0401ceaf 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -904,7 +904,9 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c endDecode = usecTimestampNow(); const quint64 LAST_EDITED_SERVERSIDE_BUMP = 1; // usec - if (!senderNode->getCanRez() && senderNode->getCanRezTmp()) { + if ((message.getType() == PacketType::EntityAdd || + (message.getType() == PacketType::EntityEdit && properties.lifetimeChanged())) && + !senderNode->getCanRez() && senderNode->getCanRezTmp()) { // this node is only allowed to rez temporary entities. if need be, cap the lifetime. if (properties.getLifetime() == ENTITY_ITEM_IMMORTAL_LIFETIME || properties.getLifetime() > _maxTmpEntityLifetime) { From ff55644fe859a72da6e16e5b15d92f1e5da171b8 Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Thu, 30 Jun 2016 16:24:11 -0700 Subject: [PATCH 12/28] stateful hud toolbar buttons --- interface/resources/qml/AddressBarDialog.qml | 1 + .../DialogsManagerScriptingInterface.cpp | 2 ++ .../DialogsManagerScriptingInterface.h | 1 + interface/src/ui/AddressBarDialog.cpp | 4 ++++ interface/src/ui/AddressBarDialog.h | 1 + interface/src/ui/DialogsManager.h | 2 ++ scripts/system/examples.js | 18 +++++++++++------- scripts/system/goto.js | 16 +++++++++++----- scripts/system/hmd.js | 19 ++++++++++++------- scripts/system/mute.js | 19 ++++++++++++++----- 10 files changed, 59 insertions(+), 24 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index a48804faba..dc060b70e1 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -30,6 +30,7 @@ Window { width: addressBarDialog.implicitWidth height: addressBarDialog.implicitHeight + onShownChanged: addressBarDialog.observeShownChanged(shown); Component.onCompleted: { root.parentChanged.connect(center); center(); diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.cpp b/interface/src/scripting/DialogsManagerScriptingInterface.cpp index 80a8b4ac7c..cbca7ff4ff 100644 --- a/interface/src/scripting/DialogsManagerScriptingInterface.cpp +++ b/interface/src/scripting/DialogsManagerScriptingInterface.cpp @@ -18,6 +18,8 @@ DialogsManagerScriptingInterface::DialogsManagerScriptingInterface() { connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::addressBarToggled, this, &DialogsManagerScriptingInterface::addressBarToggled); + connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::addressBarShown, + this, &DialogsManagerScriptingInterface::addressBarShown); } void DialogsManagerScriptingInterface::toggleAddressBar() { diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.h b/interface/src/scripting/DialogsManagerScriptingInterface.h index ef44e20d61..075b89f0e5 100644 --- a/interface/src/scripting/DialogsManagerScriptingInterface.h +++ b/interface/src/scripting/DialogsManagerScriptingInterface.h @@ -24,6 +24,7 @@ public slots: signals: void addressBarToggled(); + void addressBarShown(bool visible); }; #endif diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index ba0cf18d32..6fb437e312 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -16,6 +16,7 @@ #include "DependencyManager.h" #include "AddressManager.h" +#include "DialogsManager.h" HIFI_QML_DEF(AddressBarDialog) @@ -74,3 +75,6 @@ void AddressBarDialog::displayAddressNotFoundMessage() { OffscreenUi::critical("", "There is no address information for that user or place"); } +void AddressBarDialog::observeShownChanged(bool visible) { + DependencyManager::get<DialogsManager>()->emitAddressBarShown(visible); +} diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index b2751860cc..bbce52c67c 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -38,6 +38,7 @@ protected: Q_INVOKABLE void loadHome(); Q_INVOKABLE void loadBack(); Q_INVOKABLE void loadForward(); + Q_INVOKABLE void observeShownChanged(bool visible); bool _backEnabled; bool _forwardEnabled; diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h index b8fa22ec83..c48c6df0e6 100644 --- a/interface/src/ui/DialogsManager.h +++ b/interface/src/ui/DialogsManager.h @@ -40,6 +40,7 @@ public: QPointer<HMDToolsDialog> getHMDToolsDialog() const { return _hmdToolsDialog; } QPointer<LodToolsDialog> getLodToolsDialog() const { return _lodToolsDialog; } QPointer<OctreeStatsDialog> getOctreeStatsDialog() const { return _octreeStatsDialog; } + void emitAddressBarShown(bool visible) { emit addressBarShown(visible); } public slots: void toggleAddressBar(); @@ -60,6 +61,7 @@ public slots: signals: void addressBarToggled(); + void addressBarShown(bool visible); private slots: void hmdToolsClosed(); diff --git a/scripts/system/examples.js b/scripts/system/examples.js index a948f9e563..4d838bc8af 100644 --- a/scripts/system/examples.js +++ b/scripts/system/examples.js @@ -55,16 +55,20 @@ var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var browseExamplesButton = toolBar.addButton({ imageURL: toolIconUrl + "examples-01.svg", objectName: "examples", - yOffset: 50, - alpha: 0.9, + buttonState: 1, + alpha: 0.9 }); -var browseExamplesButtonDown = false; - -browseExamplesButton.clicked.connect(function(){ +function onExamplesWindowVisibilityChanged() { + browseExamplesButton.writeProperty('buttonState', examplesWindow.visible ? 0 : 1); +} +function onClick() { toggleExamples(); -}); +} +browseExamplesButton.clicked.connect(onClick); +examplesWindow.visibleChanged.connect(onExamplesWindowVisibilityChanged); Script.scriptEnding.connect(function () { - browseExamplesButton.clicked.disconnect(); + browseExamplesButton.clicked.disconnect(onClick); + examplesWindow.visibleChanged.disconnect(onExamplesWindowVisibilityChanged); }); diff --git a/scripts/system/goto.js b/scripts/system/goto.js index a2ade02a78..4650e72dad 100644 --- a/scripts/system/goto.js +++ b/scripts/system/goto.js @@ -16,14 +16,20 @@ var button = toolBar.addButton({ objectName: "goto", imageURL: Script.resolvePath("assets/images/tools/directory-01.svg"), visible: true, - yOffset: 50, + buttonState: 1, alpha: 0.9, }); - -button.clicked.connect(function(){ + +function onAddressBarShown(visible) { + button.writeProperty('buttonState', visible ? 0 : 1); +} +function onClicked(){ DialogsManager.toggleAddressBar(); -}); +} +button.clicked.connect(onClicked); +DialogsManager.addressBarShown.connect(onAddressBarShown); Script.scriptEnding.connect(function () { - button.clicked.disconnect(); + button.clicked.disconnect(onClicked); + DialogsManager.addressBarShown.disconnect(onAddressBarShown); }); diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js index 2965c0d254..0d6a273975 100644 --- a/scripts/system/hmd.js +++ b/scripts/system/hmd.js @@ -20,23 +20,28 @@ var desktopMenuItemName = "Desktop"; var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var button; - +function onHmdChanged(isHmd) { + button.writeProperty('buttonState', isHmd ? 0 : 1); +} +function onClicked(){ + var isDesktop = Menu.isOptionChecked(desktopMenuItemName); + Menu.setIsOptionChecked(isDesktop ? headset : desktopMenuItemName, true); +} if (headset) { button = toolBar.addButton({ objectName: "hmdToggle", imageURL: Script.resolvePath("assets/images/tools/hmd-switch-01.svg"), visible: true, - yOffset: 50, alpha: 0.9, }); + onHmdChanged(HMD.active); - button.clicked.connect(function(){ - var isDesktop = Menu.isOptionChecked(desktopMenuItemName); - Menu.setIsOptionChecked(isDesktop ? headset : desktopMenuItemName, true); - }); + button.clicked.connect(onClicked); + HMD.displayModeChanged.connect(onHmdChanged); Script.scriptEnding.connect(function () { - button.clicked.disconnect(); + button.clicked.disconnect(onClicked); + HMD.displayModeChanged.disconnect(onHmdChanged); }); } diff --git a/scripts/system/mute.js b/scripts/system/mute.js index f66b6852ea..f91ecbafae 100644 --- a/scripts/system/mute.js +++ b/scripts/system/mute.js @@ -14,16 +14,25 @@ var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var button = toolBar.addButton({ objectName: "mute", - imageURL: Script.resolvePath("assets/images/tools/microphone.svg"), + imageURL: Script.resolvePath("assets/images/tools/mic-01.svg"), visible: true, alpha: 0.9, }); - -button.clicked.connect(function(){ + +function onMuteToggled() { + // We could just toggle state, but we're less likely to get out of wack if we read the AudioDevice. + // muted => "on" button state => buttonState 1 + button.writeProperty('buttonState', AudioDevice.getMuted() ? 1 : 0); +} +onMuteToggled(); +function onClicked(){ var menuItem = "Mute Microphone"; Menu.setIsOptionChecked(menuItem, !Menu.isOptionChecked(menuItem)); -}); +} +button.clicked.connect(onClicked); +AudioDevice.muteToggled.connect(onMuteToggled); Script.scriptEnding.connect(function () { - button.clicked.disconnect(); + button.clicked.disconnect(onClicked); + AudioDevice.muteToggled.disconnect(onMuteToggled); }); From f03f5f3e683a807c989a569272d080c843021362 Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Thu, 30 Jun 2016 16:47:10 -0700 Subject: [PATCH 13/28] new icons --- interface/resources/icons/hud-01.svg | 105 ----- interface/resources/icons/hud.svg | 258 ++++++++++++ interface/resources/qml/hifi/Desktop.qml | 2 +- .../assets/images/tools/directory-01.svg | 194 ---------- .../system/assets/images/tools/directory.svg | 366 ++++++++++++++++++ .../system/assets/images/tools/edit-01.svg | 94 ----- scripts/system/assets/images/tools/edit.svg | 234 +++++++++++ .../assets/images/tools/examples-01.svg | 306 --------------- .../assets/images/tools/hmd-switch-01.svg | 124 ------ scripts/system/assets/images/tools/market.svg | 258 ++++++++++++ scripts/system/assets/images/tools/mic.svg | 164 ++++++++ scripts/system/assets/images/tools/switch.svg | 230 +++++++++++ scripts/system/edit.js | 2 +- scripts/system/examples.js | 2 +- scripts/system/goto.js | 2 +- scripts/system/hmd.js | 2 +- scripts/system/mute.js | 2 +- 17 files changed, 1516 insertions(+), 829 deletions(-) delete mode 100644 interface/resources/icons/hud-01.svg create mode 100644 interface/resources/icons/hud.svg delete mode 100644 scripts/system/assets/images/tools/directory-01.svg create mode 100644 scripts/system/assets/images/tools/directory.svg delete mode 100644 scripts/system/assets/images/tools/edit-01.svg create mode 100644 scripts/system/assets/images/tools/edit.svg delete mode 100644 scripts/system/assets/images/tools/examples-01.svg delete mode 100644 scripts/system/assets/images/tools/hmd-switch-01.svg create mode 100644 scripts/system/assets/images/tools/market.svg create mode 100644 scripts/system/assets/images/tools/mic.svg create mode 100644 scripts/system/assets/images/tools/switch.svg diff --git a/interface/resources/icons/hud-01.svg b/interface/resources/icons/hud-01.svg deleted file mode 100644 index 4929389268..0000000000 --- a/interface/resources/icons/hud-01.svg +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve"> -<style type="text/css"> - .st0{opacity:0.49;} - .st1{fill:#1E1E1E;} - .st2{opacity:0.5;} - .st3{fill:#EAEAEA;} - .st4{fill:#FFFFFF;} -</style> -<g class="st0"> - <path class="st1" d="M50,146c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146z"/> -</g> -<g class="st2"> - <g> - <path class="st3" d="M25.1,109.5c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.3,111.4,29.4,109.5,25.1,109.5z"/> - <path class="st3" d="M35.4,116.3c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 - l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 - c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 - C35.9,116.2,35.6,116.3,35.4,116.3z M34.7,115.4c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 - c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 - C28.7,111.2,32.1,112.7,34.7,115.4L34.7,115.4z M36,114.7C36,114.7,36,114.7,36,114.7L36,114.7z M35.9,114.7 - C35.9,114.7,35.9,114.7,35.9,114.7L35.9,114.7z"/> - </g> - <path class="st3" d="M27.3,116l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.8,116.5,27.6,116.2,27.3,116z"/> - <path class="st3" d="M31.2,125l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0c0,0,0,0,0,0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0c0,0,0,0,0,0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5 - C31.5,126,31.5,125.4,31.2,125z"/> -</g> -<g class="st2"> - <path class="st3" d="M19.2,135.5v6.4H18v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6H18v-2.6H19.2z"/> - <path class="st3" d="M25.4,141c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8 - v-3.4h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3 - c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4 - c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S25.1,141,25.4,141z"/> - <path class="st3" d="M31.7,141.9v-6.4H34c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 - c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H31.7z - M35.9,138.7c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2H34 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.8,139.3,35.9,139,35.9,138.7z"/> -</g> -<g> - <path class="st1" d="M50,96c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V54c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96z"/> -</g> -<g> - <g> - <path class="st3" d="M25.1,59.5c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.3,61.5,29.4,59.5,25.1,59.5z"/> - <path class="st3" d="M35.4,66.3c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 - l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 - c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C35.9,66.2,35.6,66.3,35.4,66.3z - M34.7,65.5c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7 - c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C28.7,61.3,32.1,62.7,34.7,65.5L34.7,65.5z M36,64.7 - C36,64.7,36,64.7,36,64.7L36,64.7z M35.9,64.7C35.9,64.7,35.9,64.7,35.9,64.7L35.9,64.7z"/> - </g> - <path class="st3" d="M27.3,66l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0L23.2,66c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.8,66.5,27.6,66.2,27.3,66z"/> - <path class="st3" d="M31.2,75.1L30,73.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0c0,0,0,0,0,0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0c0,0,0,0,0,0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5 - C31.5,76,31.5,75.5,31.2,75.1z"/> -</g> -<g> - <path class="st3" d="M19.2,85.5v6.4H18v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6H18v-2.6H19.2z"/> - <path class="st3" d="M25.4,91c0.3,0,0.6-0.1,0.8-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.4h1.3v3.4 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 - c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4c0,0.3,0,0.5,0.1,0.8 - c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S25.1,91,25.4,91z"/> - <path class="st3" d="M31.7,91.9v-6.4H34c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H31.7z M35.9,88.7 - c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2H34 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.8,89.3,35.9,89,35.9,88.7z"/> -</g> -<g> - <path class="st4" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> -</g> -<g> - <g> - <path d="M25.1,9.6c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.3,11.5,29.4,9.6,25.1,9.6z"/> - <path d="M35.4,16.3c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9l0,0 - c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 - c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C35.9,16.3,35.6,16.3,35.4,16.3z - M34.7,15.5c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7 - c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C28.7,11.3,32.1,12.8,34.7,15.5L34.7,15.5z M36,14.8 - C36,14.8,36,14.8,36,14.8L36,14.8z M35.9,14.8C35.9,14.8,35.9,14.8,35.9,14.8L35.9,14.8z"/> - </g> - <path d="M27.3,16l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0L23.2,16c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9l1.5,0.9 - c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.8,16.6,27.6,16.2,27.3,16z"/> - <path d="M31.2,25.1L30,23.6c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0c0,0,0,0,0,0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5c-0.3,0.4-0.3,0.9,0,1.3 - l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0c0,0,0,0,0,0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C31.5,26,31.5,25.5,31.2,25.1z"/> -</g> -<g> - <path d="M19.2,35.6V42H18v-2.7h-2.9V42h-1.2v-6.4h1.2v2.6H18v-2.6H19.2z"/> - <path d="M25.4,41c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8v-3.4h1.3v3.4 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 - c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4c0,0.3,0,0.5,0.1,0.8 - c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24.9,41,25.1,41,25.4,41z"/> - <path d="M31.7,42v-6.4H34c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6C34.9,41.9,34.5,42,34,42H31.7z M35.9,38.8 - c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2H34 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.8,39.3,35.9,39.1,35.9,38.8z"/> -</g> -</svg> diff --git a/interface/resources/icons/hud.svg b/interface/resources/icons/hud.svg new file mode 100644 index 0000000000..9e77aa6040 --- /dev/null +++ b/interface/resources/icons/hud.svg @@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:#F9F9F9;} + .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} + .st9{opacity:0.75;mask:url(#SVGID_3_);} + .st10{fill:#333333;} + .st11{fill:#FFFFFF;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <g> + <g> + <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> + <g class="st8"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ +xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA +AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy +E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis +ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB +BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U +AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED +AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k +PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr +vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> + </image> + </g> + </mask> + <g class="st9"> + <g> + <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <g> + <g> + <path class="st10" d="M24.5,10.6c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.7,12.6,28.8,10.6,24.5,10.6z"/> + <path class="st10" d="M34.8,17.4c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 + c-3.4,0-6.6,1.4-9.1,3.9l0,0C15.3,16.9,15.1,17,15,17c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 + l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 + C35.2,17.3,35,17.4,34.8,17.4z M34,16.6c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 + c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 + C28,12.4,31.4,13.8,34,16.6L34,16.6z M35.3,15.9C35.3,15.9,35.3,15.9,35.3,15.9L35.3,15.9z M35.3,15.9 + C35.3,15.9,35.3,15.9,35.3,15.9L35.3,15.9z"/> + </g> + <path class="st10" d="M26.7,17.1l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9C22.2,17.3,22,17.6,22,18l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.2,17.7,27,17.3,26.7,17.1z"/> + <path class="st10" d="M30.6,26.2l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.9,27.1,30.9,26.6,30.6,26.2z" + /> + </g> + <g> + <path class="st10" d="M18.5,36.7V43h-1.2v-2.7h-2.9V43h-1.2v-6.4h1.2v2.6h2.9v-2.6H18.5z"/> + <path class="st10" d="M24.8,42.1c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8 + v-3.4h1.3V40c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3 + c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3V40 + c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24.2,42.1,24.5,42.1,24.8,42.1z"/> + <path class="st10" d="M31,43v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6C34.2,43,33.8,43,33.3,43H31z M35.2,39.8 + c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1V42h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.2,40.4,35.2,40.1,35.2,39.8z"/> + </g> + <g> + <g> + <path class="st11" d="M24.5,60.6c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.7,62.6,28.8,60.6,24.5,60.6z"/> + <path class="st11" d="M34.8,67.4c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 + c-3.4,0-6.6,1.4-9.1,3.9l0,0C15.3,66.9,15.1,67,15,67c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 + l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 + C35.2,67.3,35,67.4,34.8,67.4z M34,66.6c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 + c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 + C28,62.4,31.4,63.8,34,66.6L34,66.6z M35.3,65.9C35.3,65.9,35.3,65.9,35.3,65.9L35.3,65.9z M35.3,65.9 + C35.3,65.9,35.3,65.9,35.3,65.9L35.3,65.9z"/> + </g> + <path class="st11" d="M26.7,67.1l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9C22.2,67.3,22,67.6,22,68l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.2,67.7,27,67.3,26.7,67.1z"/> + <path class="st11" d="M30.6,76.2l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.9,77.1,30.9,76.6,30.6,76.2z" + /> + </g> + <g> + <path class="st11" d="M18.5,86.7V93h-1.2v-2.7h-2.9V93h-1.2v-6.4h1.2v2.6h2.9v-2.6H18.5z"/> + <path class="st11" d="M24.8,92.1c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.4 + h1.3V90c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 + c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3V90c0,0.3,0,0.5,0.1,0.8 + c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S24.5,92.1,24.8,92.1z"/> + <path class="st11" d="M31,93v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6C34.2,93,33.8,93,33.3,93H31z M35.2,89.8 + c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1V92h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.2,90.4,35.2,90.1,35.2,89.8z"/> + </g> + <g> + <path class="st11" d="M24.3,108.7c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.5,110.7,28.6,108.7,24.3,108.7z"/> + <path class="st11" d="M34.6,115.5c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 + c-3.4,0-6.6,1.4-9.1,3.9l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 + l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 + C35,115.4,34.8,115.5,34.6,115.5z M33.9,114.7c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 + c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 + C27.9,110.5,31.2,111.9,33.9,114.7L33.9,114.7z M35.1,113.9C35.1,113.9,35.1,113.9,35.1,113.9L35.1,113.9z M35.1,113.9 + C35.1,113.9,35.1,113.9,35.1,113.9L35.1,113.9z"/> + </g> + <path class="st11" d="M26.5,117.2l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27,117.7,26.8,117.4,26.5,117.2z"/> + <path class="st11" d="M30.4,126.3l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.7,127.2,30.7,126.6,30.4,126.3 + z"/> + <g> + <path class="st11" d="M18.4,136.7v6.4h-1.2v-2.7h-2.9v2.7H13v-6.4h1.2v2.6h2.9v-2.6H18.4z"/> + <path class="st11" d="M24.6,142.2c0.3,0,0.6-0.1,0.8-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8v-3.4 + h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 + c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4H23v3.4c0,0.3,0,0.5,0.1,0.8 + c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24,142.1,24.3,142.2,24.6,142.2z"/> + <path class="st11" d="M30.8,143.1v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 + c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H30.8z + M35.1,139.9c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35,140.5,35.1,140.2,35.1,139.9z"/> + </g> + <g> + <path class="st11" d="M24.3,158.8c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.5,160.7,28.6,158.8,24.3,158.8z"/> + <path class="st11" d="M34.6,165.5c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 + c-3.4,0-6.6,1.4-9.1,3.9l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 + l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 + C35,165.5,34.8,165.5,34.6,165.5z M33.9,164.7c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 + c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 + C27.9,160.5,31.2,162,33.9,164.7L33.9,164.7z M35.1,164C35.1,164,35.1,164,35.1,164L35.1,164z M35.1,164 + C35.1,164,35.1,164,35.1,164L35.1,164z"/> + </g> + <path class="st11" d="M26.5,167.3l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27,167.8,26.8,167.4,26.5,167.3z"/> + <path class="st11" d="M30.4,176.3l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.7,177.2,30.7,176.7,30.4,176.3 + z"/> + <g> + <path class="st11" d="M18.4,186.8v6.4h-1.2v-2.7h-2.9v2.7H13v-6.4h1.2v2.6h2.9v-2.6H18.4z"/> + <path class="st11" d="M24.6,192.2c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7 + c0.1-0.3,0.1-0.5,0.1-0.8v-3.4h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7 + c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4 + H23v3.4c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24,192.2,24.3,192.2,24.6,192.2z"/> + <path class="st11" d="M30.8,193.2v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 + c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H30.8z + M35.1,190c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35,190.5,35.1,190.3,35.1,190z"/> + </g> +</g> +</svg> diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 169542c0f0..7a7a6b63df 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -56,7 +56,7 @@ OriginalDesktop.Desktop { var sysToolbar = desktop.getToolbar("com.highfidelity.interface.toolbar.system"); var toggleHudButton = sysToolbar.addButton({ objectName: "hudToggle", - imageURL: "../../../icons/hud-01.svg", + imageURL: "../../../icons/hud.svg", visible: true, pinned: true, }); diff --git a/scripts/system/assets/images/tools/directory-01.svg b/scripts/system/assets/images/tools/directory-01.svg deleted file mode 100644 index d038611d69..0000000000 --- a/scripts/system/assets/images/tools/directory-01.svg +++ /dev/null @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve"> -<style type="text/css"> - .st0{opacity:0.9;} - .st1{fill:#1E1E1E;} - .st2{fill:#FFFFFF;} - .st3{fill:#EAEAEA;} - .st4{opacity:0.47;} - .st5{opacity:0.47;enable-background:new ;} -</style> -<g class="st0"> - <path class="st1" d="M50,96c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V54c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96z"/> -</g> -<g class="st0"> - <path class="st2" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> -</g> -<g> - <path d="M15.9,41.3c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3s-0.7-0.4-0.9-0.7c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2 - s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1 - l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7s-0.6-0.3-0.9-0.3c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7 - c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9 - v-0.5h-1.3v-0.9H17V42h-1v-0.7H15.9z"/> - <path d="M20.9,42.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7s-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.8,0.2-1.2s0.4-0.7,0.6-1 - c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S21.3,42.1,20.9,42.1z M19.1,38.9c0,0.3,0,0.5,0.1,0.8 - s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7 - s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2 - s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7C19.1,38.3,19.1,38.6,19.1,38.9z"/> - <path d="M32,36.7h-2V42h-1.2v-5.3h-2v-1.1H32V36.7z"/> - <path d="M35.5,42.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7s-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.8,0.2-1.2s0.4-0.7,0.6-1 - c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S35.9,42.1,35.5,42.1z M33.7,38.9c0,0.3,0,0.5,0.1,0.8 - s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8 - s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5 - c-0.2,0.2-0.3,0.4-0.3,0.7C33.7,38.3,33.7,38.6,33.7,38.9z"/> -</g> -<g> - <path class="st3" d="M15.9,91.3c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.3-0.3-0.5-0.7-0.6-1 - s-0.2-0.8-0.2-1.2c0-0.4,0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.6,0,1.1,0.1,1.5,0.4 - c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7s-0.6-0.3-0.9-0.3c-0.3,0-0.5,0.1-0.7,0.2s-0.4,0.3-0.5,0.5 - c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 - c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9H17V92h-1v-0.7H15.9z"/> - <path class="st3" d="M20.9,92.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 - c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 - c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C21.7,92,21.3,92.1,20.9,92.1z M19.1,88.9c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 - s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 - c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 - C19.1,88.3,19.1,88.6,19.1,88.9z"/> - <path class="st3" d="M32,86.7h-2V92h-1.2v-5.3h-2v-1.1H32V86.7z"/> - <path class="st3" d="M35.5,92.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 - c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 - c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C36.3,92,35.9,92.1,35.5,92.1z M33.7,88.9c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2 - s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 - c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.7,88.3,33.7,88.6,33.7,88.9z"/> -</g> -<g class="st4"> - <path class="st1" d="M50,146c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146z"/> -</g> -<g class="st4"> - <path class="st3" d="M15.9,141.3c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3s-0.7-0.4-0.9-0.7c-0.3-0.3-0.5-0.7-0.6-1 - s-0.2-0.8-0.2-1.2s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.6,0,1.1,0.1,1.5,0.4 - c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7s-0.6-0.3-0.9-0.3c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5 - c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 - c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9H17v3.3h-1v-0.9H15.9z"/> - <path class="st3" d="M20.9,142.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7s-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.8,0.2-1.2 - s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S21.3,142.1,20.9,142.1z M19.1,138.9c0,0.3,0,0.5,0.1,0.8 - s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7 - s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2 - s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7C19.1,138.3,19.1,138.6,19.1,138.9z"/> - <path class="st3" d="M32,136.7h-2v5.3h-1.2v-5.3h-2v-1.1H32V136.7z"/> - <path class="st3" d="M35.5,142.1c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7s-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.8,0.2-1.2 - s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S35.9,142.1,35.5,142.1z M33.7,138.9c0,0.3,0,0.5,0.1,0.8 - s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8 - s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5 - c-0.2,0.2-0.3,0.4-0.3,0.7C33.7,138.3,33.7,138.6,33.7,138.9z"/> -</g> -<g> - <g> - <path d="M17.2,28.2c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 - c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3l0,0.1c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1l-0.1,0c0,0-0.1,0-0.1,0s-0.1-0.1-0.1-0.1l0-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1 - c0.2,0.7,0.4,1.4,0.5,2.1l0,0.1c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1l-0.1,0l-3.6,0.2l-0.2,0c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1 - v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7c0,0,0,0,0,0l0,0v6.4c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.2,0.2l0,0c0,0-0.1,0-0.1,0l-3.4-0.2 - c-0.1,0-0.1,0-0.1-0.1s0-0.1,0-0.2l0-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1c0,0,0.1,0,0.1,0c-0.2-0.5-0.4-1-0.6-1.5 - c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C14,23.3,15.1,26.1,17.2,28.2z M30.2,23.4c0-0.2,0-0.4,0-0.6v0 - c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6v0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5l0.1,0 - c0.3-0.1,0.5-0.1,0.8-0.2l0.1,0c0.1,0,0.2,0,0.2,0.1l0,0.1c0,0,0,0.1,0,0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 - c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1c0,0-0.1,0-0.1,0l-0.1,0 - c0,0,0,0,0,0c0,0-0.1,0-0.1,0C30.2,23.6,30.2,23.5,30.2,23.4L30.2,23.4z M30.3,24.5c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3 - c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2l0,0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1l-0.1,0c0,0,0,0-0.1,0 - c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.1-0.2l0-0.1c0,0,0,0,0,0c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.9,24.8,30,24.6,30.3,24.5 - z M25.2,19c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0c0,0,0.1,0,0.1,0l0.1,0c0.1,0,0.1,0.1,0.1,0.2 - c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4V20c0,0.5,0,1,0,1.4l0,0.2c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3 - c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2l-0.2,0c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1c0,0-0.1,0-0.1,0l-0.2-0.1 - c-0.1,0-0.1-0.1-0.1-0.2L25.2,19L25.2,19z M25.2,25.1c0-0.1,0.1-0.2,0.2-0.2l0.2,0l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1 - l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0.1,0,0.1l0,0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 - c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6l-0.2,0l0,0c0,0-0.1,0-0.1-0.1s0-0.1,0-0.1 - L25.2,25.1L25.2,25.1z M21.7,29c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0L21.4,29l0,0c-1.8-0.4-4.2-2.6-5.1-5.2l0-0.1c0-0.1,0-0.1,0-0.2 - c0,0,0.1-0.1,0.2,0l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1 - C21.8,28.9,21.8,29,21.7,29z M24.4,29.6c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8 - c-1-1.3-1.5-2.7-1.9-4c0,0,0,0,0,0l0-0.1c0-0.1,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1l0.1,0l1.9,0.1l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2 - L24.4,29.6L24.4,29.6z M23,18.8l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0s-0.9-0.1-1.4-0.1 - c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1s0.1-0.1,0.1,0L23,18.8 - z M16.6,16.7L16.6,16.7c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1c0,0.1,0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3 - l0,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0l-0.1,0c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5l-0.1,0 - C16.6,16.8,16.5,16.7,16.6,16.7z M16,17.9L16,17.9c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 - c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0c0,0-0.1,0-0.1,0h0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1 - c-0.4-0.3-0.6-0.6-0.6-1C15.6,20.1,15.7,18.9,16,17.9z"/> - </g> - <path d="M27.7,15.1c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7C29,3.6,30.8,5,31,6.8 - c0.1,0.6,0,1.2-0.3,1.7c-1,2.1-2,4.3-2.9,6.4C27.8,15,27.8,15,27.7,15.1z M29.5,7.4c0-1-0.8-1.8-1.8-1.8c-1,0-1.8,0.8-1.8,1.8 - c0,1,0.8,1.8,1.8,1.8C28.7,9.2,29.5,8.4,29.5,7.4z"/> -</g> -<g> - <g> - <path class="st3" d="M17.2,78.3c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 - c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3l0,0.1c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1l-0.1,0c0,0-0.1,0-0.1,0s-0.1-0.1-0.1-0.1l0-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1 - c0.2,0.7,0.4,1.4,0.5,2.1l0,0.1c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1l-0.1,0l-3.6,0.2l-0.2,0c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1 - v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7c0,0,0,0,0,0l0,0V68c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.2,0.2l0,0c0,0-0.1,0-0.1,0l-3.4-0.2 - c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2l0-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1c0,0,0.1,0,0.1,0 - c-0.2-0.5-0.4-1-0.6-1.5c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C14,73.4,15.1,76.2,17.2,78.3z M30.2,73.5 - c0-0.2,0-0.4,0-0.6v0c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6v0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5 - l0.1,0c0.3-0.1,0.5-0.1,0.8-0.2l0.1,0c0.1,0,0.2,0,0.2,0.1l0,0.1c0,0,0,0.1,0,0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 - c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1c0,0-0.1,0-0.1,0l-0.1,0 - c0,0,0,0,0,0c0,0-0.1,0-0.1,0C30.2,73.7,30.2,73.7,30.2,73.5L30.2,73.5z M30.3,74.7c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3 - c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2l0,0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1l-0.1,0c0,0,0,0-0.1,0 - c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.1-0.2l0-0.1c0,0,0,0,0,0c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.9,74.9,30,74.7,30.3,74.7 - z M25.2,69.2c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0c0,0,0.1,0,0.1,0l0.1,0c0.1,0,0.1,0.1,0.1,0.2 - c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4l0,0.2c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3 - c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2l-0.2,0c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1c0,0-0.1,0-0.1,0l-0.2-0.1 - c-0.1,0-0.1-0.1-0.1-0.2L25.2,69.2L25.2,69.2z M25.2,75.3c0-0.1,0.1-0.2,0.2-0.2l0.2,0l3.4-0.2c0,0,0.1,0,0.1,0.1 - c0,0,0.1,0.1,0,0.1l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0.1,0,0.1l0,0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4 - l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6l-0.2,0l0,0c0,0-0.1,0-0.1-0.1 - c0,0,0-0.1,0-0.1L25.2,75.3L25.2,75.3z M21.7,79.2c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2l0-0.1 - c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1 - C21.8,79.1,21.8,79.1,21.7,79.2z M24.4,79.8c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8 - c-1-1.3-1.5-2.7-1.9-4c0,0,0,0,0,0l0-0.1c0-0.1,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1l0.1,0L23,75l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2 - L24.4,79.8L24.4,79.8z M23,69l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0s-0.9-0.1-1.4-0.1 - c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0 - L23,69z M16.6,66.8L16.6,66.8c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1c0,0.1,0,0.1,0,0.2l-0.1,0.2 - c-1.2,1.6-1.7,3.5-2,5.3l0,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0l-0.1,0c-0.4-0.1-0.7-0.2-1.1-0.3 - c-0.6-0.1-1.2-0.3-1.8-0.5l-0.1,0C16.6,67,16.5,66.9,16.6,66.8z M16,68L16,68c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8 - c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0c0,0-0.1,0-0.1,0h0 - c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1C15.6,70.3,15.7,69.1,16,68z"/> - </g> - <path class="st3" d="M27.7,65.2c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7c-1,2.1-2,4.3-2.9,6.4C27.8,65.1,27.8,65.2,27.7,65.2z M29.5,57.5c0-1-0.8-1.8-1.8-1.8c-1,0-1.8,0.8-1.8,1.8 - c0,1,0.8,1.8,1.8,1.8C28.7,59.3,29.5,58.5,29.5,57.5z"/> -</g> -<g class="st5"> - <g> - <path class="st3" d="M17.2,127.4c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 - c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3l0,0.1c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1l-0.1,0c0,0-0.1,0-0.1,0s-0.1-0.1-0.1-0.1l0-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1 - c0.2,0.7,0.4,1.4,0.5,2.1l0,0.1c0,0,0,0.1,0,0.1c0,0-0.1,0.1-0.1,0.1l-0.1,0l-3.6,0.2l-0.2,0c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1 - v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7c0,0,0,0,0,0l0,0v6.4c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.2,0.2l0,0c0,0-0.1,0-0.1,0l-3.4-0.2 - c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2l0-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1c0,0,0.1,0,0.1,0 - c-0.2-0.5-0.4-1-0.6-1.5c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C14,122.5,15.1,125.3,17.2,127.4z M30.2,122.6 - c0-0.2,0-0.4,0-0.6v0c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6v0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5 - l0.1,0c0.3-0.1,0.5-0.1,0.8-0.2l0.1,0c0.1,0,0.2,0,0.2,0.1l0,0.1c0,0,0,0.1,0,0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 - c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1c0,0-0.1,0-0.1,0l-0.1,0 - c0,0,0,0,0,0c0,0-0.1,0-0.1,0C30.2,122.8,30.2,122.8,30.2,122.6L30.2,122.6z M30.3,123.7c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3 - c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2l0,0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1l-0.1,0c0,0,0,0-0.1,0 - c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.1-0.2l0-0.1c0,0,0,0,0,0c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7 - C29.9,124,30,123.8,30.3,123.7z M25.2,118.3c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0c0,0,0.1,0,0.1,0l0.1,0 - c0.1,0,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4l0,0.2c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3 - c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2l-0.2,0c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1 - c0,0-0.1,0-0.1,0l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L25.2,118.3L25.2,118.3z M25.2,124.4c0-0.1,0.1-0.2,0.2-0.2l0.2,0l3.4-0.2 - c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1l0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0.1,0,0.1l0,0.1c0,0.1,0,0.2-0.1,0.3 - c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6l-0.2,0l0,0 - c0,0-0.1,0-0.1-0.1s0-0.1,0-0.1L25.2,124.4L25.2,124.4z M21.7,128.3c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0l-0.2-0.1l0,0 - c-1.8-0.4-4.2-2.6-5.1-5.2l0-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4 - c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.8,128.2,21.8,128.2,21.7,128.3z M24.4,128.9c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0 - c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4c0,0,0,0,0,0l0-0.1c0-0.1,0-0.1,0-0.1c0,0,0.1-0.1,0.1-0.1l0.1,0l1.9,0.1 - l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24.4,128.9L24.4,128.9z M23,118.1l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1 - c0,0-0.1,0-0.1,0c0,0,0,0,0,0s-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1 - c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0L23,118.1z M16.6,115.9L16.6,115.9c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1 - c0.1,0,0.2,0,0.2,0.1c0,0.1,0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3l0,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0-0.1,0 - l-0.1,0c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5l-0.1,0C16.6,116.1,16.5,116,16.6,115.9z M16,117.1L16,117.1 - c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0,0,0,0l-0.1,0 - c0,0-0.1,0-0.1,0h0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1C15.6,119.4,15.7,118.2,16,117.1z"/> - </g> - <path class="st3" d="M27.7,114.3c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7c-1,2.1-2,4.3-2.9,6.4C27.8,114.2,27.8,114.3,27.7,114.3z M29.5,106.6c0-1-0.8-1.8-1.8-1.8 - c-1,0-1.8,0.8-1.8,1.8c0,1,0.8,1.8,1.8,1.8C28.7,108.4,29.5,107.6,29.5,106.6z"/> -</g> -</svg> diff --git a/scripts/system/assets/images/tools/directory.svg b/scripts/system/assets/images/tools/directory.svg new file mode 100644 index 0000000000..912243c52e --- /dev/null +++ b/scripts/system/assets/images/tools/directory.svg @@ -0,0 +1,366 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:#F9F9F9;} + .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} + .st9{opacity:0.75;mask:url(#SVGID_3_);} + .st10{fill:#333333;} + .st11{fill:#FFFFFF;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <g> + <g> + <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> + <g class="st8"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ +xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA +AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy +E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis +ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB +BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U +AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED +AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k +PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr +vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> + </image> + </g> + </mask> + <g class="st9"> + <g> + <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <g> + <path class="st10" d="M15.5,42.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2c0-0.4,0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.4,39c-0.2-0.3-0.4-0.6-0.6-0.7S14.2,38,13.9,38c-0.3,0-0.5,0.1-0.7,0.2 + s-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 + c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V41h-1.3v-0.9h2.3v3.1h-1v-0.7H15.5z"/> + <path class="st10" d="M20.5,43.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 + c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + C21.3,43.2,20.9,43.3,20.5,43.3z M18.7,40.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 + C18.7,39.5,18.7,39.8,18.7,40.1z"/> + <path class="st10" d="M31.6,37.9h-2v5.3h-1.2v-5.3h-2v-1.1h5.2V37.9z"/> + <path class="st10" d="M35.1,43.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 + c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + C35.9,43.2,35.5,43.3,35.1,43.3z M33.3,40.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.3,39.5,33.3,39.8,33.3,40.1z"/> + </g> + <g> + <g> + <path class="st10" d="M16.8,29.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V18c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L29.6,19v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 + v0.1v0.1l-0.1,0.1h-0.1L25,19.5h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.6,24.6,14.7,27.4,16.8,29.5z M29.8,24.7c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1H30l0,0h-0.1 + C29.8,24.9,29.8,24.9,29.8,24.7L29.8,24.7z M29.9,25.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 + v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0 + c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.5,26.1,29.6,25.9,29.9,25.9z M24.8,20.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 + c0,0,0,0,0.1,0l0,0H29h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 + c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 + c-0.4,0-0.5,0.1-0.6,0.1H25l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.8,20.4L24.8,20.4z M24.8,26.5c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2 + c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 + c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6H25l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.8,26.5 + L24.8,26.5z M21.3,30.4l-0.1,0.1l0,0L21,30.4l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 + c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.4,30.3,21.4,30.3,21.3,30.4z M24,31 + c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1 + l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24,31L24,31z M22.6,20.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1l0,0 + c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1 + c0,0,0.1-0.1,0.1,0H22.6z M16.2,18L16.2,18c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 + c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1 + C16.2,18.2,16.1,18.1,16.2,18z M15.6,19.2L15.6,19.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 + c0,0.1,0,0.1-0.1,0.1h-0.1l0,0H19h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 + C15.2,21.5,15.3,20.3,15.6,19.2z"/> + </g> + <path class="st10" d="M27.3,16.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.2,12,28.2,14.2,27.3,16.4C27.4,16.3,27.4,16.4,27.3,16.4z M29.1,8.7c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.1,9.7,29.1,8.7z"/> + </g> + <g> + <path class="st11" d="M15.5,92.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2c0-0.4,0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.4,89c-0.2-0.3-0.4-0.6-0.6-0.7S14.2,88,13.9,88c-0.3,0-0.5,0.1-0.7,0.2 + s-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 + c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V91h-1.3v-0.9h2.3v3.1h-1v-0.7H15.5z"/> + <path class="st11" d="M20.5,93.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 + c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + C21.3,93.2,20.9,93.3,20.5,93.3z M18.7,90.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 + C18.7,89.5,18.7,89.8,18.7,90.1z"/> + <path class="st11" d="M31.6,87.9h-2v5.3h-1.2v-5.3h-2v-1.1h5.2V87.9z"/> + <path class="st11" d="M35.1,93.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 + c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + C35.9,93.2,35.5,93.3,35.1,93.3z M33.3,90.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.3,89.5,33.3,89.8,33.3,90.1z"/> + </g> + <g> + <g> + <path class="st11" d="M16.8,79.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V68c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L29.6,69v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 + v0.1v0.1l-0.1,0.1h-0.1L25,69.5h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.6,74.6,14.7,77.4,16.8,79.5z M29.8,74.7c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1H30l0,0h-0.1 + C29.8,74.9,29.8,74.9,29.8,74.7L29.8,74.7z M29.9,75.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 + v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0 + c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.5,76.1,29.6,75.9,29.9,75.9z M24.8,70.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 + c0,0,0,0,0.1,0l0,0H29h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 + c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 + c-0.4,0-0.5,0.1-0.6,0.1H25l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.8,70.4L24.8,70.4z M24.8,76.5c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2 + c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 + c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6H25l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.8,76.5 + L24.8,76.5z M21.3,80.4l-0.1,0.1l0,0L21,80.4l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 + c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.4,80.3,21.4,80.3,21.3,80.4z M24,81 + c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1 + l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24,81L24,81z M22.6,70.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1l0,0 + c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1 + c0,0,0.1-0.1,0.1,0H22.6z M16.2,68L16.2,68c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 + c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1 + C16.2,68.2,16.1,68.1,16.2,68z M15.6,69.2L15.6,69.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 + c0,0.1,0,0.1-0.1,0.1h-0.1l0,0H19h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 + C15.2,71.5,15.3,70.3,15.6,69.2z"/> + </g> + <path class="st11" d="M27.3,66.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.2,62,28.2,64.2,27.3,66.4C27.4,66.3,27.4,66.4,27.3,66.4z M29.1,58.7c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.1,59.7,29.1,58.7z"/> + </g> + <g> + <path class="st11" d="M15.3,142.6c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7c-0.2-0.1-0.6-0.3-0.9-0.3 + c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8 + c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.3z" + /> + <path class="st11" d="M20.3,143.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 + c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 + c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + S20.7,143.4,20.3,143.4z M18.5,140.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 + C18.5,139.6,18.5,139.9,18.5,140.2z"/> + <path class="st11" d="M31.4,138h-2v5.3h-1.2V138h-2v-1.1h5.2V138z"/> + <path class="st11" d="M34.9,143.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 + c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 + c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + S35.3,143.4,34.9,143.4z M33.1,140.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 + C33.1,139.6,33.1,139.9,33.1,140.2z"/> + </g> + <g> + <path class="st11" d="M16.6,129.6c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3v0.1c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1l-0.1-0.1V119c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 + v0.1l-0.1,0.1h-0.1l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2V119c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.4,124.7,14.5,127.5,16.6,129.6z M29.6,124.8c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 + C29.6,125,29.6,125,29.6,124.8L29.6,124.8z M29.7,126c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2v0.1 + c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0c0,0,0-0.1,0.1-0.2 + c0.4-0.6,1-1.6,1.5-3.7C29.3,126.2,29.4,126,29.7,126z M24.6,120.5c0-0.1,0.1-0.2,0.2-0.2H25l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0 + h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3 + c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1 + c-0.1,0-0.1-0.1-0.1-0.2L24.6,120.5L24.6,120.5z M24.6,126.6c0-0.1,0.1-0.2,0.2-0.2H25l3.4-0.2c0,0,0.1,0,0.1,0.1 + c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 + c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.6,126.6 + L24.6,126.6z M21.1,130.5l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 + c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.2,130.4,21.2,130.4,21.1,130.5z + M23.8,131.1c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1 + l0.1-0.1h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L23.8,131.1L23.8,131.1z M22.4,120.3l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5 + c0,0,0,0.1-0.1,0.1h-0.1l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1 + c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H22.4z M16,118.1L16,118.1c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1 + s0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3 + c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1C16,118.3,15.9,118.2,16,118.1z M15.4,119.3L15.4,119.3c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8 + c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1 + c-0.4-0.3-0.6-0.6-0.6-1C15,121.6,15.1,120.4,15.4,119.3z"/> + </g> + <path class="st11" d="M27.1,115.5c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29,111.1,28,113.3,27.1,115.5C27.2,115.4,27.2,115.5,27.1,115.5z M28.9,107.8c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S28.9,108.8,28.9,107.8z"/> + <g> + <path class="st11" d="M15.3,192.7c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7c-0.2-0.1-0.6-0.3-0.9-0.3 + c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8 + c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.3z" + /> + <path class="st11" d="M20.3,193.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 + c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 + c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + S20.7,193.5,20.3,193.5z M18.5,190.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 + C18.5,189.7,18.5,190,18.5,190.3z"/> + <path class="st11" d="M31.4,188.1h-2v5.3h-1.2v-5.3h-2V187h5.2V188.1z"/> + <path class="st11" d="M34.9,193.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 + c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 + c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 + S35.3,193.5,34.9,193.5z M33.1,190.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 + s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 + C33.1,189.7,33.1,190,33.1,190.3z"/> + </g> + <g> + <path class="st11" d="M16.6,179.7c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3v0.1c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1l-0.1-0.1v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 + v0.1v0.1l-0.1,0.1h-0.1l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.4,174.8,14.5,177.6,16.6,179.7z M29.6,174.9c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 + C29.6,175.1,29.6,175.1,29.6,174.9L29.6,174.9z M29.7,176.1c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1 + c0,0,0.1,0.1,0,0.2v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1 + l0,0c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.3,176.3,29.4,176.1,29.7,176.1z M24.6,170.6c0-0.1,0.1-0.2,0.2-0.2H25l2.7-0.1 + l0.9-0.1c0,0,0,0,0.1,0l0,0h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2 + c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3s0,0.2,0,0.3s0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 + c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.6,170.6L24.6,170.6z M24.6,176.7c0-0.1,0.1-0.2,0.2-0.2H25 + l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3s-0.1,0.3-0.2,0.4l-0.1,0.2 + c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.6,176.7 + L24.6,176.7z M21.1,180.6l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 + c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.2,180.5,21.2,180.5,21.1,180.6z + M23.8,181.2c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1 + l0.1-0.1h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L23.8,181.2L23.8,181.2z M22.4,170.4l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5 + c0,0,0,0.1-0.1,0.1h-0.1l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1 + c0-0.3,0-1.4,0-1.5c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H22.4z M16,168.2L16,168.2c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1 + c0.1,0,0.2,0,0.2,0.1c0,0.1,0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1 + c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1C16,168.4,15.9,168.3,16,168.2z M15.4,169.4L15.4,169.4 + c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0 + c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1C15,171.7,15.1,170.5,15.4,169.4z"/> + </g> + <path class="st11" d="M27.1,165.6c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29,161.2,28,163.4,27.1,165.6C27.2,165.5,27.2,165.6,27.1,165.6z M28.9,157.9c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S28.9,158.9,28.9,157.9z"/> +</g> +</svg> diff --git a/scripts/system/assets/images/tools/edit-01.svg b/scripts/system/assets/images/tools/edit-01.svg deleted file mode 100644 index c661c6f678..0000000000 --- a/scripts/system/assets/images/tools/edit-01.svg +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve"> -<style type="text/css"> - .st0{opacity:0.9;} - .st1{fill:#FFFFFF;} - .st2{fill:#1E1E1E;} - .st3{fill:#EAEAEA;} - .st4{opacity:0.47;} - .st5{opacity:0.47;fill:#EAEAEA;} -</style> -<g> - <g class="st0"> - <path class="st1" d="M50,46.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.3z"/> - </g> -</g> -<g> - <g class="st0"> - <path class="st2" d="M50,96.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.3z"/> - </g> -</g> -<path d="M21.6,21.5c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1c-1.6,1.6-3.2,3.2-4.9,4.8 - c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8c0.2-0.1,0.5-0.2,0.7-0.4 - c1.7-1.7,3.4-3.4,5.1-5.1L21.6,21.5z"/> -<path d="M28.2,10.6c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8c-0.6,0.6-1.2,1.2-1.7,1.7 - C30.7,13.2,29.4,11.9,28.2,10.6z"/> -<path d="M29.4,19.1c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 - c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 - c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 - c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 - c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.3,20.9,32.9,18.1,29.4,19.1z M16.7,10.6c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.8,0.7-0.8 - c0.4,0,0.8,0.4,0.8,0.7C17.4,10.3,17.1,10.6,16.7,10.6z M27.1,13c0.3,0.3,0.6,0.7,1,1c-0.7,0.7-1.4,1.4-2.1,2.1 - c-0.3-0.3-0.7-0.7-1-1C25.7,14.4,26.4,13.7,27.1,13z"/> -<g> - <path d="M18.2,41.3v1.1h-4.4V36h4.4v1.1H15v1.5h2.7v1H15v1.7H18.2z"/> - <path d="M19.4,42.4V36h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H19.4z M23.6,39.2 - c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C23.6,39.8,23.6,39.5,23.6,39.2z"/> - <path d="M26.1,42.4V36h1.2v6.4H26.1z"/> - <path d="M33.6,37.1h-2v5.3h-1.2v-5.3h-2V36h5.3V37.1z"/> -</g> -<path class="st3" d="M21.9,71.5c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 - c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.9,71.5z"/> -<path class="st3" d="M28.5,60.6c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C31,63.2,29.8,61.9,28.5,60.6z"/> -<path class="st3" d="M29.7,69.1c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 - c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 - c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 - c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 - c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.6,70.9,33.2,68.1,29.7,69.1z M17,60.6c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.8,0.7-0.8 - c0.4,0,0.8,0.4,0.8,0.7C17.7,60.3,17.4,60.6,17,60.6z M27.4,63c0.3,0.3,0.6,0.7,1,1c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1 - C26,64.4,26.7,63.7,27.4,63z"/> -<g> - <path class="st3" d="M18.5,91.4v1.1H14v-6.4h4.4v1.1h-3.1v1.5H18v1h-2.7v1.7H18.5z"/> - <path class="st3" d="M19.7,92.4v-6.4H22c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H19.7z M23.9,89.2 - c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H21v4.2H22c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.9,89.8,23.9,89.5,23.9,89.2z"/> - <path class="st3" d="M26.4,92.4v-6.4h1.2v6.4H26.4z"/> - <path class="st3" d="M34,87.1h-2v5.3h-1.2v-5.3h-2v-1.1H34V87.1z"/> -</g> -<g class="st4"> - <g class="st0"> - <path class="st2" d="M50,146.3c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.3z"/> - </g> -</g> -<path class="st5" d="M21.9,121.5c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 - c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.9,121.5z"/> -<path class="st5" d="M28.5,110.6c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C31,113.2,29.8,111.9,28.5,110.6z"/> -<path class="st5" d="M29.7,119.1c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 - c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 - c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 - c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 - c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.6,120.9,33.2,118.1,29.7,119.1z M17,110.6c-0.4,0-0.7-0.3-0.7-0.7 - c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.7,110.3,17.4,110.6,17,110.6z M27.4,113c0.3,0.3,0.6,0.7,1,1 - c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C26,114.4,26.7,113.7,27.4,113z"/> -<g class="st4"> - <path class="st3" d="M18.5,141.4v1.1H14v-6.4h4.4v1.1h-3.1v1.5H18v1h-2.7v1.7H18.5z"/> - <path class="st3" d="M19.7,142.4v-6.4H22c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H19.7z M23.9,139.2 - c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H21v4.2H22c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.9,139.8,23.9,139.5,23.9,139.2z"/> - <path class="st3" d="M26.4,142.4v-6.4h1.2v6.4H26.4z"/> - <path class="st3" d="M34,137.1h-2v5.3h-1.2v-5.3h-2v-1.1H34V137.1z"/> -</g> -</svg> diff --git a/scripts/system/assets/images/tools/edit.svg b/scripts/system/assets/images/tools/edit.svg new file mode 100644 index 0000000000..13389a2b14 --- /dev/null +++ b/scripts/system/assets/images/tools/edit.svg @@ -0,0 +1,234 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:#F9F9F9;} + .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} + .st9{opacity:0.75;mask:url(#SVGID_3_);} + .st10{fill:#333333;} + .st11{fill:#FFFFFF;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <g> + <g> + <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> + <g class="st8"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ +xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA +AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy +E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis +ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB +BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U +AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED +AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k +PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr +vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> + </image> + </g> + </mask> + <g class="st9"> + <g> + <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <path class="st10" d="M21.1,22c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L19,19.8 + c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.1,22z"/> + <path class="st10" d="M27.7,11.1c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C30.2,13.6,29,12.4,27.7,11.1z"/> + <path class="st10" d="M29.2,20.4c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 + c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 + c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 + c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.1,22.2,32.7,19.4,29.2,20.4z M16.5,11.9c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.2,11.6,16.9,11.9,16.5,11.9z M26.9,14.3c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.5,15.7,26.2,15,26.9,14.3z"/> + <g> + <path class="st10" d="M17.7,41.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H17.7z"/> + <path class="st10" d="M18.9,42.9v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.9z M23.2,39.7 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.1,40.3,23.2,40,23.2,39.7z"/> + <path class="st10" d="M25.6,42.9v-6.4h1.2v6.4H25.6z"/> + <path class="st10" d="M33.2,37.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.6z"/> + </g> + <path class="st11" d="M21.1,72c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L19,69.8 + c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.1,72z"/> + <path class="st11" d="M27.7,61.1c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C30.2,63.6,29,62.4,27.7,61.1z"/> + <path class="st11" d="M29.2,70.4c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 + c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 + c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 + c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.2,72.2,32.7,69.4,29.2,70.4z M16.5,61.9c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.3,61.6,16.9,61.9,16.5,61.9z M26.9,64.3c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.5,65.7,26.2,65,26.9,64.3z"/> + <g> + <path class="st11" d="M17.7,91.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H17.7z"/> + <path class="st11" d="M18.9,92.9v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.9z M23.2,89.7 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.1,90.3,23.2,90,23.2,89.7z"/> + <path class="st11" d="M25.6,92.9v-6.4h1.2v6.4H25.6z"/> + <path class="st11" d="M33.2,87.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.6z"/> + </g> + <path class="st11" d="M21,122c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 + c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21,122z"/> + <path class="st11" d="M27.6,111.2c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C30.1,113.7,28.8,112.4,27.6,111.2z"/> + <path class="st11" d="M29.2,120.5c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 + c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 + c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 + c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.1,122.3,32.7,119.5,29.2,120.5z M16.4,112c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.2,111.6,16.8,112,16.4,112z M26.8,114.4c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.4,115.8,26.1,115.1,26.8,114.4z"/> + <g> + <path class="st11" d="M17.6,141.9v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5H17v1h-2.7v1.7H17.6z"/> + <path class="st11" d="M18.8,143v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.8z M23,139.8 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H20v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23,140.3,23,140.1,23,139.8z"/> + <path class="st11" d="M25.5,143v-6.4h1.2v6.4H25.5z"/> + <path class="st11" d="M33,137.7h-2v5.3h-1.2v-5.3h-2v-1.1H33V137.7z"/> + </g> + <path class="st11" d="M21,172.1c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 + c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21,172.1z"/> + <path class="st11" d="M27.6,161.2c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C30.1,163.8,28.8,162.5,27.6,161.2z"/> + <path class="st11" d="M29.1,170.5c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 + c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 + c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 + c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36,172.3,32.6,169.5,29.1,170.5z M16.4,162.1c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.1,161.7,16.8,162.1,16.4,162.1z M26.8,164.4c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.4,165.8,26.1,165.1,26.8,164.4z"/> + <g> + <path class="st11" d="M17.6,191.9v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5H17v1h-2.7v1.7H17.6z"/> + <path class="st11" d="M18.8,193v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.8z M23,189.8 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H20v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23,190.4,23,190.1,23,189.8z"/> + <path class="st11" d="M25.5,193v-6.4h1.2v6.4H25.5z"/> + <path class="st11" d="M33,187.7h-2v5.3h-1.2v-5.3h-2v-1.1H33V187.7z"/> + </g> +</g> +</svg> diff --git a/scripts/system/assets/images/tools/examples-01.svg b/scripts/system/assets/images/tools/examples-01.svg deleted file mode 100644 index ec4758dcde..0000000000 --- a/scripts/system/assets/images/tools/examples-01.svg +++ /dev/null @@ -1,306 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve"> -<style type="text/css"> - .st0{opacity:0.9;} - .st1{fill:#FFFFFF;} - .st2{fill:#1E1E1E;} - .st3{fill:#EAEAEA;} - .st4{opacity:0.47;} -</style> -<g> - <g class="st0"> - <path class="st1" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> -</g> -<g> - <g class="st0"> - <path class="st2" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> - </g> -</g> -<g> - <path d="M6.7,41.3v1.1H2.2V36h4.4v1.1H3.5v1.5h2.7v1H3.5v1.7H6.7z"/> - <path d="M8.3,36l1.6,2.4l1.6-2.4h1.3l-2.3,3.2l2.2,3.1h-1.3l-1.5-2.3l-1.5,2.3H7l2.2-3.1L7,36H8.3z"/> - <path d="M12.8,42.4l2.5-6.4h1l2.5,6.4h-1.3L17,40.8h-2.2l-0.6,1.6H12.8z M15.9,37.3l-0.9,2.6h1.8L15.9,37.3z"/> - <path d="M24.8,42.4v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2V36h1.3l1.9,3.6l1.9-3.6H26v6.4H24.8z"/> - <path d="M27.3,42.4V36H30c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.3,0,0.5-0.1,0.8c-0.1,0.3-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.4-0.6,0.5c-0.2,0.1-0.5,0.2-0.8,0.2h-1.5v2.1H27.3z M28.6,39.1H30 - c0.2,0,0.4-0.1,0.6-0.3c0.2-0.2,0.2-0.4,0.2-0.8c0-0.2,0-0.3-0.1-0.4c0-0.1-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.2-0.3-0.2 - c-0.1,0-0.2-0.1-0.3-0.1h-1.4V39.1z"/> - <path d="M32.9,42.4V36h1.2v5.3h3.3v1.1H32.9z"/> - <path d="M42.7,41.3v1.1h-4.4V36h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H42.7z"/> - <path d="M47.4,37.6c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9c-0.1,0.2-0.3,0.4-0.5,0.6s-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2 - s-0.9-0.3-1.3-0.6l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1 - c0.7,0,1-0.2,1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 - c-0.3-0.1-0.6-0.2-0.8-0.3S44,39.2,43.8,39c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.7-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2c0.4,0.1,0.7,0.3,1,0.5L47.4,37.6z"/> -</g> -<g> - <path class="st3" d="M6.7,91.3v1.1H2.2V86h4.4v1.1H3.5v1.5h2.7v1H3.5v1.7H6.7z"/> - <path class="st3" d="M8.3,86l1.6,2.4l1.6-2.4h1.3l-2.3,3.2l2.2,3.1h-1.3l-1.5-2.3l-1.5,2.3H7l2.2-3.1L7,86H8.3z"/> - <path class="st3" d="M12.8,92.4l2.5-6.4h1l2.5,6.4h-1.3L17,90.8h-2.2l-0.6,1.6H12.8z M15.9,87.3l-0.9,2.6h1.8L15.9,87.3z"/> - <path class="st3" d="M24.8,92.4v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2V86h1.3l1.9,3.6l1.9-3.6H26v6.4H24.8z"/> - <path class="st3" d="M27.3,92.4V86H30c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.3,0,0.5-0.1,0.8c-0.1,0.3-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.4-0.6,0.5c-0.2,0.1-0.5,0.2-0.8,0.2h-1.5v2.1H27.3z M28.6,89.1H30 - c0.2,0,0.4-0.1,0.6-0.3c0.2-0.2,0.2-0.4,0.2-0.8c0-0.2,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.2-0.3-0.2 - c-0.1,0-0.2-0.1-0.3-0.1h-1.4V89.1z"/> - <path class="st3" d="M32.9,92.4V86h1.2v5.3h3.3v1.1H32.9z"/> - <path class="st3" d="M42.7,91.3v1.1h-4.4V86h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H42.7z"/> - <path class="st3" d="M47.4,87.6c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9s-0.3,0.4-0.5,0.6c-0.2,0.1-0.5,0.3-0.8,0.3s-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2 - c-0.5-0.1-0.9-0.3-1.3-0.6l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1 - c0.7,0,1-0.2,1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2s-0.4-0.1-0.7-0.2 - c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.3c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.7-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2c0.4,0.1,0.7,0.3,1,0.5L47.4,87.6z"/> -</g> -<g> - <path d="M33,8.1H15.9c-0.9,0-1.7,0.7-1.7,1.7v12.1c0,0.9,0.7,1.7,1.7,1.7h7.7v1.8l-5.3,3c-0.4,0.2-0.5,0.7-0.3,1.1 - c0.2,0.4,0.7,0.5,1.1,0.3l4.5-2.5v2.6c0,0.4,0.3,0.8,0.8,0.8c0.4,0,0.8-0.3,0.8-0.8v-2.6l4.3,2.6c0.1,0.1,0.3,0.1,0.4,0.1 - c0.3,0,0.5-0.1,0.7-0.4c0.2-0.4,0.1-0.8-0.3-1.1l-5.1-3.1v-1.8H33c0.9,0,1.7-0.7,1.7-1.7V9.8C34.7,8.8,33.9,8.1,33,8.1z M33,21.9 - H15.9V9.8H33V21.9z"/> - <path d="M26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5 - C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5 - C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5 - C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5 - C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5C26.3,13.5,26.3,13.5,26.3,13.5 - C26.3,13.5,26.3,13.5,26.3,13.5C26.4,13.5,26.4,13.6,26.3,13.5c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.2,0.2l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0.2,0.2,0.4,0.3,0.6,0.3c0.2,0,0.4-0.1,0.6-0.2c0.3-0.3,0.4-0.9,0-1.2c-0.2-0.2-0.4-0.4-0.7-0.6c-0.2-0.1-0.3-0.2-0.5-0.2 - c-0.3,0-0.5,0.1-0.7,0.3C25.8,12.7,25.9,13.2,26.3,13.5z"/> - <path d="M23.8,13c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9c-0.3,0-0.6,0-0.9,0.1c-0.5,0.1-0.8,0.5-0.7,1C23,12.7,23.4,13,23.8,13z"/> - <path d="M27.5,15.8C27.5,15.8,27.5,15.8,27.5,15.8C27.5,15.8,27.5,15.8,27.5,15.8C27.5,15.8,27.5,15.8,27.5,15.8 - C27.5,15.8,27.5,15.9,27.5,15.8L27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8L27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8C27.5,15.9,27.5,15.9,27.5,15.8 - c0,0.1,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0.1,0,0.2,0,0.2 - c-0.1,0.5,0.2,0.9,0.7,1c0,0,0.1,0,0.1,0c0.4,0,0.8-0.3,0.8-0.7c0-0.2,0.1-0.5,0.1-0.8c0,0,0-0.1,0-0.1c0-0.5-0.4-0.8-0.9-0.8 - c0,0,0,0,0,0C27.8,14.9,27.5,15.3,27.5,15.8z"/> - <path d="M26.3,20.1c0.1,0,0.3,0,0.4-0.1c0.3-0.1,0.5-0.3,0.7-0.5c0.4-0.3,0.4-0.8,0.1-1.2c-0.2-0.2-0.4-0.3-0.7-0.3 - c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.3,0.2-0.5,0.3c-0.4,0.2-0.6,0.8-0.3,1.2C25.7,20,26,20.1,26.3,20.1z"/> - <path d="M20.2,17.9c0.1,0.3,0.5,0.5,0.8,0.5c0.1,0,0.2,0,0.4-0.1c0.4-0.2,0.6-0.7,0.4-1.1c0-0.1-0.1-0.1-0.1-0.2l0,0c0,0,0,0,0,0 - l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1-0.1-0.2-0.1-0.3 - c-0.1-0.4-0.4-0.6-0.8-0.6c-0.1,0-0.1,0-0.2,0c-0.5,0.1-0.7,0.6-0.6,1C20,17.3,20.1,17.6,20.2,17.9z"/> - <path d="M20.7,14.9c0.1,0.1,0.3,0.1,0.4,0.1c0.3,0,0.6-0.2,0.8-0.5c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0.3-0.4,0.2-0.9-0.2-1.2c-0.2-0.1-0.3-0.2-0.5-0.2 - c-0.3,0-0.5,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.5,0.7C20.1,14.1,20.2,14.7,20.7,14.9z"/> - <path d="M22.6,20.2c0.3,0.1,0.5,0.2,0.8,0.3c0.1,0,0.1,0,0.2,0c0.4,0,0.7-0.3,0.8-0.7c0.1-0.5-0.2-0.9-0.6-1c0,0,0,0,0,0l0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.2,0-0.3-0.1-0.5-0.2 - c-0.1,0-0.2-0.1-0.3-0.1c-0.3,0-0.6,0.2-0.8,0.5C22,19.5,22.2,20,22.6,20.2z"/> -</g> -<g> - <path class="st3" d="M33,58.5H15.9c-0.9,0-1.7,0.7-1.7,1.7v12.1c0,0.9,0.7,1.7,1.7,1.7h7.7v1.8l-5.3,3c-0.4,0.2-0.5,0.7-0.3,1.1 - c0.2,0.4,0.7,0.5,1.1,0.3l4.5-2.5v2.6c0,0.4,0.3,0.8,0.8,0.8c0.4,0,0.8-0.3,0.8-0.8v-2.6l4.3,2.6c0.1,0.1,0.3,0.1,0.4,0.1 - c0.3,0,0.5-0.1,0.7-0.4c0.2-0.4,0.1-0.8-0.3-1.1l-5.1-3.1v-1.8H33c0.9,0,1.7-0.7,1.7-1.7V60.2C34.7,59.2,33.9,58.5,33,58.5z - M33,72.3H15.9V60.2H33V72.3z"/> - <path class="st3" d="M26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9 - C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9 - C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9 - C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9 - C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9C26.3,63.9,26.3,63.9,26.3,63.9 - C26.3,63.9,26.3,63.9,26.3,63.9C26.4,63.9,26.4,63.9,26.3,63.9c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.2,0.2l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0.2,0.2,0.4,0.3,0.6,0.3c0.2,0,0.4-0.1,0.6-0.2c0.3-0.3,0.4-0.9,0-1.2c-0.2-0.2-0.4-0.4-0.7-0.6c-0.2-0.1-0.3-0.2-0.5-0.2 - c-0.3,0-0.5,0.1-0.7,0.3C25.8,63,25.9,63.6,26.3,63.9z"/> - <path class="st3" d="M23.8,63.4c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9c-0.3,0-0.6,0-0.9,0.1c-0.5,0.1-0.8,0.5-0.7,1 - C23,63.1,23.4,63.4,23.8,63.4z"/> - <path class="st3" d="M27.5,66.2C27.5,66.2,27.5,66.2,27.5,66.2C27.5,66.2,27.5,66.2,27.5,66.2C27.5,66.2,27.5,66.2,27.5,66.2 - C27.5,66.2,27.5,66.2,27.5,66.2L27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2L27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2C27.5,66.3,27.5,66.3,27.5,66.2 - c0,0.1,0,0.1,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0.1,0,0.2,0,0.2 - c-0.1,0.5,0.2,0.9,0.7,1c0,0,0.1,0,0.1,0c0.4,0,0.8-0.3,0.8-0.7c0-0.2,0.1-0.5,0.1-0.8c0,0,0-0.1,0-0.1c0-0.5-0.4-0.8-0.9-0.8 - c0,0,0,0,0,0C27.8,65.3,27.5,65.7,27.5,66.2z"/> - <path class="st3" d="M26.3,70.5c0.1,0,0.3,0,0.4-0.1c0.3-0.1,0.5-0.3,0.7-0.5c0.4-0.3,0.4-0.8,0.1-1.2c-0.2-0.2-0.4-0.3-0.7-0.3 - c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.3,0.2-0.5,0.3c-0.4,0.2-0.6,0.8-0.3,1.2C25.7,70.4,26,70.5,26.3,70.5z"/> - <path class="st3" d="M20.2,68.3c0.1,0.3,0.5,0.5,0.8,0.5c0.1,0,0.2,0,0.4-0.1c0.4-0.2,0.6-0.7,0.4-1.1c0-0.1-0.1-0.1-0.1-0.2l0,0 - c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1-0.1-0.2-0.1-0.3 - c-0.1-0.4-0.4-0.6-0.8-0.6c-0.1,0-0.1,0-0.2,0c-0.5,0.1-0.7,0.6-0.6,1C20,67.7,20.1,68,20.2,68.3z"/> - <path class="st3" d="M20.7,65.3c0.1,0.1,0.3,0.1,0.4,0.1c0.3,0,0.6-0.2,0.8-0.5c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0.3-0.4,0.2-0.9-0.2-1.2c-0.2-0.1-0.3-0.2-0.5-0.2 - c-0.3,0-0.5,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.5,0.7C20.1,64.5,20.2,65.1,20.7,65.3z"/> - <path class="st3" d="M22.6,70.6c0.3,0.1,0.5,0.2,0.8,0.3c0.1,0,0.1,0,0.2,0c0.4,0,0.7-0.3,0.8-0.7c0.1-0.5-0.2-0.9-0.6-1 - c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.2,0-0.3-0.1-0.5-0.2 - c-0.1,0-0.2-0.1-0.3-0.1c-0.3,0-0.6,0.2-0.8,0.5C22,69.9,22.2,70.4,22.6,70.6z"/> -</g> -<g class="st4"> - <g class="st0"> - <path class="st2" d="M50,146.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> -</g> -<g class="st4"> - <path class="st3" d="M6.7,141.3v1.1H2.2V136h4.4v1.1H3.5v1.5h2.7v1H3.5v1.7H6.7z"/> - <path class="st3" d="M8.3,136l1.6,2.4l1.6-2.4h1.3l-2.3,3.2l2.2,3.1h-1.3l-1.5-2.3l-1.5,2.3H7l2.2-3.1L7,136H8.3z"/> - <path class="st3" d="M12.8,142.4l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6h-2.2l-0.6,1.6H12.8z M15.9,137.3l-0.9,2.6h1.8L15.9,137.3z"/> - <path class="st3" d="M24.8,142.4v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2V136h1.3l1.9,3.6l1.9-3.6H26v6.4H24.8z"/> - <path class="st3" d="M27.3,142.4V136H30c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.3,0,0.5-0.1,0.8c-0.1,0.3-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.4-0.6,0.5c-0.2,0.1-0.5,0.2-0.8,0.2h-1.5v2.1H27.3z M28.6,139.1H30 - c0.2,0,0.4-0.1,0.6-0.3c0.2-0.2,0.2-0.4,0.2-0.8c0-0.2,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.2-0.3-0.2 - c-0.1,0-0.2-0.1-0.3-0.1h-1.4V139.1z"/> - <path class="st3" d="M32.9,142.4V136h1.2v5.3h3.3v1.1H32.9z"/> - <path class="st3" d="M42.7,141.3v1.1h-4.4V136h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H42.7z"/> - <path class="st3" d="M47.4,137.6c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9s-0.3,0.4-0.5,0.6c-0.2,0.1-0.5,0.3-0.8,0.3s-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2 - c-0.5-0.1-0.9-0.3-1.3-0.6l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1 - c0.7,0,1-0.2,1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2s-0.4-0.1-0.7-0.2 - c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.3c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.7-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2c0.4,0.1,0.7,0.3,1,0.5L47.4,137.6z"/> -</g> -<g class="st4"> - <path class="st3" d="M33,108.5H15.9c-0.9,0-1.7,0.7-1.7,1.7v12.1c0,0.9,0.7,1.7,1.7,1.7h7.7v1.8l-5.3,3c-0.4,0.2-0.5,0.7-0.3,1.1 - c0.2,0.4,0.7,0.5,1.1,0.3l4.5-2.5v2.6c0,0.4,0.3,0.8,0.8,0.8c0.4,0,0.8-0.3,0.8-0.8v-2.6l4.3,2.6c0.1,0.1,0.3,0.1,0.4,0.1 - c0.3,0,0.5-0.1,0.7-0.4c0.2-0.4,0.1-0.8-0.3-1.1l-5.1-3.1v-1.8H33c0.9,0,1.7-0.7,1.7-1.7v-12.1C34.7,109.2,33.9,108.5,33,108.5z - M33,122.3H15.9v-12.1H33V122.3z"/> - <path class="st3" d="M26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9C26.3,113.9,26.3,113.9,26.3,113.9 - C26.4,113.9,26.4,113.9,26.3,113.9c0.1,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0.1,0.1,0.2,0.1,0.2,0.2l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.2,0.2,0.4,0.3,0.6,0.3 - c0.2,0,0.4-0.1,0.6-0.2c0.3-0.3,0.4-0.9,0-1.2c-0.2-0.2-0.4-0.4-0.7-0.6c-0.2-0.1-0.3-0.2-0.5-0.2c-0.3,0-0.5,0.1-0.7,0.3 - C25.8,113,25.9,113.6,26.3,113.9z"/> - <path class="st3" d="M23.8,113.4c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0h0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0.1,0,0.2,0,0.2,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0.5,0,0.9-0.4,0.9-0.9s-0.4-0.9-0.9-0.9c-0.3,0-0.6,0-0.9,0.1c-0.5,0.1-0.8,0.5-0.7,1C23,113.1,23.4,113.4,23.8,113.4 - z"/> - <path class="st3" d="M27.5,116.2C27.5,116.2,27.5,116.2,27.5,116.2C27.5,116.2,27.5,116.2,27.5,116.2 - C27.5,116.2,27.5,116.2,27.5,116.2C27.5,116.2,27.5,116.2,27.5,116.2L27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2L27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2 - C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2C27.5,116.3,27.5,116.3,27.5,116.2c0,0.1,0,0.1,0,0.1 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0.1,0,0.2,0,0.2c-0.1,0.5,0.2,0.9,0.7,1 - c0,0,0.1,0,0.1,0c0.4,0,0.8-0.3,0.8-0.7c0-0.2,0.1-0.5,0.1-0.8c0,0,0-0.1,0-0.1c0-0.5-0.4-0.8-0.9-0.8c0,0,0,0,0,0 - C27.8,115.3,27.5,115.7,27.5,116.2z"/> - <path class="st3" d="M26.3,120.5c0.1,0,0.3,0,0.4-0.1c0.3-0.1,0.5-0.3,0.7-0.5c0.4-0.3,0.4-0.8,0.1-1.2c-0.2-0.2-0.4-0.3-0.7-0.3 - c-0.2,0-0.4,0.1-0.5,0.2c-0.1,0.1-0.3,0.2-0.5,0.3c-0.4,0.2-0.6,0.8-0.3,1.2C25.7,120.4,26,120.5,26.3,120.5z"/> - <path class="st3" d="M20.2,118.3c0.1,0.3,0.5,0.5,0.8,0.5c0.1,0,0.2,0,0.4-0.1c0.4-0.2,0.6-0.7,0.4-1.1c0-0.1-0.1-0.1-0.1-0.2l0,0 - c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1-0.1-0.2-0.1-0.3 - c-0.1-0.4-0.4-0.6-0.8-0.6c-0.1,0-0.1,0-0.2,0c-0.5,0.1-0.7,0.6-0.6,1C20,117.7,20.1,118,20.2,118.3z"/> - <path class="st3" d="M20.7,115.3c0.1,0.1,0.3,0.1,0.4,0.1c0.3,0,0.6-0.2,0.8-0.5c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1c0.3-0.4,0.2-0.9-0.2-1.2c-0.2-0.1-0.3-0.2-0.5-0.2 - c-0.3,0-0.5,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.5,0.7C20.1,114.5,20.2,115.1,20.7,115.3z"/> - <path class="st3" d="M22.6,120.6c0.3,0.1,0.5,0.2,0.8,0.3c0.1,0,0.1,0,0.2,0c0.4,0,0.7-0.3,0.8-0.7c0.1-0.5-0.2-0.9-0.6-1 - c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0 - c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c-0.2,0-0.3-0.1-0.5-0.2 - c-0.1,0-0.2-0.1-0.3-0.1c-0.3,0-0.6,0.2-0.8,0.5C22,119.9,22.2,120.4,22.6,120.6z"/> -</g> -</svg> diff --git a/scripts/system/assets/images/tools/hmd-switch-01.svg b/scripts/system/assets/images/tools/hmd-switch-01.svg deleted file mode 100644 index 31389d355c..0000000000 --- a/scripts/system/assets/images/tools/hmd-switch-01.svg +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 50 150" style="enable-background:new 0 0 50 150;" xml:space="preserve"> -<style type="text/css"> - .st0{opacity:0.49;} - .st1{opacity:0.9;} - .st2{fill:#1E1E1E;} - .st3{fill:#FFFFFF;} - .st4{fill:#EAEAEA;} - .st5{opacity:0.49;fill:#EAEAEA;} -</style> -<g class="st0"> - <g class="st1"> - <path class="st2" d="M50,146.4c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.4z"/> - </g> -</g> -<g class="st1"> - <path class="st3" d="M50,46.6c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.6z"/> -</g> -<path d="M27.3,21.1v3.5c0,0.6-0.5,1.1-1.1,1.1H13c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8c-0.1-0.4-0.3-0.9-0.3-1.3 - H13c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7c0,0.3,0.3,0.7,0.6,0.7h8.5 - c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7V27c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4v-4.4 - C28.2,20.5,27.8,20.8,27.3,21.1z"/> -<path d="M35.7,19.8h-3.7c-0.9,0-1.6-0.9-2.1-1.7c-0.2-0.3-0.6-0.8-0.8-1c-0.2,0.1-0.6,0.6-0.8,0.9c-0.6,0.8-1.2,1.8-2.2,1.8h-3.5 - c-2.8,0-5-2.2-5-5v-2.3c0-2.8,2.3-5,5-5h13.1c2.8,0,5,2.2,5,5v2.3C40.8,17.6,38.5,19.8,35.7,19.8z M29.2,15.8c0.8,0,1.4,0.8,1.9,1.6 - c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7H22.7c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5 - c0.3,0,0.8-0.7,1.1-1.2C27.8,16.5,28.4,15.8,29.2,15.8C29.2,15.8,29.2,15.8,29.2,15.8z"/> -<path d="M36.9,21.6c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6l0.8-0.8l-0.8-0.8 - l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1c1.3-1.3,1-3.1,1-3.1 - l0.8,0.8l0.8-0.8l-1.6-1.6C37.2,21.8,37,21.7,36.9,21.6z"/> -<g> - <path d="M10.3,37.9c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9c-0.1,0.2-0.3,0.4-0.5,0.6s-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2S6.4,42.2,6,41.9 - l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1-0.2,1-0.7 - c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2c-0.3-0.1-0.6-0.2-0.8-0.3 - s-0.4-0.2-0.6-0.3c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9c0.1-0.3,0.3-0.5,0.5-0.6 - s0.5-0.3,0.7-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2c0.4,0.1,0.7,0.3,1,0.5L10.3,37.9z"/> - <path d="M14.3,36.3h1.1l0.7,2.1l0.7-2.1H18L17,39.2l0.8,2l1.8-5h1.4l-2.6,6.4h-1L16.2,40l-1.1,2.7h-1l-2.6-6.4h1.3l1.8,5l0.8-2 - L14.3,36.3z"/> - <path d="M21.8,42.6v-6.4h1.2v6.4H21.8z"/> - <path d="M29.4,37.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.3z"/> - <path d="M30,39.4c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.3-0.3c0.6,0,1.1,0.1,1.5,0.4 - c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2c-0.1,0-0.3,0-0.4,0 - c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.1,0.2-0.3,0.4-0.3,0.7s-0.1,0.5-0.1,0.8c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7 - c0.2,0.2,0.3,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3 - c0.1-0.1,0.2-0.3,0.3-0.4l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.6c-0.2,0.2-0.4,0.3-0.6,0.5c-0.2,0.1-0.5,0.2-0.7,0.3 - c-0.3,0.1-0.5,0.1-0.8,0.1c-0.4,0-0.9-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1C30.1,40.2,30,39.8,30,39.4z"/> - <path d="M42,36.3v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H42z"/> -</g> -<g class="st1"> - <path class="st2" d="M50,96.6c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.6z"/> -</g> -<path class="st4" d="M27.3,71.1v3.5c0,0.6-0.5,1.1-1.1,1.1H13c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 - c-0.1-0.4-0.3-0.9-0.3-1.3H13c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 - c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7V77c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 - v-4.4C28.2,70.5,27.8,70.8,27.3,71.1z"/> -<path class="st4" d="M35.7,69.8h-3.7c-0.9,0-1.6-0.9-2.1-1.7c-0.2-0.3-0.6-0.8-0.8-1c-0.2,0.1-0.6,0.6-0.8,0.9 - c-0.6,0.8-1.2,1.8-2.2,1.8h-3.5c-2.8,0-5-2.2-5-5v-2.3c0-2.8,2.3-5,5-5h13.1c2.8,0,5,2.2,5,5v2.3C40.8,67.6,38.5,69.8,35.7,69.8z - M29.2,65.8c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7H22.7 - c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,66.5,28.4,65.8,29.2,65.8 - C29.2,65.8,29.2,65.8,29.2,65.8z"/> -<path class="st4" d="M36.9,71.6c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6l0.8-0.8 - l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 - c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.2,71.8,37,71.7,36.9,71.6z"/> -<g> - <path class="st4" d="M10.3,87.9c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2s-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2S7.6,87.8,7.6,88c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3s0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9c-0.1,0.2-0.3,0.4-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2 - c-0.5-0.1-0.9-0.3-1.3-0.6l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1 - c0.7,0,1-0.2,1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 - c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.3S6.5,89,6.4,88.8c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.7-0.4s0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2s0.7,0.3,1,0.5L10.3,87.9z"/> - <path class="st4" d="M14.3,86.3h1.1l0.7,2.1l0.7-2.1H18L17,89.2l0.8,2l1.8-5h1.4l-2.6,6.4h-1L16.2,90l-1.1,2.7h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L14.3,86.3z"/> - <path class="st4" d="M21.8,92.6v-6.4h1.2v6.4H21.8z"/> - <path class="st4" d="M29.4,87.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.3z"/> - <path class="st4" d="M30,89.4c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 - c0.6,0,1.1,0.1,1.5,0.4s0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3s-0.3-0.1-0.4-0.2 - c-0.1,0-0.3,0-0.4,0c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.1,0.2-0.3,0.4-0.3,0.7s-0.1,0.5-0.1,0.8c0,0.3,0,0.6,0.1,0.8 - c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1c0.1,0,0.3-0.1,0.4-0.2 - c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.4l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.6c-0.2,0.2-0.4,0.3-0.6,0.5 - c-0.2,0.1-0.5,0.2-0.7,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.4,0-0.9-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C30.1,90.2,30,89.8,30,89.4z"/> - <path class="st4" d="M42,86.2v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H42z"/> -</g> -<path class="st5" d="M27.3,121.1v3.5c0,0.6-0.5,1.1-1.1,1.1H13c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 - c-0.1-0.4-0.3-0.9-0.3-1.3H13c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 - c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7V127c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 - v-4.4C28.2,120.5,27.8,120.8,27.3,121.1z"/> -<path class="st5" d="M35.7,119.8h-3.7c-0.9,0-1.6-0.9-2.1-1.7c-0.2-0.3-0.6-0.8-0.8-1c-0.2,0.1-0.6,0.6-0.8,0.9 - c-0.6,0.8-1.2,1.8-2.2,1.8h-3.5c-2.8,0-5-2.2-5-5v-2.3c0-2.8,2.3-5,5-5h13.1c2.8,0,5,2.2,5,5v2.3C40.8,117.6,38.5,119.8,35.7,119.8z - M29.2,115.8c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7H22.7 - c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,116.5,28.4,115.8,29.2,115.8 - C29.2,115.8,29.2,115.8,29.2,115.8z"/> -<path class="st5" d="M36.9,121.6c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6 - l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 - c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.2,121.8,37,121.7,36.9,121.6z"/> -<g class="st0"> - <path class="st4" d="M10.3,137.9c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.2-0.1-0.4-0.2s-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.3,0-0.6,0.1-0.8,0.2s-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 - c0.2,0.1,0.4,0.1,0.6,0.2c0.3,0.1,0.6,0.2,0.9,0.3s0.5,0.2,0.6,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.4,0.1,0.7 - c0,0.3-0.1,0.6-0.2,0.9c-0.1,0.2-0.3,0.4-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.4-0.2 - c-0.5-0.1-0.9-0.3-1.3-0.6l0.5-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.2c0.2,0.1,0.5,0.1,0.7,0.1 - c0.7,0,1-0.2,1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 - c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.3s-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.6c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.7-0.4s0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.2,0.2s0.7,0.3,1,0.5L10.3,137.9z"/> - <path class="st4" d="M14.3,136.3h1.1l0.7,2.1l0.7-2.1H18l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L14.3,136.3z"/> - <path class="st4" d="M21.8,142.6v-6.4h1.2v6.4H21.8z"/> - <path class="st4" d="M29.4,137.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V137.3z"/> - <path class="st4" d="M30,139.4c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 - c0.6,0,1.1,0.1,1.5,0.4s0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3s-0.3-0.1-0.4-0.2 - c-0.1,0-0.3,0-0.4,0c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.1,0.2-0.3,0.4-0.3,0.7s-0.1,0.5-0.1,0.8c0,0.3,0,0.6,0.1,0.8 - c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1c0.1,0,0.3-0.1,0.4-0.2 - c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.4l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.6c-0.2,0.2-0.4,0.3-0.6,0.5 - c-0.2,0.1-0.5,0.2-0.7,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.4,0-0.9-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C30.1,140.2,30,139.8,30,139.4z"/> - <path class="st4" d="M42,136.2v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H42z"/> -</g> -</svg> diff --git a/scripts/system/assets/images/tools/market.svg b/scripts/system/assets/images/tools/market.svg new file mode 100644 index 0000000000..fa4a3d7256 --- /dev/null +++ b/scripts/system/assets/images/tools/market.svg @@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:#F9F9F9;} + .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} + .st9{opacity:0.75;mask:url(#SVGID_3_);} + .st10{fill:#333333;} + .st11{fill:#FFFFFF;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <g> + <g> + <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> + <g class="st8"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ +xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA +AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy +E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis +ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB +BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U +AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED +AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k +PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr +vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> + </image> + </g> + </mask> + <g class="st9"> + <g> + <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <g> + <path class="st10" d="M12.1,42.8v-4.2l-1.6,3.1H9.8l-1.6-3.1v4.2H6.9v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12.1z"/> + <path class="st10" d="M14.3,42.8l2.5-6.4h1l2.5,6.4H19l-0.6-1.6h-2.2l-0.6,1.6H14.3z M17.3,37.7l-0.9,2.6h1.8L17.3,37.7z"/> + <path class="st10" d="M21.2,42.8v-6.4H24c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4H25l-1.3-2.1h-1.2v2.1H21.2z M22.4,39.6H24c0.1,0,0.2,0,0.3-0.1 + c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 + c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V39.6z"/> + <path class="st10" d="M27.5,42.8v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.5z"/> + <path class="st10" d="M38.2,41.7v1.1h-4.4v-6.4h4.4v1.1H35V39h2.7v1H35v1.7H38.2z"/> + <path class="st10" d="M44.2,37.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.5z"/> + </g> + <g> + <path class="st10" d="M14.3,12.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 + c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 + c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 + c0-0.1,0-0.1,0-0.1h0c0.3-1,0.6-2.1,0.9-3.1c0.1-0.2,0.1-0.4,0.2-0.6c0.1-0.4,0.2-0.8,0.4-1.2c0.1-0.4,0.2-0.8,0-1.1 + c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 + c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 + c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C14,12.2,14.1,12.2,14.3,12.2z M32.3,16.2L31,20.9l-0.3,0.2 + l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8c-0.1-0.6-0.3-1.3-0.5-2 + c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7L19,16.2H32.3z"/> + <path class="st10" d="M22.4,24.5L22.4,24.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23.2,24.7,22.8,24.5,22.4,24.5z"/> + <path class="st10" d="M29.5,24.5L29.5,24.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.3,24.7,29.9,24.5,29.5,24.5z"/> + </g> + <g> + <path class="st11" d="M12.1,92.8v-4.2l-1.6,3.1H9.8l-1.6-3.1v4.2H6.9v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12.1z"/> + <path class="st11" d="M14.3,92.8l2.5-6.4h1l2.5,6.4H19l-0.6-1.6h-2.2l-0.6,1.6H14.3z M17.3,87.7l-0.9,2.6h1.8L17.3,87.7z"/> + <path class="st11" d="M21.2,92.8v-6.4H24c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4H25l-1.3-2.1h-1.2v2.1H21.2z M22.4,89.6H24c0.1,0,0.2,0,0.3-0.1 + c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 + c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V89.6z"/> + <path class="st11" d="M27.5,92.8v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.5z"/> + <path class="st11" d="M38.2,91.7v1.1h-4.4v-6.4h4.4v1.1H35V89h2.7v1H35v1.7H38.2z"/> + <path class="st11" d="M44.2,87.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.5z"/> + </g> + <g> + <path class="st11" d="M14.3,62.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 + c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 + c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 + c0-0.1,0-0.1,0-0.1h0c0.3-1,0.6-2.1,0.9-3.1c0.1-0.2,0.1-0.4,0.2-0.6c0.1-0.4,0.2-0.8,0.4-1.2c0.1-0.4,0.2-0.8,0-1.1 + c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 + c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 + c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C14,62.2,14.1,62.2,14.3,62.2z M32.3,66.2L31,70.9l-0.3,0.2 + l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8c-0.1-0.6-0.3-1.3-0.5-2 + c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7L19,66.2H32.3z"/> + <path class="st11" d="M22.4,74.5L22.4,74.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23.2,74.7,22.8,74.5,22.4,74.5z"/> + <path class="st11" d="M29.5,74.5L29.5,74.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.3,74.7,29.9,74.5,29.5,74.5z"/> + </g> + <g> + <path class="st11" d="M11.9,142.9v-4.2l-1.6,3.1H9.6L8,138.6v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H11.9z"/> + <path class="st11" d="M14.1,142.9l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,137.8l-0.9,2.6H18L17.1,137.8z"/> + <path class="st11" d="M21,142.9v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21z M22.3,139.6h1.6c0.1,0,0.2,0,0.3-0.1 + c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 + c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V139.6z"/> + <path class="st11" d="M27.3,142.9v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> + <path class="st11" d="M38,141.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> + <path class="st11" d="M44,137.6h-2v5.3h-1.2v-5.3h-2v-1.1H44V137.6z"/> + </g> + <g> + <path class="st11" d="M14.1,112.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 + c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 + c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 + c0-0.1,0-0.1,0-0.1h0c0.3-1,0.6-2.1,0.9-3.1c0.1-0.2,0.1-0.4,0.2-0.6c0.1-0.4,0.2-0.8,0.4-1.2c0.1-0.4,0.2-0.8,0-1.1 + c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 + c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 + c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,112.2,13.9,112.2,14.1,112.2z M32.1,116.2l-1.3,4.7 + l-0.3,0.2l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8 + c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> + <path class="st11" d="M22.2,124.6L22.2,124.6c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,124.7,22.6,124.6,22.2,124.6z"/> + <path class="st11" d="M29.3,124.6L29.3,124.6c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,124.7,29.8,124.6,29.3,124.6z"/> + </g> + <g> + <path class="st11" d="M11.9,192.9v-4.2l-1.6,3.1H9.6L8,188.7v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H11.9z"/> + <path class="st11" d="M14.1,192.9l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,187.9l-0.9,2.6H18L17.1,187.9z"/> + <path class="st11" d="M21,192.9v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21z M22.3,189.7h1.6c0.1,0,0.2,0,0.3-0.1 + c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 + c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V189.7z"/> + <path class="st11" d="M27.3,192.9v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> + <path class="st11" d="M38,191.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> + <path class="st11" d="M44,187.6h-2v5.3h-1.2v-5.3h-2v-1.1H44V187.6z"/> + </g> + <g> + <path class="st11" d="M14.1,162.3c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 + c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 + c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 + c0-0.1,0-0.1,0-0.1h0c0.3-1,0.6-2.1,0.9-3.1c0.1-0.2,0.1-0.4,0.2-0.6c0.1-0.4,0.2-0.8,0.4-1.2c0.1-0.4,0.2-0.8,0-1.1 + c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 + c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 + c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,162.3,13.9,162.3,14.1,162.3z M32.1,166.3l-1.3,4.7 + l-0.3,0.2l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8 + c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> + <path class="st11" d="M22.2,174.7L22.2,174.7c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,174.8,22.6,174.7,22.2,174.7z"/> + <path class="st11" d="M29.3,174.7L29.3,174.7c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,174.8,29.8,174.7,29.3,174.7z"/> + </g> +</g> +</svg> diff --git a/scripts/system/assets/images/tools/mic.svg b/scripts/system/assets/images/tools/mic.svg new file mode 100644 index 0000000000..f3afccca70 --- /dev/null +++ b/scripts/system/assets/images/tools/mic.svg @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:none;stroke:#75FF48;stroke-width:0.25;stroke-miterlimit:10;} + .st8{fill:none;} + .st9{fill:#FFFFFF;} + .st10{font-family:'Raleway-Bold';} + .st11{font-size:9px;} + .st12{fill:#333333;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <rect x="12.5" y="186.7" class="st8" width="41.5" height="13.9"/> + <text transform="matrix(1 0 0 1 12.5371 193.3)" class="st9 st10 st11">MUTE</text> + <path class="st9" d="M28.6,115.9l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.5,114.2,27.8,114.9,28.6,115.9z"/> + <path class="st9" d="M31.2,113.2l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 + c1.5-1.6,3.6-2.6,5.9-2.6C27.6,110.5,29.7,111.5,31.2,113.2z"/> + <path class="st9" d="M27.1,120.3V118c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.1z"/> + <path class="st9" d="M23.3,122v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V122H23.3z"/> + <path class="st9" d="M30.9,124.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 + c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.9,129.6,30.9,127.4,30.9,124.8z"/> + <path class="st9" d="M28.7,65.8l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.7,64.1,27.9,64.8,28.7,65.8z"/> + <path class="st9" d="M31.4,63.1l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 + c1.5-1.6,3.6-2.6,5.9-2.6C27.7,60.4,29.9,61.5,31.4,63.1z"/> + <path class="st9" d="M27.2,70.2v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.2z"/> + <path class="st9" d="M23.4,71.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.4z"/> + <path class="st9" d="M31.1,74.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 + c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C29,79.5,31.1,77.3,31.1,74.7z"/> + <rect x="12.5" y="86.7" class="st8" width="41.5" height="13.9"/> + <text transform="matrix(1 0 0 1 12.5371 93.3)" class="st9 st10 st11">MUTE</text> + <rect x="5.4" y="36.8" class="st8" width="41.5" height="13.9"/> + <text transform="matrix(1 0 0 1 5.3575 43.396)" class="st9 st10 st11">UNMUTE</text> + <g> + <g> + <polygon class="st9" points="27.7,19.2 27.7,19.2 27.7,19.2 "/> + <path class="st9" d="M26.5,14.9l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0L25,13.3l-2.7-2.7c-0.4-0.4-1.1-0.4-1.5,0 + c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7c0.4,0.4,1.1,0.4,1.5,0 + c0.4-0.4,0.4-1.1,0-1.5L26.5,14.9z"/> + </g> + <path class="st9" d="M23.3,22v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V22H23.3z"/> + <path class="st9" d="M30.9,24.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 + c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.9,29.6,30.9,27.5,30.9,24.8z"/> + </g> + <g> + <g> + <polygon class="st9" points="27.7,169.1 27.7,169.1 27.7,169.1 "/> + <path class="st9" d="M26.5,164.8l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7 + c-0.4-0.4-1.1-0.4-1.5,0c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7 + c0.4,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1.1,0-1.5L26.5,164.8z"/> + </g> + <path class="st9" d="M23.3,171.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.3z"/> + <path class="st9" d="M30.9,174.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 + c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.9,179.6,30.9,177.4,30.9,174.7z"/> + </g> + <rect x="5.2" y="136.8" class="st8" width="41.5" height="13.9"/> + <text transform="matrix(1 0 0 1 5.2311 143.396)" class="st9 st10 st11">UNMUTE</text> +</g> +</svg> diff --git a/scripts/system/assets/images/tools/switch.svg b/scripts/system/assets/images/tools/switch.svg new file mode 100644 index 0000000000..23655d747d --- /dev/null +++ b/scripts/system/assets/images/tools/switch.svg @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#515151;} + .st1{filter:url(#Adobe_OpacityMaskFilter);} + .st2{mask:url(#SVGID_1_);} + .st3{fill:#282828;} + .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} + .st5{mask:url(#SVGID_2_);} + .st6{fill:#1E1E1E;} + .st7{fill:#FFFFFF;} +</style> +<g id="Layer_2"> + <g> + <g> + <g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> + <g class="st1"> + + <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ +xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA +AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy +QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr +2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB +BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ +AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U +87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr +atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo +XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX +KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> + </image> + </g> + </mask> + <g class="st2"> + <g> + <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> + </g> + </g> + </g> + <g> + <g> + <g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + <defs> + <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> + + <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> + </filter> + </defs> + <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> + <g class="st4"> + + <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA +EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX +Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa +JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ +xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA +AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi +MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ ++sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB +BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 +D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 +7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza +SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x +Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI +fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> + </image> + </g> + </mask> + <g class="st5"> + <g> + <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> + </g> + </g> + </g> + <g> + <g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + </g> + </g> + <g> + <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + </g> +</g> +<g id="Layer_3"> +</g> +<g id="Layer_1"> + <g> + <path class="st7" d="M26.4,21.4v3.5c0,0.6-0.5,1.1-1.1,1.1H12.1c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 + c-0.1-0.4-0.3-0.9-0.3-1.3h-3.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4H18v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + c0,0.3,0.3,0.7,0.6,0.7H23c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 + v-4.4C27.3,20.8,26.8,21.1,26.4,21.4z"/> + <path class="st7" d="M28.3,17c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H21.7c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C26.9,17.8,27.5,17.1,28.3,17 + C28.3,17,28.3,17,28.3,17z"/> + <path class="st7" d="M36,21.9c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6L33,26 + l-0.8-0.8L30.5,27l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 + c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.2,22.1,36.1,22,36,21.9z"/> + </g> + <path class="st7" d="M11.4,38.2c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2S9.3,39,9.5,39 + c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6S11,42.9,10.7,43c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2S7.4,42.5,7,42.2 + l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1.1-0.2,1.1-0.7 + c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2c-0.3-0.1-0.6-0.2-0.8-0.3 + c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9c0.1-0.3,0.3-0.5,0.5-0.6 + c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.4,38.2z"/> + <path class="st7" d="M15.4,36.6h1.1l0.7,2.1l0.7-2.1h1.2L18,39.5l0.8,2l1.8-5H22l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.4,36.6z"/> + <path class="st7" d="M22.9,42.9v-6.4h1.2v6.4H22.9z"/> + <path class="st7" d="M30.5,37.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.6z"/> + <path class="st7" d="M31,39.7c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 + c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 + c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 + C31.1,40.5,31,40.1,31,39.7z"/> + <path class="st7" d="M43.1,36.5v6.4h-1.2v-2.7H39v2.7h-1.2v-6.4H39v2.6h2.9v-2.6H43.1z"/> + <g> + <path class="st7" d="M26.4,71.4v3.5c0,0.6-0.5,1.1-1.1,1.1H12.1c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 + c-0.1-0.4-0.3-0.9-0.3-1.3h-3.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4H18v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + c0,0.3,0.3,0.7,0.6,0.7H23c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 + v-4.4C27.3,70.8,26.8,71.1,26.4,71.4z"/> + <path class="st7" d="M28.3,67c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H21.7c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C26.9,67.8,27.5,67.1,28.3,67 + C28.3,67,28.3,67,28.3,67z"/> + <path class="st7" d="M36,71.9c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6L33,76 + l-0.8-0.8L30.5,77l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 + c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.2,72.1,36.1,72,36,71.9z"/> + </g> + <path class="st7" d="M11.4,88.2c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2C9.1,88.9,9.3,89,9.5,89 + c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + c-0.5-0.1-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2 + c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2 + c-0.2-0.1-0.4-0.1-0.7-0.2c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7 + c0-0.3,0.1-0.6,0.2-0.9c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2 + c0.4,0.1,0.7,0.3,1,0.5L11.4,88.2z"/> + <path class="st7" d="M15.4,86.6h1.1l0.7,2.1l0.7-2.1h1.2L18,89.5l0.8,2l1.8-5H22l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.4,86.6z"/> + <path class="st7" d="M22.9,92.9v-6.4h1.2v6.4H22.9z"/> + <path class="st7" d="M30.5,87.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.6z"/> + <path class="st7" d="M31,89.7c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 + c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 + c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 + C31.1,90.5,31,90.1,31,89.7z"/> + <path class="st7" d="M43.1,86.5v6.4h-1.2v-2.7H39v2.7h-1.2v-6.4H39v2.6h2.9v-2.6H43.1z"/> + <path class="st7" d="M25.2,121.4v4.5c0,0.6-0.5,1.1-1.1,1.1H10.9c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h6.8 + c-0.1-0.4-0.3-0.9-0.3-1.3h-6.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 + v-5.4C26.1,120.9,25.7,121.2,25.2,121.4z"/> + <path class="st7" d="M29.1,116.1c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H22.6c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,116.9,28.3,116.2,29.1,116.1 + C29.1,116.1,29.1,116.1,29.1,116.1z"/> + <path class="st7" d="M35.8,121c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6l0.8-0.8 + l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8L31,128c0,0,2.7,0.3,4.1-1.1 + c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.1,121.1,36,121.1,35.8,121z"/> + <path class="st7" d="M11.3,138.3c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 + c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + s-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 + c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 + c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 + c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.3,138.3z"/> + <path class="st7" d="M15.2,136.6h1.1l0.7,2.1l0.7-2.1H19l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7L16,143h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.2,136.6z"/> + <path class="st7" d="M22.7,143v-6.4H24v6.4H22.7z"/> + <path class="st7" d="M30.3,137.7h-2v5.3H27v-5.3h-2v-1.1h5.3V137.7z"/> + <path class="st7" d="M30.9,139.8c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 + c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 + c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 + C30.9,140.6,30.9,140.2,30.9,139.8z"/> + <path class="st7" d="M43,136.6v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43z"/> + <path class="st7" d="M25.2,171.5v4.5c0,0.6-0.5,1.1-1.1,1.1H10.9c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h6.8 + c-0.1-0.4-0.3-0.9-0.3-1.3h-6.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + s0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7s-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4v-5.4 + C26.1,171,25.7,171.2,25.2,171.5z"/> + <path class="st7" d="M29.1,166.2c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H22.6c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,167,28.3,166.2,29.1,166.2 + C29.1,166.2,29.1,166.2,29.1,166.2z"/> + <path class="st7" d="M35.8,171.1c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6 + l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8L31,178c0,0,2.7,0.3,4.1-1.1 + c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.1,171.2,36,171.1,35.8,171.1z"/> + <path class="st7" d="M11.3,188.3c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 + c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + s-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 + c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 + c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 + c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.3,188.3z"/> + <path class="st7" d="M15.2,186.7h1.1l0.7,2.1l0.7-2.1H19l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.2,186.7z"/> + <path class="st7" d="M22.7,193.1v-6.4H24v6.4H22.7z"/> + <path class="st7" d="M30.3,187.8h-2v5.3H27v-5.3h-2v-1.1h5.3V187.8z"/> + <path class="st7" d="M30.9,189.8c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 + c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 + c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 + C30.9,190.7,30.9,190.2,30.9,189.8z"/> + <path class="st7" d="M43,186.7v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43z"/> +</g> +</svg> diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 9d5585e353..6810bae590 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -192,7 +192,7 @@ var toolBar = (function() { }); activeButton = toolBar.addTool({ - imageURL: toolIconUrl + "edit-01.svg", + imageURL: toolIconUrl + "edit.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, diff --git a/scripts/system/examples.js b/scripts/system/examples.js index 4d838bc8af..0ec2644f9c 100644 --- a/scripts/system/examples.js +++ b/scripts/system/examples.js @@ -53,7 +53,7 @@ function toggleExamples() { var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var browseExamplesButton = toolBar.addButton({ - imageURL: toolIconUrl + "examples-01.svg", + imageURL: toolIconUrl + "market.svg", objectName: "examples", buttonState: 1, alpha: 0.9 diff --git a/scripts/system/goto.js b/scripts/system/goto.js index 4650e72dad..24c402ab85 100644 --- a/scripts/system/goto.js +++ b/scripts/system/goto.js @@ -14,7 +14,7 @@ var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var button = toolBar.addButton({ objectName: "goto", - imageURL: Script.resolvePath("assets/images/tools/directory-01.svg"), + imageURL: Script.resolvePath("assets/images/tools/directory.svg"), visible: true, buttonState: 1, alpha: 0.9, diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js index 0d6a273975..305557b60c 100644 --- a/scripts/system/hmd.js +++ b/scripts/system/hmd.js @@ -30,7 +30,7 @@ function onClicked(){ if (headset) { button = toolBar.addButton({ objectName: "hmdToggle", - imageURL: Script.resolvePath("assets/images/tools/hmd-switch-01.svg"), + imageURL: Script.resolvePath("assets/images/tools/switch.svg"), visible: true, alpha: 0.9, }); diff --git a/scripts/system/mute.js b/scripts/system/mute.js index f91ecbafae..cd29e8faae 100644 --- a/scripts/system/mute.js +++ b/scripts/system/mute.js @@ -14,7 +14,7 @@ var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); var button = toolBar.addButton({ objectName: "mute", - imageURL: Script.resolvePath("assets/images/tools/mic-01.svg"), + imageURL: Script.resolvePath("assets/images/tools/mic.svg"), visible: true, alpha: 0.9, }); From 804a187a7b81928a386b29270d9b1d7fe0af86f7 Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Fri, 1 Jul 2016 10:17:17 -0700 Subject: [PATCH 14/28] Mute changes. --- scripts/system/assets/images/tools/mic.svg | 121 +++++++++++------- .../system/assets/images/tools/microphone.svg | 13 -- scripts/system/mute.js | 7 +- 3 files changed, 80 insertions(+), 61 deletions(-) delete mode 100644 scripts/system/assets/images/tools/microphone.svg diff --git a/scripts/system/assets/images/tools/mic.svg b/scripts/system/assets/images/tools/mic.svg index f3afccca70..126bb539fc 100644 --- a/scripts/system/assets/images/tools/mic.svg +++ b/scripts/system/assets/images/tools/mic.svg @@ -10,12 +10,7 @@ .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} .st5{mask:url(#SVGID_2_);} .st6{fill:#1E1E1E;} - .st7{fill:none;stroke:#75FF48;stroke-width:0.25;stroke-miterlimit:10;} - .st8{fill:none;} - .st9{fill:#FFFFFF;} - .st10{font-family:'Raleway-Bold';} - .st11{font-size:9px;} - .st12{fill:#333333;} + .st7{fill:#FFFFFF;} </style> <g id="Layer_2"> <g> @@ -95,9 +90,7 @@ fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> </g> </g> <g> - <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> + <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> </g> <g> <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> @@ -106,59 +99,97 @@ fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> <g id="Layer_3"> </g> <g id="Layer_1"> - <rect x="12.5" y="186.7" class="st8" width="41.5" height="13.9"/> - <text transform="matrix(1 0 0 1 12.5371 193.3)" class="st9 st10 st11">MUTE</text> - <path class="st9" d="M28.6,115.9l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 - c0.8-0.9,2-1.5,3.3-1.5C26.5,114.2,27.8,114.9,28.6,115.9z"/> - <path class="st9" d="M31.2,113.2l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 - c1.5-1.6,3.6-2.6,5.9-2.6C27.6,110.5,29.7,111.5,31.2,113.2z"/> - <path class="st9" d="M27.1,120.3V118c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.1z"/> - <path class="st9" d="M23.3,122v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V122H23.3z"/> - <path class="st9" d="M30.9,124.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <g> + <path class="st7" d="M18.4,192.3v-4.2l-1.6,3.1H16l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18.4z"/> + <path class="st7" d="M23.9,191.2c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.6,191.2,23.9,191.2z"/> + <path class="st7" d="M32.9,187h-2v5.3h-1.2V187h-2v-1.1h5.3V187z"/> + <path class="st7" d="M38.4,191.2v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38.4z"/> + </g> + <path class="st7" d="M28.5,114.9l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.5,113.2,27.7,113.9,28.5,114.9z"/> + <path class="st7" d="M31.2,112.2l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 + c1.5-1.6,3.6-2.6,5.9-2.6C27.5,109.5,29.7,110.5,31.2,112.2z"/> + <path class="st7" d="M27.1,119.3V117c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.1z"/> + <path class="st7" d="M23.2,121v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V121H23.2z"/> + <path class="st7" d="M30.9,123.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.9,129.6,30.9,127.4,30.9,124.8z"/> - <path class="st9" d="M28.7,65.8l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 - c0.8-0.9,2-1.5,3.3-1.5C26.7,64.1,27.9,64.8,28.7,65.8z"/> - <path class="st9" d="M31.4,63.1l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 - c1.5-1.6,3.6-2.6,5.9-2.6C27.7,60.4,29.9,61.5,31.4,63.1z"/> - <path class="st9" d="M27.2,70.2v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.2z"/> - <path class="st9" d="M23.4,71.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.4z"/> - <path class="st9" d="M31.1,74.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + h-2.3l0-1.8C28.8,128.6,30.9,126.4,30.9,123.8z"/> + <path class="st7" d="M28.7,64.8l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.6,63.1,27.9,63.8,28.7,64.8z"/> + <path class="st7" d="M31.3,62.1l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 + c1.5-1.6,3.6-2.6,5.9-2.6C27.6,59.4,29.8,60.5,31.3,62.1z"/> + <path class="st7" d="M27.2,69.2v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.2z"/> + <path class="st7" d="M23.3,70.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.3z"/> + <path class="st7" d="M31,73.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C29,79.5,31.1,77.3,31.1,74.7z"/> - <rect x="12.5" y="86.7" class="st8" width="41.5" height="13.9"/> - <text transform="matrix(1 0 0 1 12.5371 93.3)" class="st9 st10 st11">MUTE</text> - <rect x="5.4" y="36.8" class="st8" width="41.5" height="13.9"/> - <text transform="matrix(1 0 0 1 5.3575 43.396)" class="st9 st10 st11">UNMUTE</text> + h-2.3l0-1.8C28.9,78.5,31,76.3,31,73.7z"/> + <g> + <path class="st7" d="M18.4,92.3v-4.2l-1.6,3.1H16l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18.4z"/> + <path class="st7" d="M23.9,91.2c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.6,91.2,23.9,91.2z"/> + <path class="st7" d="M32.9,87h-2v5.3h-1.2V87h-2v-1.1h5.3V87z"/> + <path class="st7" d="M38.4,91.2v1.1h-4.4v-6.4h4.4V87h-3.1v1.5h2.7v1h-2.7v1.7H38.4z"/> + </g> + <g> + <path class="st7" d="M8.7,41.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V36h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + C7,42,6.7,41.8,6.5,41.5c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V36h1.2v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S8.4,41.3,8.7,41.3z"/> + <path class="st7" d="M14.2,38.3v4.1h-1.2V36h1l3.3,4.2V36h1.2v6.4h-1L14.2,38.3z"/> + <path class="st7" d="M25.2,42.4v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2H20V36h1.3l1.9,3.6l1.9-3.6h1.3v6.4H25.2z"/> + <path class="st7" d="M30.7,41.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V36h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V36h1.2v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S30.4,41.3,30.7,41.3z"/> + <path class="st7" d="M39.8,37.1h-2v5.3h-1.2v-5.3h-2V36h5.3V37.1z"/> + <path class="st7" d="M45.2,41.3v1.1h-4.4V36h4.4v1.1H42v1.5h2.7v1H42v1.7H45.2z"/> + </g> <g> <g> - <polygon class="st9" points="27.7,19.2 27.7,19.2 27.7,19.2 "/> - <path class="st9" d="M26.5,14.9l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0L25,13.3l-2.7-2.7c-0.4-0.4-1.1-0.4-1.5,0 + <polygon class="st7" points="27.7,18.2 27.6,18.2 27.6,18.2 "/> + <path class="st7" d="M26.5,13.9l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7c-0.4-0.4-1.1-0.4-1.5,0 c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7c0.4,0.4,1.1,0.4,1.5,0 - c0.4-0.4,0.4-1.1,0-1.5L26.5,14.9z"/> + c0.4-0.4,0.4-1.1,0-1.5L26.5,13.9z"/> </g> - <path class="st9" d="M23.3,22v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V22H23.3z"/> - <path class="st9" d="M30.9,24.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <path class="st7" d="M23.2,21v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V21H23.2z"/> + <path class="st7" d="M30.9,23.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.9,29.6,30.9,27.5,30.9,24.8z"/> + h-2.3l0-1.8C28.8,28.6,30.9,26.5,30.9,23.8z"/> </g> <g> <g> - <polygon class="st9" points="27.7,169.1 27.7,169.1 27.7,169.1 "/> - <path class="st9" d="M26.5,164.8l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7 + <polygon class="st7" points="27.7,168.1 27.6,168.1 27.6,168.1 "/> + <path class="st7" d="M26.5,163.8l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7 c-0.4-0.4-1.1-0.4-1.5,0c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7 - c0.4,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1.1,0-1.5L26.5,164.8z"/> + c0.4,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1.1,0-1.5L26.5,163.8z"/> </g> - <path class="st9" d="M23.3,171.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.3z"/> - <path class="st9" d="M30.9,174.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <path class="st7" d="M23.2,170.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.2z"/> + <path class="st7" d="M30.9,173.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.9,179.6,30.9,177.4,30.9,174.7z"/> + h-2.3l0-1.8C28.8,178.6,30.9,176.4,30.9,173.7z"/> + </g> + <g> + <path class="st7" d="M8.5,141.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V136h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + s-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V136H7v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 + c0.1,0.2,0.3,0.3,0.5,0.5S8.2,141.3,8.5,141.3z"/> + <path class="st7" d="M14,138.3v4.1h-1.2V136h1l3.3,4.2V136h1.2v6.4h-1L14,138.3z"/> + <path class="st7" d="M25.1,142.4v-4.2l-1.6,3.2h-0.7l-1.6-3.2v4.2h-1.2V136h1.3l1.9,3.6L25,136h1.3v6.4H25.1z"/> + <path class="st7" d="M30.6,141.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V136h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + s-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V136H29v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 + c0.1,0.2,0.3,0.3,0.5,0.5S30.3,141.3,30.6,141.3z"/> + <path class="st7" d="M39.6,137.1h-2v5.3h-1.2v-5.3h-2V136h5.3V137.1z"/> + <path class="st7" d="M45.1,141.3v1.1h-4.4V136H45v1.1h-3.1v1.5h2.7v1h-2.7v1.7H45.1z"/> </g> - <rect x="5.2" y="136.8" class="st8" width="41.5" height="13.9"/> - <text transform="matrix(1 0 0 1 5.2311 143.396)" class="st9 st10 st11">UNMUTE</text> </g> </svg> diff --git a/scripts/system/assets/images/tools/microphone.svg b/scripts/system/assets/images/tools/microphone.svg deleted file mode 100644 index bd5e8afac7..0000000000 --- a/scripts/system/assets/images/tools/microphone.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<svg width="50" height="50.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - <metadata id="metadata27">image/svg+xml</metadata> - - <g> - <title>Layer 1</title> - <g id="g3" opacity="0.9"> - <path id="path5" d="m50,46c0,2.2 -1.8,4 -4,4l-42,0c-2.2,0 -4,-1.8 -4,-4l0,-42c0,-2.2 1.8,-4 4,-4l42,0c2.2,0 4,1.8 4,4l0,42z" fill="#1E1E1E"/> - </g> - <text xml:space="preserve" text-anchor="middle" font-family="Sans" font-size="11px" id="svg_5" y="42.610549" x="25.949214" stroke="#cbcbcb" fill="#cbcbcb">Mute</text> - <ellipse ry="6.644531" rx="0.632813" id="svg_6" cy="15.716017" cx="25.316401" stroke-width="5" stroke="#cbcbcb" fill="#1E1E1E"/> - </g> -</svg> \ No newline at end of file diff --git a/scripts/system/mute.js b/scripts/system/mute.js index cd29e8faae..1a575efa01 100644 --- a/scripts/system/mute.js +++ b/scripts/system/mute.js @@ -16,13 +16,14 @@ var button = toolBar.addButton({ objectName: "mute", imageURL: Script.resolvePath("assets/images/tools/mic.svg"), visible: true, - alpha: 0.9, + buttonState: 1, + alpha: 0.9 }); function onMuteToggled() { // We could just toggle state, but we're less likely to get out of wack if we read the AudioDevice. - // muted => "on" button state => buttonState 1 - button.writeProperty('buttonState', AudioDevice.getMuted() ? 1 : 0); + // muted => button "on" state => 1. go figure. + button.writeProperty('buttonState', AudioDevice.getMuted() ? 0 : 1); } onMuteToggled(); function onClicked(){ From 43c7fd1e27093ca5577c542919b439d14d6373cf Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Fri, 1 Jul 2016 10:34:13 -0700 Subject: [PATCH 15/28] New art. --- interface/resources/icons/hud.svg | 309 ++++--------- .../system/assets/images/tools/directory.svg | 427 +++++++----------- scripts/system/assets/images/tools/edit.svg | 243 +++------- scripts/system/assets/images/tools/market.svg | 249 +++------- scripts/system/assets/images/tools/mic.svg | 221 ++++----- scripts/system/assets/images/tools/switch.svg | 295 +++++------- 6 files changed, 583 insertions(+), 1161 deletions(-) diff --git a/interface/resources/icons/hud.svg b/interface/resources/icons/hud.svg index 9e77aa6040..acfd21b909 100644 --- a/interface/resources/icons/hud.svg +++ b/interface/resources/icons/hud.svg @@ -3,140 +3,29 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#F9F9F9;} - .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} - .st9{opacity:0.75;mask:url(#SVGID_3_);} - .st10{fill:#333333;} - .st11{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#FFFFFF;} + .st2{fill:#1E1E1E;} + .st3{fill:#333333;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> </g> </g> <g> - <g> - <g> - <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> - <g class="st8"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ -xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA -AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy -E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis -ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB -BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U -AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED -AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k -PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr -vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> - </image> - </g> - </mask> - <g class="st9"> - <g> - <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - </g> - <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st2" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> @@ -144,115 +33,113 @@ vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform= <g id="Layer_1"> <g> <g> - <path class="st10" d="M24.5,10.6c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.7,12.6,28.8,10.6,24.5,10.6z"/> - <path class="st10" d="M34.8,17.4c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 - c-3.4,0-6.6,1.4-9.1,3.9l0,0C15.3,16.9,15.1,17,15,17c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 - l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 - C35.2,17.3,35,17.4,34.8,17.4z M34,16.6c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 - c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 - C28,12.4,31.4,13.8,34,16.6L34,16.6z M35.3,15.9C35.3,15.9,35.3,15.9,35.3,15.9L35.3,15.9z M35.3,15.9 - C35.3,15.9,35.3,15.9,35.3,15.9L35.3,15.9z"/> + <path class="st3" d="M25.4,10.2c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.6,12.1,29.7,10.2,25.4,10.2z"/> + <path class="st3" d="M35.7,17c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 + l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 + c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C36.2,16.9,35.9,17,35.7,17z + M35,16.1c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7 + c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C29,11.9,32.4,13.4,35,16.1L35,16.1z M36.3,15.4 + C36.3,15.4,36.3,15.4,36.3,15.4L36.3,15.4z M36.3,15.4L36.3,15.4L36.3,15.4z"/> </g> - <path class="st10" d="M26.7,17.1l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9C22.2,17.3,22,17.6,22,18l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.2,17.7,27,17.3,26.7,17.1z"/> - <path class="st10" d="M30.6,26.2l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.9,27.1,30.9,26.6,30.6,26.2z" + <path class="st3" d="M27.6,16.7l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C28.2,17.2,28,16.9,27.6,16.7z"/> + <path class="st3" d="M31.5,25.7l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C31.8,26.6,31.8,26.1,31.5,25.7z" /> </g> <g> - <path class="st10" d="M18.5,36.7V43h-1.2v-2.7h-2.9V43h-1.2v-6.4h1.2v2.6h2.9v-2.6H18.5z"/> - <path class="st10" d="M24.8,42.1c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8 - v-3.4h1.3V40c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3 - c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3V40 - c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24.2,42.1,24.5,42.1,24.8,42.1z"/> - <path class="st10" d="M31,43v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6C34.2,43,33.8,43,33.3,43H31z M35.2,39.8 - c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1V42h1.1 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.2,40.4,35.2,40.1,35.2,39.8z"/> + <path class="st3" d="M19.5,36.2v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H19.5z"/> + <path class="st3" d="M25.7,41.7c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.4h1.3 + v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 + c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4c0,0.3,0,0.5,0.1,0.8 + c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S25.4,41.7,25.7,41.7z"/> + <path class="st3" d="M32,42.6v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H32z M36.2,39.4 + c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C36.1,40,36.2,39.7,36.2,39.4z"/> </g> <g> <g> - <path class="st11" d="M24.5,60.6c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.7,62.6,28.8,60.6,24.5,60.6z"/> - <path class="st11" d="M34.8,67.4c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 - c-3.4,0-6.6,1.4-9.1,3.9l0,0C15.3,66.9,15.1,67,15,67c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 - l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 - C35.2,67.3,35,67.4,34.8,67.4z M34,66.6c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 - c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 - C28,62.4,31.4,63.8,34,66.6L34,66.6z M35.3,65.9C35.3,65.9,35.3,65.9,35.3,65.9L35.3,65.9z M35.3,65.9 - C35.3,65.9,35.3,65.9,35.3,65.9L35.3,65.9z"/> + <path class="st1" d="M25.4,60.2c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.6,62.1,29.7,60.2,25.4,60.2z"/> + <path class="st1" d="M35.7,67c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 + l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 + c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C36.2,66.9,35.9,67,35.7,67z + M35,66.1c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7 + c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C29,61.9,32.4,63.4,35,66.1L35,66.1z M36.3,65.4 + C36.3,65.4,36.3,65.4,36.3,65.4L36.3,65.4z M36.3,65.4L36.3,65.4L36.3,65.4z"/> </g> - <path class="st11" d="M26.7,67.1l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9C22.2,67.3,22,67.6,22,68l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27.2,67.7,27,67.3,26.7,67.1z"/> - <path class="st11" d="M30.6,76.2l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.9,77.1,30.9,76.6,30.6,76.2z" + <path class="st1" d="M27.6,66.7l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C28.2,67.2,28,66.9,27.6,66.7z"/> + <path class="st1" d="M31.5,75.7l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C31.8,76.6,31.8,76.1,31.5,75.7z" /> </g> <g> - <path class="st11" d="M18.5,86.7V93h-1.2v-2.7h-2.9V93h-1.2v-6.4h1.2v2.6h2.9v-2.6H18.5z"/> - <path class="st11" d="M24.8,92.1c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.4 - h1.3V90c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 - c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3V90c0,0.3,0,0.5,0.1,0.8 - c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S24.5,92.1,24.8,92.1z"/> - <path class="st11" d="M31,93v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6C34.2,93,33.8,93,33.3,93H31z M35.2,89.8 - c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1V92h1.1 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35.2,90.4,35.2,90.1,35.2,89.8z"/> + <path class="st1" d="M19.5,86.2v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H19.5z"/> + <path class="st1" d="M25.7,91.7c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.4h1.3 + v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 + c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4c0,0.3,0,0.5,0.1,0.8 + c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5S25.4,91.7,25.7,91.7z"/> + <path class="st1" d="M32,92.6v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H32z M36.2,89.4 + c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C36.1,90,36.2,89.7,36.2,89.4z"/> </g> <g> - <path class="st11" d="M24.3,108.7c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.5,110.7,28.6,108.7,24.3,108.7z"/> - <path class="st11" d="M34.6,115.5c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 - c-3.4,0-6.6,1.4-9.1,3.9l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 - l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 - C35,115.4,34.8,115.5,34.6,115.5z M33.9,114.7c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 - c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 - C27.9,110.5,31.2,111.9,33.9,114.7L33.9,114.7z M35.1,113.9C35.1,113.9,35.1,113.9,35.1,113.9L35.1,113.9z M35.1,113.9 - C35.1,113.9,35.1,113.9,35.1,113.9L35.1,113.9z"/> + <path class="st1" d="M25.3,108.3c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.5,110.2,29.6,108.3,25.3,108.3z"/> + <path class="st1" d="M35.6,115c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 + l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 + c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C36,115,35.8,115,35.6,115z + M34.8,114.2c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5 + c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C28.8,110,32.2,111.5,34.8,114.2 + L34.8,114.2z M36.1,113.5C36.1,113.5,36.1,113.5,36.1,113.5L36.1,113.5z M36.1,113.5C36.1,113.5,36.1,113.5,36.1,113.5L36.1,113.5 + z"/> </g> - <path class="st11" d="M26.5,117.2l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27,117.7,26.8,117.4,26.5,117.2z"/> - <path class="st11" d="M30.4,126.3l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.7,127.2,30.7,126.6,30.4,126.3 + <path class="st1" d="M27.5,116.7l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C28,117.3,27.8,116.9,27.5,116.7z"/> + <path class="st1" d="M31.4,125.8l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C31.7,126.7,31.7,126.2,31.4,125.8 z"/> <g> - <path class="st11" d="M18.4,136.7v6.4h-1.2v-2.7h-2.9v2.7H13v-6.4h1.2v2.6h2.9v-2.6H18.4z"/> - <path class="st11" d="M24.6,142.2c0.3,0,0.6-0.1,0.8-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8v-3.4 + <path class="st1" d="M19.3,136.3v6.4h-1.2v-2.7h-2.9v2.7H14v-6.4h1.2v2.6h2.9v-2.6H19.3z"/> + <path class="st1" d="M25.6,141.7c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8 + v-3.4h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3 + c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4 + c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C25,141.7,25.3,141.7,25.6,141.7z"/> + <path class="st1" d="M31.8,142.7v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 + c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H31.8z + M36,139.5c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H33v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C36,140,36,139.8,36,139.5z"/> + </g> + <g> + <path class="st1" d="M25.3,158.3c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 + c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C33.5,160.3,29.6,158.3,25.3,158.3z"/> + <path class="st1" d="M35.6,165.1c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4c-3.4,0-6.6,1.4-9.1,3.9 + l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2l0,0 + c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8C36,165,35.8,165.1,35.6,165.1z + M34.8,164.2c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6c-2.9-3.2-6.7-5-10.8-5 + c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4C28.8,160,32.2,161.5,34.8,164.2 + L34.8,164.2z M36.1,163.5C36.1,163.5,36.1,163.5,36.1,163.5L36.1,163.5z M36.1,163.5C36.1,163.5,36.1,163.5,36.1,163.5L36.1,163.5 + z"/> + </g> + <path class="st1" d="M27.5,166.8l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 + l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C28,167.3,27.8,167,27.5,166.8z"/> + <path class="st1" d="M31.4,175.9l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 + c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C31.7,176.8,31.7,176.2,31.4,175.9 + z"/> + <g> + <path class="st1" d="M19.3,186.3v6.4h-1.2V190h-2.9v2.7H14v-6.4h1.2v2.6h2.9v-2.6H19.3z"/> + <path class="st1" d="M25.6,191.8c0.3,0,0.6-0.1,0.8-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7c0.1-0.3,0.1-0.5,0.1-0.8v-3.4 h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3 - c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4H23v3.4c0,0.3,0,0.5,0.1,0.8 - c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24,142.1,24.3,142.2,24.6,142.2z"/> - <path class="st11" d="M30.8,143.1v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 - c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H30.8z - M35.1,139.9c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35,140.5,35.1,140.2,35.1,139.9z"/> - </g> - <g> - <path class="st11" d="M24.3,158.8c-4.2,0-8,1.8-10.8,4.8c0,0-0.5,0.7,0.2,1.2c0.7,0.6,1.4-0.1,1.4-0.1c2.4-2.4,5.7-3.9,9.2-3.9 - c3.6,0,6.9,1.5,9.3,4.1c0,0,0.7,0.8,1.5,0.3c0.7-0.4,0.2-1.2,0.2-1.3C32.5,160.7,28.6,158.8,24.3,158.8z"/> - <path class="st11" d="M34.6,165.5c-0.2,0-0.4,0-0.5-0.1c-0.2-0.1-0.5-0.3-0.6-0.4l0,0c-2.5-2.6-5.7-4-9.2-4 - c-3.4,0-6.6,1.4-9.1,3.9l0,0c-0.1,0.1-0.3,0.2-0.4,0.3c-0.5,0.2-0.9,0.2-1.3-0.2c-0.6-0.5-0.4-1.1-0.3-1.4c0-0.1,0.1-0.1,0.1-0.2 - l0,0c2.9-3.1,6.8-4.9,10.9-4.9c4.2,0,8.2,1.8,11.2,5.1c0.1,0.1,0.3,0.5,0.2,0.9c0,0.3-0.2,0.6-0.5,0.8 - C35,165.5,34.8,165.5,34.6,165.5z M33.9,164.7c0.1,0.1,0.6,0.6,1.1,0.2c0.1-0.1,0.2-0.2,0.2-0.3c0-0.3-0.1-0.5-0.1-0.6 - c-2.9-3.2-6.7-5-10.8-5c-4,0-7.7,1.7-10.6,4.7c-0.1,0.1-0.3,0.5,0.1,0.9c0.5,0.4,1,0,1.1-0.1c2.6-2.6,5.9-4,9.4-4 - C27.9,160.5,31.2,162,33.9,164.7L33.9,164.7z M35.1,164C35.1,164,35.1,164,35.1,164L35.1,164z M35.1,164 - C35.1,164,35.1,164,35.1,164L35.1,164z"/> - </g> - <path class="st11" d="M26.5,167.3l-1.5-0.9c-0.3-0.2-0.7-0.2-1,0l-1.5,0.9c-0.3,0.2-0.5,0.5-0.5,0.9l0,1.8c0,0.4,0.2,0.7,0.5,0.9 - l1.5,0.9c0.2,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4,0,0.5-0.1l1.5-0.9c0.3-0.2,0.5-0.5,0.5-0.9l0-1.8C27,167.8,26.8,167.4,26.5,167.3z"/> - <path class="st11" d="M30.4,176.3l-1.2-1.5c-0.2-0.3-0.5-0.4-0.8-0.4l-7.9,0h0c-0.3,0-0.6,0.1-0.8,0.4l-1.2,1.5 - c-0.3,0.4-0.3,0.9,0,1.3l1.2,1.5c0.2,0.3,0.5,0.4,0.8,0.4l7.9,0h0c0.3,0,0.6-0.1,0.8-0.4l1.2-1.5C30.7,177.2,30.7,176.7,30.4,176.3 - z"/> - <g> - <path class="st11" d="M18.4,186.8v6.4h-1.2v-2.7h-2.9v2.7H13v-6.4h1.2v2.6h2.9v-2.6H18.4z"/> - <path class="st11" d="M24.6,192.2c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7 - c0.1-0.3,0.1-0.5,0.1-0.8v-3.4h1.3v3.4c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7 - c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-1-0.1-1.4-0.3c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4 - H23v3.4c0,0.3,0,0.5,0.1,0.8c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C24,192.2,24.3,192.2,24.6,192.2z"/> - <path class="st11" d="M30.8,193.2v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 - c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H30.8z - M35.1,190c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1 - c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C35,190.5,35.1,190.3,35.1,190z"/> + c-0.4-0.2-0.7-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.2-0.8-0.2-1.2v-3.4h1.3v3.4c0,0.3,0,0.5,0.1,0.8 + c0.1,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.4,0.5,0.5C25,191.7,25.3,191.8,25.6,191.8z"/> + <path class="st1" d="M31.8,192.7v-6.4h2.3c0.5,0,1,0.1,1.4,0.3c0.4,0.2,0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1 + c0.1,0.4,0.2,0.8,0.2,1.2c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H31.8z + M36,189.5c0-0.3,0-0.6-0.1-0.8c-0.1-0.3-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H33v4.2h1.1 + c0.3,0,0.6-0.1,0.8-0.2c0.2-0.1,0.4-0.3,0.6-0.4c0.2-0.2,0.3-0.4,0.4-0.7C36,190.1,36,189.8,36,189.5z"/> </g> </g> </svg> diff --git a/scripts/system/assets/images/tools/directory.svg b/scripts/system/assets/images/tools/directory.svg index 912243c52e..09f3c14bf0 100644 --- a/scripts/system/assets/images/tools/directory.svg +++ b/scripts/system/assets/images/tools/directory.svg @@ -3,364 +3,253 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#F9F9F9;} - .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} - .st9{opacity:0.75;mask:url(#SVGID_3_);} - .st10{fill:#333333;} - .st11{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#FFFFFF;} + .st2{fill:#1E1E1E;} + .st3{fill:#333333;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> </g> </g> <g> - <g> - <g> - <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> - <g class="st8"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ -xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA -AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy -E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis -ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB -BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U -AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED -AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k -PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr -vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> - </image> - </g> - </mask> - <g class="st9"> - <g> - <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - </g> - <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st2" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> </g> <g id="Layer_1"> <g> - <path class="st10" d="M15.5,42.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + <path class="st3" d="M15.9,41.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2c0-0.4,0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 - c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.4,39c-0.2-0.3-0.4-0.6-0.6-0.7S14.2,38,13.9,38c-0.3,0-0.5,0.1-0.7,0.2 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.8,38c-0.2-0.3-0.4-0.6-0.6-0.7S14.6,37,14.3,37c-0.3,0-0.5,0.1-0.7,0.2 s-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 - c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V41h-1.3v-0.9h2.3v3.1h-1v-0.7H15.5z"/> - <path class="st10" d="M20.5,43.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V40h-1.3v-0.9H17v3.1h-1v-0.7H15.9z"/> + <path class="st3" d="M20.9,42.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C21.3,43.2,20.9,43.3,20.5,43.3z M18.7,40.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + C21.7,42.2,21.3,42.3,20.9,42.3z M19.1,39.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 - C18.7,39.5,18.7,39.8,18.7,40.1z"/> - <path class="st10" d="M31.6,37.9h-2v5.3h-1.2v-5.3h-2v-1.1h5.2V37.9z"/> - <path class="st10" d="M35.1,43.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + C19.1,38.5,19.1,38.8,19.1,39.1z"/> + <path class="st3" d="M32,36.9h-2v5.3h-1.2v-5.3h-2v-1.1H32V36.9z"/> + <path class="st3" d="M35.5,42.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C35.9,43.2,35.5,43.3,35.1,43.3z M33.3,40.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + C36.3,42.2,35.9,42.3,35.5,42.3z M33.7,39.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 - c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.3,39.5,33.3,39.8,33.3,40.1z"/> + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.7,38.5,33.7,38.8,33.7,39.1z"/> </g> <g> <g> - <path class="st10" d="M16.8,29.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 - c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V18c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L29.6,19v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 - v0.1v0.1l-0.1,0.1h-0.1L25,19.5h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + <path class="st3" d="M17.2,28.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V17c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L30,18v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 + v0.1l-0.1,0.1H29l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 - c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.6,24.6,14.7,27.4,16.8,29.5z M29.8,24.7c0-0.2,0-0.4,0-0.6l0,0 - c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C14,23.6,15.1,26.4,17.2,28.5z M30.2,23.7c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5H33 c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 - c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1H30l0,0h-0.1 - C29.8,24.9,29.8,24.9,29.8,24.7L29.8,24.7z M29.9,25.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 + C30.2,23.9,30.2,23.9,30.2,23.7L30.2,23.7z M30.3,24.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0 - c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.5,26.1,29.6,25.9,29.9,25.9z M24.8,20.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 - c0,0,0,0,0.1,0l0,0H29h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 + c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.9,25.1,30,24.9,30.3,24.9z M25.2,19.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 + c0,0,0,0,0.1,0l0,0h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 - c-0.4,0-0.5,0.1-0.6,0.1H25l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.8,20.4L24.8,20.4z M24.8,26.5c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2 - c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 - c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6H25l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.8,26.5 - L24.8,26.5z M21.3,30.4l-0.1,0.1l0,0L21,30.4l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 - c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.4,30.3,21.4,30.3,21.3,30.4z M24,31 - c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1 - l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24,31L24,31z M22.6,20.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1l0,0 - c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1 - c0,0,0.1-0.1,0.1,0H22.6z M16.2,18L16.2,18c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 + c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L25.2,19.4L25.2,19.4z M25.2,25.5c0-0.1,0.1-0.2,0.2-0.2h0.2 + l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4 + l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1 + L25.2,25.5L25.2,25.5z M21.7,29.4l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0 + l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.8,29.3,21.8,29.3,21.7,29.4z + M24.4,30c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1L21,25 + h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24.4,30L24.4,30z M23,19.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1 + l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5 + s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H23z M16.6,17L16.6,17c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1 - C16.2,18.2,16.1,18.1,16.2,18z M15.6,19.2L15.6,19.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 - c0,0.1,0,0.1-0.1,0.1h-0.1l0,0H19h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 - C15.2,21.5,15.3,20.3,15.6,19.2z"/> + C16.6,17.2,16.5,17.1,16.6,17z M16,18.2L16,18.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 + c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 + C15.6,20.5,15.7,19.3,16,18.2z"/> </g> - <path class="st10" d="M27.3,16.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7C29.2,12,28.2,14.2,27.3,16.4C27.4,16.3,27.4,16.4,27.3,16.4z M29.1,8.7c0-1-0.8-1.8-1.8-1.8 - s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.1,9.7,29.1,8.7z"/> + <path class="st3" d="M27.7,15.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.6,11,28.6,13.2,27.7,15.4C27.8,15.3,27.8,15.4,27.7,15.4z M29.5,7.7c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.5,8.7,29.5,7.7z"/> </g> <g> - <path class="st11" d="M15.5,92.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + <path class="st1" d="M15.9,91.5c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2c0-0.4,0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 - c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.4,89c-0.2-0.3-0.4-0.6-0.6-0.7S14.2,88,13.9,88c-0.3,0-0.5,0.1-0.7,0.2 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1L15.8,88c-0.2-0.3-0.4-0.6-0.6-0.7S14.6,87,14.3,87c-0.3,0-0.5,0.1-0.7,0.2 s-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5 - c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V91h-1.3v-0.9h2.3v3.1h-1v-0.7H15.5z"/> - <path class="st11" d="M20.5,93.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9V90h-1.3v-0.9H17v3.1h-1v-0.7H15.9z"/> + <path class="st1" d="M20.9,92.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C21.3,93.2,20.9,93.3,20.5,93.3z M18.7,90.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + C21.7,92.2,21.3,92.3,20.9,92.3z M19.1,89.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 - C18.7,89.5,18.7,89.8,18.7,90.1z"/> - <path class="st11" d="M31.6,87.9h-2v5.3h-1.2v-5.3h-2v-1.1h5.2V87.9z"/> - <path class="st11" d="M35.1,93.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 + C19.1,88.5,19.1,88.8,19.1,89.1z"/> + <path class="st1" d="M32,86.9h-2v5.3h-1.2v-5.3h-2v-1.1H32V86.9z"/> + <path class="st1" d="M35.5,92.3c-0.5,0-0.9-0.1-1.2-0.3s-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1s-0.2-0.8-0.2-1.2 c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3s0.7,0.4,1,0.7 c0.3,0.3,0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - C35.9,93.2,35.5,93.3,35.1,93.3z M33.3,90.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 + C36.3,92.2,35.9,92.3,35.5,92.3z M33.7,89.1c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5s0.5,0.2,0.8,0.2 s0.5-0.1,0.8-0.2s0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7s0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 - c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.3,89.5,33.3,89.8,33.3,90.1z"/> + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7C33.7,88.5,33.7,88.8,33.7,89.1z"/> </g> <g> <g> - <path class="st11" d="M16.8,79.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 - c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V68c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L29.6,69v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 - v0.1v0.1l-0.1,0.1h-0.1L25,69.5h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + <path class="st1" d="M17.2,78.5c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3V67c0,0.1,0,0.2-0.1,0.2l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1L30,68v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 + v0.1l-0.1,0.1H29l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 - c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.6,74.6,14.7,77.4,16.8,79.5z M29.8,74.7c0-0.2,0-0.4,0-0.6l0,0 - c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C14,73.6,15.1,76.4,17.2,78.5z M30.2,73.7c0-0.2,0-0.4,0-0.6l0,0 + c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5H33 c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 - c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1H30l0,0h-0.1 - C29.8,74.9,29.8,74.9,29.8,74.7L29.8,74.7z M29.9,75.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 + c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 + C30.2,73.9,30.2,73.9,30.2,73.7L30.2,73.7z M30.3,74.9c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2 v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0 - c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.5,76.1,29.6,75.9,29.9,75.9z M24.8,70.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 - c0,0,0,0,0.1,0l0,0H29h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 + c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.9,75.1,30,74.9,30.3,74.9z M25.2,69.4c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1 + c0,0,0,0,0.1,0l0,0h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 c0,0.1,0,0.2,0,0.3c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 - c-0.4,0-0.5,0.1-0.6,0.1H25l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.8,70.4L24.8,70.4z M24.8,76.5c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2 - c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 - c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6H25l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.8,76.5 - L24.8,76.5z M21.3,80.4l-0.1,0.1l0,0L21,80.4l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 - c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.4,80.3,21.4,80.3,21.3,80.4z M24,81 - c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1 - l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24,81L24,81z M22.6,70.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1l0,0 - c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1 - c0,0,0.1-0.1,0.1,0H22.6z M16.2,68L16.2,68c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 + c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L25.2,69.4L25.2,69.4z M25.2,75.5c0-0.1,0.1-0.2,0.2-0.2h0.2 + l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4 + l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1 + L25.2,75.5L25.2,75.5z M21.7,79.4l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0 + l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.8,79.3,21.8,79.3,21.7,79.4z + M24.4,80c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1L21,75 + h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L24.4,80L24.4,80z M23,69.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1h-0.1 + l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5 + s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H23z M16.6,67L16.6,67c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1 - C16.2,68.2,16.1,68.1,16.2,68z M15.6,69.2L15.6,69.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 - c0,0.1,0,0.1-0.1,0.1h-0.1l0,0H19h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 - C15.2,71.5,15.3,70.3,15.6,69.2z"/> + C16.6,67.2,16.5,67.1,16.6,67z M16,68.2L16,68.2c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 + c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 + C15.6,70.5,15.7,69.3,16,68.2z"/> </g> - <path class="st11" d="M27.3,66.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7C29.2,62,28.2,64.2,27.3,66.4C27.4,66.3,27.4,66.4,27.3,66.4z M29.1,58.7c0-1-0.8-1.8-1.8-1.8 - s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.1,59.7,29.1,58.7z"/> + <path class="st1" d="M27.7,65.4c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.6,61,28.6,63.2,27.7,65.4C27.8,65.3,27.8,65.4,27.7,65.4z M29.5,57.7c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.5,58.7,29.5,57.7z"/> </g> <g> - <path class="st11" d="M15.3,142.6c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + <path class="st1" d="M15.7,141.6c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7c-0.2-0.1-0.6-0.3-0.9-0.3 c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8 - c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.3z" + c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.7z" /> - <path class="st11" d="M20.3,143.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 - c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 - c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - S20.7,143.4,20.3,143.4z M18.5,140.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 - s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + <path class="st1" d="M20.7,142.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1c-0.1-0.4-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3c0.3,0.2,0.7,0.4,1,0.7 + s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S21.1,142.4,20.7,142.4z + M18.9,139.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2 + c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 - C18.5,139.6,18.5,139.9,18.5,140.2z"/> - <path class="st11" d="M31.4,138h-2v5.3h-1.2V138h-2v-1.1h5.2V138z"/> - <path class="st11" d="M34.9,143.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 - c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 - c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - S35.3,143.4,34.9,143.4z M33.1,140.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 - s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 - s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 - C33.1,139.6,33.1,139.9,33.1,140.2z"/> + C18.9,138.6,18.9,138.9,18.9,139.2z"/> + <path class="st1" d="M31.8,137h-2v5.3h-1.2V137h-2v-1.1h5.2V137z"/> + <path class="st1" d="M35.3,142.4c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1c-0.1-0.4-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3c0.3,0.2,0.7,0.4,1,0.7 + s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S35.7,142.4,35.3,142.4z + M33.5,139.2c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2 + c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 + C33.5,138.6,33.5,138.9,33.5,139.2z"/> </g> <g> - <path class="st11" d="M16.6,129.6c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + <path class="st1" d="M17,128.6c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1c2-2,3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3v0.1c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1l-0.1-0.1V119c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 - v0.1l-0.1,0.1h-0.1l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 - l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2V119c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 - c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.4,124.7,14.5,127.5,16.6,129.6z M29.6,124.8c0-0.2,0-0.4,0-0.6l0,0 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1H30h-0.1l-0.1-0.1V118c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 + v0.1l-0.1,0.1h-0.1l-3.6,0.2H25h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2V118c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.8,123.7,14.9,126.5,17,128.6z M30,123.8c0-0.2,0-0.4,0-0.6l0,0 c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 - C29.6,125,29.6,125,29.6,124.8L29.6,124.8z M29.7,126c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2v0.1 + C30,124,30,124,30,123.8L30,123.8z M30.1,125c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2v0.1 c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0c0,0,0-0.1,0.1-0.2 - c0.4-0.6,1-1.6,1.5-3.7C29.3,126.2,29.4,126,29.7,126z M24.6,120.5c0-0.1,0.1-0.2,0.2-0.2H25l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0 + c0.4-0.6,1-1.6,1.5-3.7C29.7,125.2,29.8,125,30.1,125z M25,119.5c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0l0,0 h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2s0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3 c0,0.1,0,0.2,0,0.3c0,0.1,0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1 - c-0.1,0-0.1-0.1-0.1-0.2L24.6,120.5L24.6,120.5z M24.6,126.6c0-0.1,0.1-0.2,0.2-0.2H25l3.4-0.2c0,0,0.1,0,0.1,0.1 - c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2 - c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.6,126.6 - L24.6,126.6z M21.1,130.5l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 - c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.2,130.4,21.2,130.4,21.1,130.5z - M23.8,131.1c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1 - l0.1-0.1h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L23.8,131.1L23.8,131.1z M22.4,120.3l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5 - c0,0,0,0.1-0.1,0.1h-0.1l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1 - c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H22.4z M16,118.1L16,118.1c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1 - s0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3 - c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1C16,118.3,15.9,118.2,16,118.1z M15.4,119.3L15.4,119.3c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8 - c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1 - c-0.4-0.3-0.6-0.6-0.6-1C15,121.6,15.1,120.4,15.4,119.3z"/> + c-0.1,0-0.1-0.1-0.1-0.2L25,119.5L25,119.5z M25,125.6c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1 + v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3c-0.1,0.1-0.1,0.3-0.2,0.4l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8 + c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L25,125.6L25,125.6z M21.5,129.5l-0.1,0.1 + l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7 + c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.6,129.4,21.6,129.4,21.5,129.5z M24.2,130.1c0,0.1-0.1,0.1-0.1,0.1 + H24c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1l1.9,0.2l1.2,0.1 + c0.1,0,0.2,0.1,0.2,0.2L24.2,130.1L24.2,130.1z M22.8,119.3l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1H24l0,0 + c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5s0-0.1,0.1-0.1 + c0,0,0.1-0.1,0.1,0H22.8z M16.4,117.1L16.4,117.1c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1s0,0.1,0,0.2l-0.1,0.2 + c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1 + C16.4,117.3,16.3,117.2,16.4,117.1z M15.8,118.3L15.8,118.3c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7 + c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1 + C15.4,120.6,15.5,119.4,15.8,118.3z"/> </g> - <path class="st11" d="M27.1,115.5c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7C29,111.1,28,113.3,27.1,115.5C27.2,115.4,27.2,115.5,27.1,115.5z M28.9,107.8c0-1-0.8-1.8-1.8-1.8 - s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S28.9,108.8,28.9,107.8z"/> + <path class="st1" d="M27.5,114.5c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.4,110.1,28.4,112.3,27.5,114.5C27.6,114.4,27.6,114.5,27.5,114.5z M29.3,106.8c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.3,107.8,29.3,106.8z"/> <g> - <path class="st11" d="M15.3,192.7c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 + <path class="st1" d="M15.7,191.7c-0.5,0.5-1.1,0.8-1.7,0.8c-0.4,0-0.8-0.1-1.2-0.3c-0.4-0.2-0.7-0.4-0.9-0.7 c-0.3-0.3-0.5-0.7-0.6-1s-0.2-0.8-0.2-1.2s0.1-0.9,0.2-1.2c0.2-0.4,0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3 c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-0.9,0.7c-0.2-0.3-0.4-0.6-0.6-0.7c-0.2-0.1-0.6-0.3-0.9-0.3 c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.5c-0.2,0.2-0.3,0.4-0.4,0.7c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.6,0.1,0.8 - c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.3z" + c0.1,0.3,0.2,0.5,0.4,0.7s0.4,0.3,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.6,0,1.1-0.3,1.6-0.9v-0.5h-1.3v-0.9h2.3v3.1h-1v-0.7H15.7z" /> - <path class="st11" d="M20.3,193.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 - c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 - c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - S20.7,193.5,20.3,193.5z M18.5,190.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 - s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 + <path class="st1" d="M20.7,192.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1c-0.1-0.4-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3c0.3,0.2,0.7,0.4,1,0.7 + s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S21.1,192.5,20.7,192.5z + M18.9,189.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7c0.2,0.2,0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2 + c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 c-0.2-0.2-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5s-0.3,0.4-0.3,0.7 - C18.5,189.7,18.5,190,18.5,190.3z"/> - <path class="st11" d="M31.4,188.1h-2v5.3h-1.2v-5.3h-2V187h5.2V188.1z"/> - <path class="st11" d="M34.9,193.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1 - c-0.1-0.4-0.2-0.8-0.2-1.2c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3 - c0.3,0.2,0.7,0.4,1,0.7s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7 - S35.3,193.5,34.9,193.5z M33.1,190.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2 - s0.5-0.1,0.8-0.2c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7 - s-0.3-0.4-0.6-0.5c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 - C33.1,189.7,33.1,190,33.1,190.3z"/> + C18.9,188.7,18.9,189,18.9,189.3z"/> + <path class="st1" d="M31.8,187.1h-2v5.3h-1.2v-5.3h-2V186h5.2V187.1z"/> + <path class="st1" d="M35.3,192.5c-0.5,0-0.9-0.1-1.2-0.3c-0.3-0.2-0.7-0.4-1-0.7c-0.3-0.3-0.5-0.6-0.6-1c-0.1-0.4-0.2-0.8-0.2-1.2 + c0-0.4,0.1-0.8,0.2-1.2s0.4-0.7,0.6-1c0.3-0.3,0.6-0.5,1-0.7s0.8-0.3,1.2-0.3c0.5,0,0.9,0.1,1.2,0.3c0.3,0.2,0.7,0.4,1,0.7 + s0.5,0.7,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2s-0.1,0.8-0.2,1.2c-0.2,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.7S35.7,192.5,35.3,192.5z + M33.5,189.3c0,0.3,0,0.5,0.1,0.8s0.2,0.5,0.4,0.7s0.3,0.4,0.6,0.5c0.3,0.1,0.5,0.2,0.8,0.2s0.5-0.1,0.8-0.2 + c0.3-0.1,0.4-0.3,0.6-0.5c0.1-0.2,0.3-0.4,0.3-0.7c0-0.3,0.1-0.5,0.1-0.8s0-0.5-0.1-0.8s-0.2-0.5-0.4-0.7s-0.3-0.4-0.6-0.5 + c-0.2-0.1-0.5-0.2-0.7-0.2c-0.3,0-0.5,0.1-0.8,0.2c-0.3,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7 + C33.5,188.7,33.5,189,33.5,189.3z"/> </g> <g> - <path class="st11" d="M16.6,179.7c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 + <path class="st1" d="M17,178.7c2,2.1,4.8,3.2,7.8,3.2h0.1c2.9,0,5.7-1.1,7.7-3.1s3.1-4.7,3.2-7.5c0-3-1-5.8-3.1-7.9 c-0.6-0.6-1.3-1.2-2-1.6c-0.2,0.5-0.4,1-0.7,1.5c0.3,0.2,0.7,0.5,1,0.8c1,1,1.9,2.1,2.2,3v0.1c0,0.1,0,0.2-0.1,0.2l0,0 - c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1h-0.1h-0.1l-0.1-0.1v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1 - v0.1v0.1l-0.1,0.1h-0.1l-3.6,0.2h-0.2h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 + c-0.8,0.4-1.6,0.6-2.5,0.8c-0.2,0-0.3,0.1-0.5,0.1H30h-0.1l-0.1-0.1v-0.1c-0.2-1-0.4-2-0.8-3l-0.5,1c0.2,0.7,0.4,1.4,0.5,2.1v0.1 + v0.1l-0.1,0.1h-0.1l-3.6,0.2H25h-0.1v-0.1v-4.9c-0.3-0.6-0.5-1.1-0.7-1.7l0,0l0,0v6.4v0.1c0,0.1-0.1,0.2-0.2,0.2l0,0h-0.1 l-3.4-0.2c-0.1,0-0.1,0-0.1-0.1c0,0,0-0.1,0-0.2v-0.1c0.4-1.8,0.9-3.8,2.3-5.5c0.4-0.4,0.8-0.9,1.3-1h0.1c-0.2-0.5-0.4-1-0.6-1.5 - c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.4,174.8,14.5,177.6,16.6,179.7z M29.6,174.9c0-0.2,0-0.4,0-0.6l0,0 + c-2.5,0.3-4.7,1.3-6.5,3.1c-2,2-3.1,4.6-3.2,7.5C13.8,173.8,14.9,176.6,17,178.7z M30,173.9c0-0.2,0-0.4,0-0.6l0,0 c0-0.5,0.1-0.9,0.1-1.4c0-0.6,0-1.2,0-1.8c0-0.2,0-0.4,0-0.6l0,0c0-0.1,0-0.4,0.4-0.5c0.7-0.2,1.5-0.3,2.2-0.5h0.1 c0.3-0.1,0.5-0.1,0.8-0.2h0.1c0.1,0,0.2,0,0.2,0.1v0.1v0.1c0,0.2,0.1,0.3,0.1,0.5c0.2,0.9,0.3,1.8,0.2,2.7 c-0.1,0.8-0.5,1.4-1.1,1.6c-0.5,0.2-1.1,0.4-1.7,0.5c-0.2,0.1-0.4,0.1-0.7,0.2c-0.1,0-0.2,0-0.3,0.1h-0.1h-0.1l0,0h-0.1 - C29.6,175.1,29.6,175.1,29.6,174.9L29.6,174.9z M29.7,176.1c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1 - c0,0,0.1,0.1,0,0.2v0.1c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1 - l0,0c0,0,0-0.1,0.1-0.2c0.4-0.6,1-1.6,1.5-3.7C29.3,176.3,29.4,176.1,29.7,176.1z M24.6,170.6c0-0.1,0.1-0.2,0.2-0.2H25l2.7-0.1 - l0.9-0.1c0,0,0,0,0.1,0l0,0h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2 - c0,0.4,0,0.8-0.1,1.1c0,0.1,0,0.2,0,0.3s0,0.2,0,0.3s0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1 - c-0.4,0-0.5,0.1-0.6,0.1h-0.1l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L24.6,170.6L24.6,170.6z M24.6,176.7c0-0.1,0.1-0.2,0.2-0.2H25 - l3.4-0.2c0,0,0.1,0,0.1,0.1c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3s-0.1,0.3-0.2,0.4l-0.1,0.2 - c-0.2,0.6-0.5,1.2-0.7,1.8c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L24.6,176.7 - L24.6,176.7z M21.1,180.6l-0.1,0.1l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3 - c0.8,0.2,1.6,0.5,2.4,0.7c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.2,180.5,21.2,180.5,21.1,180.6z - M23.8,181.2c0,0.1-0.1,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1 - l0.1-0.1h0.1l1.9,0.2l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2L23.8,181.2L23.8,181.2z M22.4,170.4l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5 - c0,0,0,0.1-0.1,0.1h-0.1l0,0c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1 - c0-0.3,0-1.4,0-1.5c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H22.4z M16,168.2L16,168.2c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1 - c0.1,0,0.2,0,0.2,0.1c0,0.1,0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1 - c-0.4-0.1-0.7-0.2-1.1-0.3c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1C16,168.4,15.9,168.3,16,168.2z M15.4,169.4L15.4,169.4 - c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0 - c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1c-0.4-0.3-0.6-0.6-0.6-1C15,171.7,15.1,170.5,15.4,169.4z"/> + C30,174.1,30,174.1,30,173.9L30,173.9z M30.1,175.1c0.8-0.2,1.5-0.4,2.3-0.6l0.9-0.3c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0.1,0,0.2v0.1 + c-0.5,1.2-1.1,2.2-2,3.1c-0.8,0.9-1.9,1.5-3.1,2.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.1,0-0.1-0.1-0.1-0.2v-0.1l0,0c0,0,0-0.1,0.1-0.2 + c0.4-0.6,1-1.6,1.5-3.7C29.7,175.3,29.8,175.1,30.1,175.1z M25,169.6c0-0.1,0.1-0.2,0.2-0.2h0.2l2.7-0.1l0.9-0.1c0,0,0,0,0.1,0 + l0,0h0.1h0.1c0.1,0,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.4c0,0.1,0,0.3,0,0.4v0.3c0,0.5,0,1,0,1.4v0.2c0,0.4,0,0.8-0.1,1.1 + c0,0.1,0,0.2,0,0.3s0,0.2,0,0.3s0,0.4-0.4,0.5c-0.7,0.1-1.3,0.1-2,0.2h-0.2c-0.2,0-0.5,0-0.8,0.1c-0.4,0-0.5,0.1-0.6,0.1h-0.1 + l-0.2-0.1c-0.1,0-0.1-0.1-0.1-0.2L25,169.6L25,169.6z M25,175.7c0-0.1,0.1-0.2,0.2-0.2h0.2l3.4-0.2c0,0,0.1,0,0.1,0.1 + c0,0,0.1,0.1,0,0.1v0.1l0,0c0,0,0,0,0,0.1v0.1v0.1c0,0.1,0,0.2-0.1,0.3s-0.1,0.3-0.2,0.4l-0.1,0.2c-0.2,0.6-0.5,1.2-0.7,1.8 + c-0.2,0.5-0.6,0.9-0.9,1.3c-0.3,0.3-0.9,0.6-1.5,0.6h-0.2l0,0c0,0-0.1,0-0.1-0.1v-0.1L25,175.7L25,175.7z M21.5,179.6l-0.1,0.1 + l0,0l-0.2-0.1l0,0c-1.8-0.4-4.2-2.6-5.1-5.2v-0.1c0-0.1,0-0.1,0-0.2c0,0,0.1-0.1,0.2,0l0.9,0.3c0.8,0.2,1.6,0.5,2.4,0.7 + c0.2,0.1,0.4,0.1,0.4,0.4c0.3,1.6,0.8,2.8,1.5,3.8l0.1,0.1C21.6,179.5,21.6,179.5,21.5,179.6z M24.2,180.2c0,0.1-0.1,0.1-0.1,0.1 + H24c0,0,0,0-0.1,0c0,0-0.9-0.3-1.3-0.8c-1-1.3-1.5-2.7-1.9-4l0,0v-0.1c0-0.1,0-0.1,0-0.1l0.1-0.1h0.1l1.9,0.2l1.2,0.1 + c0.1,0,0.2,0.1,0.2,0.2L24.2,180.2L24.2,180.2z M22.8,169.4l1.2,0.1c0.1,0,0.2,0.1,0.2,0.2v5c0,0,0,0.1-0.1,0.1H24l0,0 + c0,0-0.9-0.1-1.4-0.1c-0.6,0-1.2-0.1-1.7-0.2c-0.2,0-0.4-0.3-0.4-0.4c-0.1-1.2-0.1-2.3-0.2-3.1c0-0.3,0-1.4,0-1.5 + c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1,0H22.8z M16.4,167.2L16.4,167.2c0.8-2.1,2.8-3.9,5-4.7l0.2-0.1c0.1,0,0.2,0,0.2,0.1 + c0,0.1,0,0.1,0,0.2l-0.1,0.2c-1.2,1.6-1.7,3.5-2,5.3v0.1c0,0,0,0.1-0.1,0.1h-0.1c0,0,0,0-0.1,0h-0.1c-0.4-0.1-0.7-0.2-1.1-0.3 + c-0.6-0.1-1.2-0.3-1.8-0.5h-0.1C16.4,167.4,16.3,167.3,16.4,167.2z M15.8,168.4L15.8,168.4c0-0.2,0.1-0.2,0.2-0.2l3.3,0.8 + c0.1,0,0.1,0.1,0.1,0.2l0.1,4.7c0,0.1,0,0.1-0.1,0.1h-0.1l0,0h-0.1h-0.1l0,0c-0.1,0-0.3-0.1-0.5-0.1c-1.1-0.3-1.9-0.6-2.6-1.1 + c-0.4-0.3-0.6-0.6-0.6-1C15.4,170.7,15.5,169.5,15.8,168.4z"/> </g> - <path class="st11" d="M27.1,165.6c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 - c0.1,0.6,0,1.2-0.3,1.7C29,161.2,28,163.4,27.1,165.6C27.2,165.5,27.2,165.6,27.1,165.6z M28.9,157.9c0-1-0.8-1.8-1.8-1.8 - s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S28.9,158.9,28.9,157.9z"/> + <path class="st1" d="M27.5,164.6c-0.5-1-0.9-2-1.4-3c-0.5-1.1-1.1-2.3-1.6-3.4c-0.9-2,0.2-4.3,2.4-4.7c1.8-0.3,3.7,1,3.8,2.9 + c0.1,0.6,0,1.2-0.3,1.7C29.4,160.2,28.4,162.4,27.5,164.6C27.6,164.5,27.6,164.6,27.5,164.6z M29.3,156.9c0-1-0.8-1.8-1.8-1.8 + s-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8S29.3,157.9,29.3,156.9z"/> </g> </svg> diff --git a/scripts/system/assets/images/tools/edit.svg b/scripts/system/assets/images/tools/edit.svg index 13389a2b14..f65e0cd84d 100644 --- a/scripts/system/assets/images/tools/edit.svg +++ b/scripts/system/assets/images/tools/edit.svg @@ -3,232 +3,121 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#F9F9F9;} - .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} - .st9{opacity:0.75;mask:url(#SVGID_3_);} - .st10{fill:#333333;} - .st11{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#FFFFFF;} + .st2{fill:#1E1E1E;} + .st3{fill:#333333;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> </g> </g> <g> - <g> - <g> - <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> - <g class="st8"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ -xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA -AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy -E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis -ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB -BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U -AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED -AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k -PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr -vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> - </image> - </g> - </mask> - <g class="st9"> - <g> - <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - </g> - <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st2" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> </g> <g id="Layer_1"> - <path class="st10" d="M21.1,22c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L19,19.8 + <path class="st3" d="M22.2,21.5c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L20,19.4 c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.1,22z"/> - <path class="st10" d="M27.7,11.1c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C30.2,13.6,29,12.4,27.7,11.1z"/> - <path class="st10" d="M29.2,20.4c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L22.2,21.5z"/> + <path class="st3" d="M28.8,10.6c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C31.3,13.2,30.1,11.9,28.8,10.6z"/> + <path class="st3" d="M30.2,19.9c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.1,22.2,32.7,19.4,29.2,20.4z M16.5,11.9c-0.4,0-0.7-0.3-0.7-0.7 - c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.2,11.6,16.9,11.9,16.5,11.9z M26.9,14.3c0.3,0.3,0.6,0.7,1,1 - c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.5,15.7,26.2,15,26.9,14.3z"/> + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C37.2,21.7,33.7,18.9,30.2,19.9z M17.5,11.5c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C18.3,11.1,17.9,11.5,17.5,11.5z M27.9,13.8c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C26.5,15.2,27.2,14.5,27.9,13.8z"/> <g> - <path class="st10" d="M17.7,41.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H17.7z"/> - <path class="st10" d="M18.9,42.9v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.9z M23.2,39.7 + <path class="st3" d="M18.8,41.3v1.1h-4.4V36h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H18.8z"/> + <path class="st3" d="M20,42.4V36h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H20z M24.2,39.2 c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.1,40.3,23.2,40,23.2,39.7z"/> - <path class="st10" d="M25.6,42.9v-6.4h1.2v6.4H25.6z"/> - <path class="st10" d="M33.2,37.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.6z"/> + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C24.2,39.8,24.2,39.5,24.2,39.2z"/> + <path class="st3" d="M26.7,42.4v-6.4h1.2v6.4H26.7z"/> + <path class="st3" d="M34.3,37.1h-2v5.3H31v-5.3h-2V36h5.3V37.1z"/> </g> - <path class="st11" d="M21.1,72c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L19,69.8 + <path class="st1" d="M22.2,71.5c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2L20,69.4 c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21.1,72z"/> - <path class="st11" d="M27.7,61.1c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C30.2,63.6,29,62.4,27.7,61.1z"/> - <path class="st11" d="M29.2,70.4c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L22.2,71.5z"/> + <path class="st1" d="M28.8,60.6c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C31.3,63.2,30.1,61.9,28.8,60.6z"/> + <path class="st1" d="M30.3,69.9c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.2,72.2,32.7,69.4,29.2,70.4z M16.5,61.9c-0.4,0-0.7-0.3-0.7-0.7 - c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.3,61.6,16.9,61.9,16.5,61.9z M26.9,64.3c0.3,0.3,0.6,0.7,1,1 - c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.5,65.7,26.2,65,26.9,64.3z"/> + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C37.2,71.7,33.8,68.9,30.3,69.9z M17.6,61.5c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C18.3,61.1,18,61.5,17.6,61.5z M28,63.8c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C26.6,65.2,27.3,64.5,28,63.8z"/> <g> - <path class="st11" d="M17.7,91.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H17.7z"/> - <path class="st11" d="M18.9,92.9v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.9z M23.2,89.7 + <path class="st1" d="M18.8,91.3v1.1h-4.4V86h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H18.8z"/> + <path class="st1" d="M20,92.4V86h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H20z M24.2,89.2 c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23.1,90.3,23.2,90,23.2,89.7z"/> - <path class="st11" d="M25.6,92.9v-6.4h1.2v6.4H25.6z"/> - <path class="st11" d="M33.2,87.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.6z"/> + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C24.2,89.8,24.2,89.5,24.2,89.2z"/> + <path class="st1" d="M26.7,92.4v-6.4h1.2v6.4H26.7z"/> + <path class="st1" d="M34.3,87.1h-2v5.3H31v-5.3h-2V86h5.3V87.1z"/> </g> - <path class="st11" d="M21,122c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 + <path class="st1" d="M22,121.6c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21,122z"/> - <path class="st11" d="M27.6,111.2c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C30.1,113.7,28.8,112.4,27.6,111.2z"/> - <path class="st11" d="M29.2,120.5c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L22,121.6z"/> + <path class="st1" d="M28.6,110.7c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C31.1,113.2,29.9,112,28.6,110.7z"/> + <path class="st1" d="M30.2,120c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36.1,122.3,32.7,119.5,29.2,120.5z M16.4,112c-0.4,0-0.7-0.3-0.7-0.7 - c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.2,111.6,16.8,112,16.4,112z M26.8,114.4c0.3,0.3,0.6,0.7,1,1 - c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.4,115.8,26.1,115.1,26.8,114.4z"/> + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C37.1,121.8,33.7,119,30.2,120z M17.5,111.5c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C18.2,111.2,17.9,111.5,17.5,111.5z M27.9,113.9c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C26.5,115.3,27.2,114.6,27.9,113.9z"/> <g> - <path class="st11" d="M17.6,141.9v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5H17v1h-2.7v1.7H17.6z"/> - <path class="st11" d="M18.8,143v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.8z M23,139.8 - c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H20v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23,140.3,23,140.1,23,139.8z"/> - <path class="st11" d="M25.5,143v-6.4h1.2v6.4H25.5z"/> - <path class="st11" d="M33,137.7h-2v5.3h-1.2v-5.3h-2v-1.1H33V137.7z"/> + <path class="st1" d="M18.6,141.4v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H18.6z"/> + <path class="st1" d="M19.8,142.5v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H19.8z M24,139.3 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C24,139.9,24,139.6,24,139.3z"/> + <path class="st1" d="M26.5,142.5v-6.4h1.2v6.4H26.5z"/> + <path class="st1" d="M34.1,137.2h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V137.2z"/> </g> - <path class="st11" d="M21,172.1c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 + <path class="st1" d="M22,171.6c-1.4,1.4-2.8,2.8-4.2,4.2c-0.3-0.3-0.7-0.7-1-1c1.4-1.4,2.8-2.8,4.2-4.2l-1.1-1.1 c-1.6,1.6-3.2,3.2-4.9,4.8c-0.3,0.3-0.5,0.7-0.6,1.2c-0.2,1.3-0.4,2.6-0.6,4c0.1,0,0.2,0,0.3,0c1.3-0.3,2.5-0.5,3.8-0.8 - c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L21,172.1z"/> - <path class="st11" d="M27.6,161.2c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 - c-0.6,0.6-1.2,1.2-1.7,1.7C30.1,163.8,28.8,162.5,27.6,161.2z"/> - <path class="st11" d="M29.1,170.5c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 + c0.2-0.1,0.5-0.2,0.7-0.4c1.7-1.7,3.4-3.4,5.1-5.1L22,171.6z"/> + <path class="st1" d="M28.6,160.8c0.5-0.5,1.1-1.1,1.7-1.7c0.2-0.2,0.5-0.2,0.7,0c1,1,2,2,3,3c0.2,0.2,0.2,0.5,0,0.8 + c-0.6,0.6-1.2,1.2-1.7,1.7C31.1,163.3,29.9,162,28.6,160.8z"/> + <path class="st1" d="M30.2,170.1c-0.3,0.1-0.4,0-0.6-0.2c-0.4-0.4-0.8-0.8-1.2-1.2c1-1,1.9-1.9,2.9-2.9c0.1-0.1,0.2-0.2,0.2-0.2 c-1.3-1.3-2.5-2.5-3.8-3.9c-0.1,0.1-0.1,0.2-0.2,0.3c-1,1-1.9,1.9-2.9,2.9c-1.8-1.8-3.5-3.5-5.3-5.3c-0.1-0.1-0.3-0.3-0.4-0.4 c-1-0.7-2.2-0.6-3,0.3c-0.8,0.9-0.7,2.2,0.1,3c2.6,2.6,5.3,5.3,7.9,7.9c0.9,0.9,1.7,1.7,2.6,2.6c0.1,0.1,0.2,0.2,0.1,0.4 c-0.1,0.4-0.2,0.8-0.2,1.2c-0.2,2.5,1.4,4.7,3.9,5.4c1,0.3,2,0.2,3.1-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c-0.7-0.7-1.5-1.5-2.2-2.2 c-0.5-0.5-0.6-1.4-0.1-1.9c0.4-0.4,0.8-0.8,1.2-1.2c0.6-0.5,1.3-0.5,1.8,0c0.1,0.1,0.2,0.2,0.3,0.3c0.7,0.7,1.5,1.5,2.2,2.2 - c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C36,172.3,32.6,169.5,29.1,170.5z M16.4,162.1c-0.4,0-0.7-0.3-0.7-0.7 - c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C17.1,161.7,16.8,162.1,16.4,162.1z M26.8,164.4c0.3,0.3,0.6,0.7,1,1 - c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C25.4,165.8,26.1,165.1,26.8,164.4z"/> + c0,0,0.1,0,0.1,0c0.1-0.4,0.2-0.8,0.2-1.3C37.1,171.9,33.7,169,30.2,170.1z M17.4,161.6c-0.4,0-0.7-0.3-0.7-0.7 + c0-0.4,0.3-0.8,0.7-0.8c0.4,0,0.8,0.4,0.8,0.7C18.2,161.2,17.8,161.6,17.4,161.6z M27.8,164c0.3,0.3,0.6,0.7,1,1 + c-0.7,0.7-1.4,1.4-2.1,2.1c-0.3-0.3-0.7-0.7-1-1C26.4,165.4,27.1,164.7,27.8,164z"/> <g> - <path class="st11" d="M17.6,191.9v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5H17v1h-2.7v1.7H17.6z"/> - <path class="st11" d="M18.8,193v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 - c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H18.8z M23,189.8 - c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2H20v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 - c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C23,190.4,23,190.1,23,189.8z"/> - <path class="st11" d="M25.5,193v-6.4h1.2v6.4H25.5z"/> - <path class="st11" d="M33,187.7h-2v5.3h-1.2v-5.3h-2v-1.1H33V187.7z"/> + <path class="st1" d="M18.6,191.5v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H18.6z"/> + <path class="st1" d="M19.8,192.6v-6.4h2.3c0.5,0,1,0.1,1.4,0.3s0.7,0.4,1,0.7c0.3,0.3,0.5,0.6,0.6,1c0.1,0.4,0.2,0.8,0.2,1.2 + c0,0.5-0.1,0.9-0.2,1.3c-0.1,0.4-0.4,0.7-0.6,1c-0.3,0.3-0.6,0.5-1,0.6c-0.4,0.2-0.8,0.2-1.3,0.2H19.8z M24,189.4 + c0-0.3,0-0.6-0.1-0.8s-0.2-0.5-0.4-0.7c-0.2-0.2-0.4-0.3-0.6-0.4c-0.2-0.1-0.5-0.2-0.8-0.2h-1.1v4.2h1.1c0.3,0,0.6-0.1,0.8-0.2 + c0.2-0.1,0.4-0.3,0.6-0.4s0.3-0.4,0.4-0.7C24,189.9,24,189.7,24,189.4z"/> + <path class="st1" d="M26.5,192.6v-6.4h1.2v6.4H26.5z"/> + <path class="st1" d="M34.1,187.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V187.3z"/> </g> </g> </svg> diff --git a/scripts/system/assets/images/tools/market.svg b/scripts/system/assets/images/tools/market.svg index fa4a3d7256..0cec030933 100644 --- a/scripts/system/assets/images/tools/market.svg +++ b/scripts/system/assets/images/tools/market.svg @@ -3,158 +3,47 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#F9F9F9;} - .st8{filter:url(#Adobe_OpacityMaskFilter_2_);} - .st9{opacity:0.75;mask:url(#SVGID_3_);} - .st10{fill:#333333;} - .st11{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#FFFFFF;} + .st2{fill:#1E1E1E;} + .st3{fill:#333333;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> </g> </g> <g> - <g> - <g> - <path class="st7" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_2_" filterUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="0.1" width="50" height="50" id="SVGID_3_"> - <g class="st8"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHAAAACKQAAAtz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADgANwMBIgACEQEDEQH/ -xACMAAEAAgMBAQAAAAAAAAAAAAAABgcBAgQDBQEBAAAAAAAAAAAAAAAAAAAAABAAAAUDBQEBAAAA -AAAAAAAAAQIDBAYABQcgNBY2F0AQEQABAwEEBwcFAAAAAAAAAAABAAIDBCAR0gUxkbFScpN0IWGy -E7MVNRKCoiNjEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAACLSvgswgqdiCaT7BTqSDis -ys7MAAIEDgsysbNMgGCBvMR6RhsBoHwQf//aAAgBAgABBQD4P//aAAgBAwABBQD4P//aAAgBAQAB -BQCw2YLoqnjpuYvnDavOG1ecNqUx03KW4WArS5Y8KAuNMkKASTHW40yXsuOtxpkvZcdbjTJey4+U -AjgBAQ/REACRqlNJLW0kltVTkEnIHJJNXJJNXJJNSkgk5yukZK5ff//aAAgBAgIGPwAH/9oACAED -AgY/AAf/2gAIAQEBBj8Ac1xNwN3YgSXaytLtZWl2srS7WUSC7WVS0gJuqJWRH73Bqkv3hstZV31k -PjapeIbLWU9ZB6jVLxDZaynrIPG1S8Q2Wsp6yD1GqS/eGxXiwSSsqIPYKyE/m1fXHllWQdI8iTCr -vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform="matrix(1 0 0 1 -3 -1.9327)"> - </image> - </g> - </mask> - <g class="st9"> - <g> - <path d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> - </g> - </g> - </g> - <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st2" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> </g> <g id="Layer_1"> <g> - <path class="st10" d="M12.1,42.8v-4.2l-1.6,3.1H9.8l-1.6-3.1v4.2H6.9v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12.1z"/> - <path class="st10" d="M14.3,42.8l2.5-6.4h1l2.5,6.4H19l-0.6-1.6h-2.2l-0.6,1.6H14.3z M17.3,37.7l-0.9,2.6h1.8L17.3,37.7z"/> - <path class="st10" d="M21.2,42.8v-6.4H24c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4H25l-1.3-2.1h-1.2v2.1H21.2z M22.4,39.6H24c0.1,0,0.2,0,0.3-0.1 + <path class="st3" d="M12,42.3v-4.2l-1.6,3.1H9.6L8,38.1v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12z"/> + <path class="st3" d="M14.1,42.3l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,37.3l-0.9,2.6H18L17.1,37.3z"/> + <path class="st3" d="M21.1,42.3v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21.1z M22.3,39.1h1.6c0.1,0,0.2,0,0.3-0.1 c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 - c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V39.6z"/> - <path class="st10" d="M27.5,42.8v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.5z"/> - <path class="st10" d="M38.2,41.7v1.1h-4.4v-6.4h4.4v1.1H35V39h2.7v1H35v1.7H38.2z"/> - <path class="st10" d="M44.2,37.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.5z"/> + c-0.1-0.1-0.2-0.2-0.3-0.2C24,37.1,23.9,37,23.8,37h-1.5V39.1z"/> + <path class="st3" d="M27.3,42.3v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> + <path class="st3" d="M38,41.2v1.1h-4.4v-6.4h4.4V37h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> + <path class="st3" d="M44,37h-2v5.3h-1.2V37h-2v-1.1H44V37z"/> </g> <g> - <path class="st10" d="M14.3,12.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + <path class="st3" d="M14.1,11.7c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 @@ -162,27 +51,27 @@ vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform= c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 - c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C14,12.2,14.1,12.2,14.3,12.2z M32.3,16.2L31,20.9l-0.3,0.2 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,11.7,14,11.7,14.1,11.7z M32.1,15.7l-1.3,4.7l-0.3,0.2 l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8c-0.1-0.6-0.3-1.3-0.5-2 - c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7L19,16.2H32.3z"/> - <path class="st10" d="M22.4,24.5L22.4,24.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23.2,24.7,22.8,24.5,22.4,24.5z"/> - <path class="st10" d="M29.5,24.5L29.5,24.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.3,24.7,29.9,24.5,29.5,24.5z"/> + c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> + <path class="st3" d="M22.2,24.1L22.2,24.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,24.2,22.7,24.1,22.2,24.1z"/> + <path class="st3" d="M29.3,24.1L29.3,24.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,24.2,29.8,24.1,29.3,24.1z"/> </g> <g> - <path class="st11" d="M12.1,92.8v-4.2l-1.6,3.1H9.8l-1.6-3.1v4.2H6.9v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12.1z"/> - <path class="st11" d="M14.3,92.8l2.5-6.4h1l2.5,6.4H19l-0.6-1.6h-2.2l-0.6,1.6H14.3z M17.3,87.7l-0.9,2.6h1.8L17.3,87.7z"/> - <path class="st11" d="M21.2,92.8v-6.4H24c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4H25l-1.3-2.1h-1.2v2.1H21.2z M22.4,89.6H24c0.1,0,0.2,0,0.3-0.1 + <path class="st1" d="M12,92.3v-4.2l-1.6,3.1H9.6L8,88.1v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H12z"/> + <path class="st1" d="M14.1,92.3l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,87.3l-0.9,2.6H18L17.1,87.3z"/> + <path class="st1" d="M21.1,92.3v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21.1z M22.3,89.1h1.6c0.1,0,0.2,0,0.3-0.1 c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 - c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V89.6z"/> - <path class="st11" d="M27.5,92.8v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.5z"/> - <path class="st11" d="M38.2,91.7v1.1h-4.4v-6.4h4.4v1.1H35V89h2.7v1H35v1.7H38.2z"/> - <path class="st11" d="M44.2,87.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.5z"/> + c-0.1-0.1-0.2-0.2-0.3-0.2C24,87.1,23.9,87,23.8,87h-1.5V89.1z"/> + <path class="st1" d="M27.3,92.3v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> + <path class="st1" d="M38,91.2v1.1h-4.4v-6.4h4.4V87h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> + <path class="st1" d="M44,87h-2v5.3h-1.2V87h-2v-1.1H44V87z"/> </g> <g> - <path class="st11" d="M14.3,62.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + <path class="st1" d="M14.1,61.7c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 @@ -190,27 +79,27 @@ vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform= c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 - c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C14,62.2,14.1,62.2,14.3,62.2z M32.3,66.2L31,70.9l-0.3,0.2 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,61.7,14,61.7,14.1,61.7z M32.1,65.7l-1.3,4.7l-0.3,0.2 l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8c-0.1-0.6-0.3-1.3-0.5-2 - c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7L19,66.2H32.3z"/> - <path class="st11" d="M22.4,74.5L22.4,74.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23.2,74.7,22.8,74.5,22.4,74.5z"/> - <path class="st11" d="M29.5,74.5L29.5,74.5c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.3,74.7,29.9,74.5,29.5,74.5z"/> + c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> + <path class="st1" d="M22.2,74.1L22.2,74.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,74.2,22.7,74.1,22.2,74.1z"/> + <path class="st1" d="M29.3,74.1L29.3,74.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,74.2,29.8,74.1,29.3,74.1z"/> </g> <g> - <path class="st11" d="M11.9,142.9v-4.2l-1.6,3.1H9.6L8,138.6v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H11.9z"/> - <path class="st11" d="M14.1,142.9l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,137.8l-0.9,2.6H18L17.1,137.8z"/> - <path class="st11" d="M21,142.9v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21z M22.3,139.6h1.6c0.1,0,0.2,0,0.3-0.1 + <path class="st1" d="M11.8,142.4v-4.2l-1.6,3.1H9.5l-1.6-3.1v4.2H6.6V136h1.3l1.9,3.6l1.9-3.6H13v6.4H11.8z"/> + <path class="st1" d="M13.9,142.4l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6h-2.2l-0.6,1.6H13.9z M17,137.4l-0.9,2.6h1.8L17,137.4z"/> + <path class="st1" d="M20.9,142.4V136h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 + c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H20.9z M22.1,139.2h1.6c0.1,0,0.2,0,0.3-0.1 c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 - c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V139.6z"/> - <path class="st11" d="M27.3,142.9v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> - <path class="st11" d="M38,141.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> - <path class="st11" d="M44,137.6h-2v5.3h-1.2v-5.3h-2v-1.1H44V137.6z"/> + c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V139.2z"/> + <path class="st1" d="M27.2,142.4V136h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.2z"/> + <path class="st1" d="M37.8,141.3v1.1h-4.4V136h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H37.8z"/> + <path class="st1" d="M43.8,137.1h-2v5.3h-1.2v-5.3h-2V136h5.3V137.1z"/> </g> <g> - <path class="st11" d="M14.1,112.2c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + <path class="st1" d="M13.9,111.8c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 @@ -218,27 +107,27 @@ vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform= c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 - c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,112.2,13.9,112.2,14.1,112.2z M32.1,116.2l-1.3,4.7 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.7,111.8,13.8,111.8,13.9,111.8z M32,115.8l-1.3,4.7 l-0.3,0.2l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8 - c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> - <path class="st11" d="M22.2,124.6L22.2,124.6c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,124.7,22.6,124.6,22.2,124.6z"/> - <path class="st11" d="M29.3,124.6L29.3,124.6c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,124.7,29.8,124.6,29.3,124.6z"/> + c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32z"/> + <path class="st1" d="M22.1,124.2L22.1,124.2c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C22.9,124.3,22.5,124.2,22.1,124.2z"/> + <path class="st1" d="M29.2,124.2L29.2,124.2c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30,124.3,29.6,124.2,29.2,124.2z"/> </g> <g> - <path class="st11" d="M11.9,192.9v-4.2l-1.6,3.1H9.6L8,188.7v4.2H6.7v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H11.9z"/> - <path class="st11" d="M14.1,192.9l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6H16l-0.6,1.6H14.1z M17.1,187.9l-0.9,2.6H18L17.1,187.9z"/> - <path class="st11" d="M21,192.9v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7c0.1,0.3,0.2,0.5,0.2,0.8 - c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H21z M22.3,189.7h1.6c0.1,0,0.2,0,0.3-0.1 - c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4s-0.1-0.2-0.2-0.3 - c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V189.7z"/> - <path class="st11" d="M27.3,192.9v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.3z"/> - <path class="st11" d="M38,191.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> - <path class="st11" d="M44,187.6h-2v5.3h-1.2v-5.3h-2v-1.1H44V187.6z"/> + <path class="st1" d="M11.8,192.5v-4.2l-1.6,3.1H9.5l-1.6-3.1v4.2H6.6v-6.4h1.3l1.9,3.6l1.9-3.6H13v6.4H11.8z"/> + <path class="st1" d="M13.9,192.5l2.5-6.4h1l2.5,6.4h-1.3l-0.6-1.6h-2.2l-0.6,1.6H13.9z M17,187.4L16,190h1.8L17,187.4z"/> + <path class="st1" d="M20.9,192.5v-6.4h2.8c0.3,0,0.6,0.1,0.8,0.2s0.5,0.3,0.6,0.5c0.2,0.2,0.3,0.4,0.4,0.7 + c0.1,0.3,0.2,0.5,0.2,0.8c0,0.4-0.1,0.8-0.3,1.1c-0.2,0.3-0.5,0.6-0.8,0.7l1.5,2.4h-1.4l-1.3-2.1h-1.2v2.1H20.9z M22.1,189.2h1.6 + c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.3,0.1-0.4c0-0.1,0-0.3-0.1-0.4 + s-0.1-0.2-0.2-0.3c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.2-0.1-0.3-0.1h-1.5V189.2z"/> + <path class="st1" d="M27.2,192.5v-6.4h1.2v3.1l2.8-3.1h1.3l-2.4,2.8l2.6,3.6h-1.3l-2-2.9l-0.9,0.9v1.9H27.2z"/> + <path class="st1" d="M37.8,191.4v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H37.8z"/> + <path class="st1" d="M43.8,187.2h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V187.2z"/> </g> <g> - <path class="st11" d="M14.1,162.3c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 + <path class="st1" d="M13.9,161.8c0.2,0,0.3,0,0.5,0c0.3,0,0.5,0,0.8,0.1c0.4,0.1,0.8,0.4,1,0.8c0.1,0.2,0.2,0.5,0.3,0.8 c0.1,0.3,0.2,0.6,0.3,1c0.1,0.5,0.3,1,0.4,1.4c0.1,0.3,0.2,0.6,0.3,0.9c0.1,0.4,0.2,0.8,0.4,1.2c0.1,0.5,0.3,1,0.4,1.5 c0,0.1,0.1,0.2,0.1,0.3c0.1,0.5,0.2,0.9,0.4,1.3c0.2,0.3,0.4,0.6,0.7,0.8c0.3,0.2,0.7,0.3,1.1,0.3c0.1,0,0.2,0,0.4,0l1.1,0l2.9,0 c1.3,0,2.5,0,3.8,0c0.6,0,1.3,0,1.9,0c0,0,0.1,0,0.1,0c0.3,0,0.6,0,0.9-0.1c0.2-0.1,0.4-0.5,0.4-0.8l0,0l0.1-0.5c0,0,0,0,0,0 @@ -246,13 +135,13 @@ vaK3kSYV8RW8iTCviK3kSYV8RW8iTCiPaa0X/wAJMKhq3ZXV/pkbI0eRJfe0h26v/9k=" transform= c-0.1-0.2-0.4-0.2-0.7-0.2c-0.3,0-9.6,0.1-14.5,0.2l-0.2,0l-0.3-1.1c0-0.1-0.1-0.3-0.1-0.5c0-0.1-0.1-0.2-0.1-0.3 c0-0.1,0-0.1-0.1-0.2c0-0.2-0.1-0.4-0.1-0.5c-0.1-0.3-0.3-0.7-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.5c-0.2,0-0.3,0-0.5-0.1 c-0.2,0-0.5,0-0.7,0c-1,0-2,0-3,0c-0.1,0-0.1,0-0.2,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.3,0.1-0.4,0.2c-0.2,0.2-0.2,0.6-0.1,0.9 - c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.8,162.3,13.9,162.3,14.1,162.3z M32.1,166.3l-1.3,4.7 + c0.1,0.2,0.3,0.3,0.5,0.3c0.2,0,0.4,0,0.6,0c0.3,0,0.6,0,0.8,0l0.9,0C13.7,161.8,13.8,161.8,13.9,161.8z M32,165.8l-1.3,4.7 l-0.3,0.2l-0.1,0c-0.1,0-1.1,0-2.8,0c-2.5,0-6,0-6.4,0l0,0h0c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.5-0.4-0.8 - c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32.1z"/> - <path class="st11" d="M22.2,174.7L22.2,174.7c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C23,174.8,22.6,174.7,22.2,174.7z"/> - <path class="st11" d="M29.3,174.7L29.3,174.7c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 - c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30.1,174.8,29.8,174.7,29.3,174.7z"/> + c-0.1-0.6-0.3-1.3-0.5-2c-0.1-0.2-0.1-0.4-0.2-0.6c-0.1-0.2-0.1-0.4-0.2-0.7l-0.2-0.6H32z"/> + <path class="st1" d="M22.1,174.2L22.1,174.2c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.9,0,1.5-0.6,1.5-1.5c0-0.4-0.2-0.8-0.4-1C22.9,174.3,22.5,174.2,22.1,174.2z"/> + <path class="st1" d="M29.2,174.2L29.2,174.2c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.3-0.4,0.6-0.4,1.1c0,0.4,0.1,0.8,0.4,1.1 + c0.3,0.3,0.6,0.4,1.1,0.4c0.8,0,1.5-0.7,1.5-1.5c0-0.4-0.1-0.7-0.4-1C30,174.3,29.6,174.2,29.2,174.2z"/> </g> </g> </svg> diff --git a/scripts/system/assets/images/tools/mic.svg b/scripts/system/assets/images/tools/mic.svg index 126bb539fc..0424f3eb49 100644 --- a/scripts/system/assets/images/tools/mic.svg +++ b/scripts/system/assets/images/tools/mic.svg @@ -3,193 +3,124 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#1E1E1E;} + .st2{fill:#FFFFFF;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <g> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> + </g> </g> <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st1" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> </g> <g id="Layer_1"> <g> - <path class="st7" d="M18.4,192.3v-4.2l-1.6,3.1H16l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18.4z"/> - <path class="st7" d="M23.9,191.2c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + <path class="st2" d="M18,192.8v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18z"/> + <path class="st2" d="M23.5,191.8c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 - c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8 - c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.6,191.2,23.9,191.2z"/> - <path class="st7" d="M32.9,187h-2v5.3h-1.2V187h-2v-1.1h5.3V187z"/> - <path class="st7" d="M38.4,191.2v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38.4z"/> + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3H22v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.2,191.8,23.5,191.8z"/> + <path class="st2" d="M32.6,187.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V187.5z"/> + <path class="st2" d="M38,191.8v1.1h-4.4v-6.4H38v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> </g> - <path class="st7" d="M28.5,114.9l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 - c0.8-0.9,2-1.5,3.3-1.5C26.5,113.2,27.7,113.9,28.5,114.9z"/> - <path class="st7" d="M31.2,112.2l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 - c1.5-1.6,3.6-2.6,5.9-2.6C27.5,109.5,29.7,110.5,31.2,112.2z"/> - <path class="st7" d="M27.1,119.3V117c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.1z"/> - <path class="st7" d="M23.2,121v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V121H23.2z"/> - <path class="st7" d="M30.9,123.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <path class="st2" d="M28.2,115.4l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.2,113.7,27.4,114.4,28.2,115.4z"/> + <path class="st2" d="M30.8,112.8l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 + c1.5-1.6,3.6-2.6,5.9-2.6C27.2,110,29.4,111.1,30.8,112.8z"/> + <path class="st2" d="M26.7,119.9v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H26.7z"/> + <path class="st2" d="M22.9,121.5v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H22.9z"/> + <path class="st2" d="M30.6,124.3c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 - c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.8,128.6,30.9,126.4,30.9,123.8z"/> - <path class="st7" d="M28.7,64.8l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 - c0.8-0.9,2-1.5,3.3-1.5C26.6,63.1,27.9,63.8,28.7,64.8z"/> - <path class="st7" d="M31.3,62.1l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1 - c1.5-1.6,3.6-2.6,5.9-2.6C27.6,59.4,29.8,60.5,31.3,62.1z"/> - <path class="st7" d="M27.2,69.2v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H27.2z"/> - <path class="st7" d="M23.3,70.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.3z"/> - <path class="st7" d="M31,73.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9H28c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.5,129.1,30.6,126.9,30.6,124.3z"/> + <path class="st2" d="M28.3,65.3l1.1-1.1c-1.1-1.3-2.7-2.1-4.6-2.1c-1.7,0-3.3,0.8-4.4,2c0.4,0.4,0.8,0.8,1.1,1.1 + c0.8-0.9,2-1.5,3.3-1.5C26.3,63.6,27.5,64.3,28.3,65.3z"/> + <path class="st2" d="M31,62.7l1.1-1.1c-1.8-2-4.4-3.2-7.2-3.2c-2.8,0-5.3,1.2-7,3c0.4,0.4,0.8,0.8,1.1,1.1c1.5-1.6,3.6-2.6,5.9-2.6 + C27.3,59.9,29.5,61,31,62.7z"/> + <path class="st2" d="M26.9,69.8v-2.4c0-1.1-0.9-1.9-1.9-1.9h0c-1.1,0-1.9,0.9-1.9,1.9v2.4H26.9z"/> + <path class="st2" d="M23,71.4v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23z"/> + <path class="st2" d="M30.7,74.2c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.9,78.5,31,76.3,31,73.7z"/> + h-2.3l0-1.8C28.6,79,30.7,76.9,30.7,74.2z"/> <g> - <path class="st7" d="M18.4,92.3v-4.2l-1.6,3.1H16l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18.4z"/> - <path class="st7" d="M23.9,91.2c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + <path class="st2" d="M18,92.8v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6h1.3v6.4H18z"/> + <path class="st2" d="M23.5,91.8c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3H22v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.2,91.8,23.5,91.8z"/> + <path class="st2" d="M32.6,87.5h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.5z"/> + <path class="st2" d="M38,91.8v1.1h-4.4v-6.4H38v1.1h-3.1v1.5h2.7v1h-2.7v1.7H38z"/> + </g> + <g> + <path class="st2" d="M8.3,41.9c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 + c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7C9.3,42.9,8.8,43,8.3,43c-0.5,0-0.9-0.1-1.3-0.3 + c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8 + c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S8,41.9,8.3,41.9z"/> + <path class="st2" d="M13.8,38.8v4.1h-1.2v-6.4h1l3.3,4.2v-4.2h1.2v6.4h-1L13.8,38.8z"/> + <path class="st2" d="M24.9,42.9v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2h-1.2v-6.4H21l1.9,3.6l1.9-3.6h1.3v6.4H24.9z"/> + <path class="st2" d="M30.4,41.9c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8 - c0.1,0.2,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.5S23.6,91.2,23.9,91.2z"/> - <path class="st7" d="M32.9,87h-2v5.3h-1.2V87h-2v-1.1h5.3V87z"/> - <path class="st7" d="M38.4,91.2v1.1h-4.4v-6.4h4.4V87h-3.1v1.5h2.7v1h-2.7v1.7H38.4z"/> - </g> - <g> - <path class="st7" d="M8.7,41.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V36h1.2v3.3 - c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 - C7,42,6.7,41.8,6.5,41.5c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V36h1.2v3.3c0,0.3,0,0.5,0.1,0.8 - c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S8.4,41.3,8.7,41.3z"/> - <path class="st7" d="M14.2,38.3v4.1h-1.2V36h1l3.3,4.2V36h1.2v6.4h-1L14.2,38.3z"/> - <path class="st7" d="M25.2,42.4v-4.2l-1.6,3.1h-0.7l-1.6-3.1v4.2H20V36h1.3l1.9,3.6l1.9-3.6h1.3v6.4H25.2z"/> - <path class="st7" d="M30.7,41.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V36h1.2v3.3 - c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 - c-0.4-0.2-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V36h1.2v3.3c0,0.3,0,0.5,0.1,0.8 - c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S30.4,41.3,30.7,41.3z"/> - <path class="st7" d="M39.8,37.1h-2v5.3h-1.2v-5.3h-2V36h5.3V37.1z"/> - <path class="st7" d="M45.2,41.3v1.1h-4.4V36h4.4v1.1H42v1.5h2.7v1H42v1.7H45.2z"/> + c0.1,0.2,0.1,0.5,0.3,0.7s0.3,0.3,0.5,0.5S30.1,41.9,30.4,41.9z"/> + <path class="st2" d="M39.4,37.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.6z"/> + <path class="st2" d="M44.9,41.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H44.9z"/> </g> <g> <g> - <polygon class="st7" points="27.7,18.2 27.6,18.2 27.6,18.2 "/> - <path class="st7" d="M26.5,13.9l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7c-0.4-0.4-1.1-0.4-1.5,0 - c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7c0.4,0.4,1.1,0.4,1.5,0 - c0.4-0.4,0.4-1.1,0-1.5L26.5,13.9z"/> + <polygon class="st2" points="27.3,18.7 27.3,18.7 27.3,18.7 "/> + <path class="st2" d="M26.1,14.4l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7c-0.4-0.4-1.1-0.4-1.5,0 + s-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7c0.4,0.4,1.1,0.4,1.5,0 + c0.4-0.4,0.4-1.1,0-1.5L26.1,14.4z"/> </g> - <path class="st7" d="M23.2,21v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9V21H23.2z"/> - <path class="st7" d="M30.9,23.8c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <path class="st2" d="M22.9,21.6V24c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H22.9z"/> + <path class="st2" d="M30.6,24.4c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 - c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.8,28.6,30.9,26.5,30.9,23.8z"/> + c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9H28c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.5,29.2,30.6,27,30.6,24.4z"/> </g> <g> <g> - <polygon class="st7" points="27.7,168.1 27.6,168.1 27.6,168.1 "/> - <path class="st7" d="M26.5,163.8l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7 + <polygon class="st2" points="27.3,168.6 27.3,168.6 27.3,168.6 "/> + <path class="st2" d="M26.1,164.3l2.7-2.7c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0l-2.7,2.7l-2.7-2.7 c-0.4-0.4-1.1-0.4-1.5,0c-0.4,0.4-0.4,1.1,0,1.5l2.7,2.7l-2.7,2.7c-0.4,0.4-0.4,1.1,0,1.5c0.4,0.4,1.1,0.4,1.5,0l2.7-2.7l2.7,2.7 - c0.4,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1.1,0-1.5L26.5,163.8z"/> + c0.4,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1.1,0-1.5L26.1,164.3z"/> </g> - <path class="st7" d="M23.2,170.9v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H23.2z"/> - <path class="st7" d="M30.9,173.7c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 + <path class="st2" d="M22.9,171.5v2.4c0,1.1,0.9,1.9,1.9,1.9h0c1.1,0,1.9-0.9,1.9-1.9v-2.4H22.9z"/> + <path class="st2" d="M30.6,174.3c0,0,0-2.6,0-2.7c0-0.5-0.4-0.9-1-0.9c-0.5,0-0.9,0.4-0.9,0.9c0,0.2,0,2.5,0,2.7 c0,1.9-1.7,3.5-3.9,3.5c-2.1,0-3.9-1.6-3.9-3.5c0-0.2,0-2.6,0-2.8c0-0.5-0.4-0.9-0.9-1c-0.5,0-0.9,0.3-1,0.9c0,0.1,0,2.8,0,2.9 - c0,2.6,2.1,4.8,4.8,5.2l0,1.8H22c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9h6.4c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 - h-2.3l0-1.8C28.8,178.6,30.9,176.4,30.9,173.7z"/> + c0,2.6,2.1,4.8,4.8,5.2l0,1.8h-2.2c-0.5,0-0.9,0.4-0.9,0.9c0,0.5,0.4,0.9,0.9,0.9H28c0.5,0,0.9-0.4,0.9-0.9c0-0.5-0.4-0.9-0.9-0.9 + h-2.3l0-1.8C28.5,179.1,30.6,176.9,30.6,174.3z"/> </g> <g> - <path class="st7" d="M8.5,141.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V136h1.2v3.3 + <path class="st2" d="M8.2,141.9c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3H11v3.3 c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 - s-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V136H7v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 - c0.1,0.2,0.3,0.3,0.5,0.5S8.2,141.3,8.5,141.3z"/> - <path class="st7" d="M14,138.3v4.1h-1.2V136h1l3.3,4.2V136h1.2v6.4h-1L14,138.3z"/> - <path class="st7" d="M25.1,142.4v-4.2l-1.6,3.2h-0.7l-1.6-3.2v4.2h-1.2V136h1.3l1.9,3.6L25,136h1.3v6.4H25.1z"/> - <path class="st7" d="M30.6,141.3c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8V136h1.2v3.3 + S6.3,142.3,6,142c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 + c0.1,0.2,0.3,0.3,0.5,0.5S7.9,141.9,8.2,141.9z"/> + <path class="st2" d="M13.7,138.8v4.1h-1.2v-6.4h1l3.3,4.2v-4.2H18v6.4h-1L13.7,138.8z"/> + <path class="st2" d="M24.8,142.9v-4.2l-1.6,3.2h-0.7l-1.6-3.2v4.2h-1.2v-6.4h1.3l1.9,3.6l1.9-3.6H26v6.4H24.8z"/> + <path class="st2" d="M30.3,141.9c0.3,0,0.5-0.1,0.7-0.2s0.4-0.3,0.5-0.5c0.1-0.2,0.2-0.4,0.3-0.7s0.1-0.5,0.1-0.8v-3.3h1.2v3.3 c0,0.4-0.1,0.8-0.2,1.2c-0.1,0.4-0.3,0.7-0.5,1c-0.2,0.3-0.5,0.5-0.9,0.7c-0.4,0.2-0.8,0.3-1.3,0.3c-0.5,0-0.9-0.1-1.3-0.3 - s-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2V136H29v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 - c0.1,0.2,0.3,0.3,0.5,0.5S30.3,141.3,30.6,141.3z"/> - <path class="st7" d="M39.6,137.1h-2v5.3h-1.2v-5.3h-2V136h5.3V137.1z"/> - <path class="st7" d="M45.1,141.3v1.1h-4.4V136H45v1.1h-3.1v1.5h2.7v1h-2.7v1.7H45.1z"/> + s-0.6-0.4-0.9-0.7c-0.2-0.3-0.4-0.6-0.5-1c-0.1-0.4-0.1-0.8-0.1-1.2v-3.3h1.2v3.3c0,0.3,0,0.5,0.1,0.8c0.1,0.2,0.1,0.5,0.3,0.7 + c0.1,0.2,0.3,0.3,0.5,0.5S30,141.9,30.3,141.9z"/> + <path class="st2" d="M39.3,137.6h-2v5.3H36v-5.3h-2v-1.1h5.3V137.6z"/> + <path class="st2" d="M44.8,141.8v1.1h-4.4v-6.4h4.4v1.1h-3.1v1.5h2.7v1h-2.7v1.7H44.8z"/> </g> </g> </svg> diff --git a/scripts/system/assets/images/tools/switch.svg b/scripts/system/assets/images/tools/switch.svg index 23655d747d..e67a9aac04 100644 --- a/scripts/system/assets/images/tools/switch.svg +++ b/scripts/system/assets/images/tools/switch.svg @@ -3,228 +3,165 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 200.1" style="enable-background:new 0 0 50 200.1;" xml:space="preserve"> <style type="text/css"> - .st0{fill:#515151;} - .st1{filter:url(#Adobe_OpacityMaskFilter);} - .st2{mask:url(#SVGID_1_);} - .st3{fill:#282828;} - .st4{filter:url(#Adobe_OpacityMaskFilter_1_);} - .st5{mask:url(#SVGID_2_);} - .st6{fill:#1E1E1E;} - .st7{fill:#FFFFFF;} + .st0{fill:#414042;} + .st1{fill:#1E1E1E;} + .st2{fill:none;stroke:#75FF48;stroke-width:0.25;stroke-miterlimit:10;} + .st3{fill:#FFFFFF;} </style> <g id="Layer_2"> <g> <g> - <g> - <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0.1" y="100.1" width="50" height="50" id="SVGID_1_"> - <g class="st1"> - - <image style="overflow:visible;" width="55" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACTAAAAwT/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANwMBIgACEQEDEQH/ -xACSAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAABAwMBCAMAAAAA -AAAAAAADAQIFAAQGEEARMTITMxUWISY2EQABAgIDDwMFAAAAAAAAAAABAAIDBCFxkSARMUGx0SIy -QoKyk3QFNVFhwVJikqIkEgEAAAAAAAAAAAAAAAAAAABA/9oADAMBAAIRAxEAAADyfoFkFd5sYVxr -2fAUu742bHrmxjIEckZW4JLHrCyDYRiSNqngGuOJ3wlBjXDgA//aAAgBAgABBQDYP//aAAgBAwAB -BQDYP//aAAgBAQABBQCJifIULBkenoLa9BbS4ClHwlBNuYtwL3BhI9Bja1u5K3JW5KugseKaEjZ/ -AeVOGpu1O/ocB5U4am7c7+hwFfhOGpu1OL9hwk7RIG6E9nWFXWHXWFV5eCYKYuGvnYu5vQOFNT7U -87kNedyGlnMhq4mJ17TnvHXn/9oACAECAgY/AAf/2gAIAQMCBj8AB//aAAgBAQEGPwDHhvUK/pWr -atK2rStq0ommj3UKWxRXtZ+RvKn6igAFgWBYE6jEpBvrMwh+4W8cqFw6pdu6qFxhbxyoXDql27qo -XGFvHKhcOqXbuqhcYVJvUlDSC1gtYLWCIBUi8HVmIZseF/NCfFH2NLsi0ZCZNUJ+ZeOmuU/MvHTX -KfmXjprlPzIh8jMNrhvHwocSJDc2K1wLGEEEkGihf//Z" transform="matrix(1 0 0 1 -2 98)"> - </image> - </g> - </mask> - <g class="st2"> - <g> - <path class="st3" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> - </g> + <path class="st0" d="M50.1,146.1c0,2.2-1.8,4-4,4h-42c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V146.1z"/> </g> </g> <g> <g> - <g> - <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> - </g> - <defs> - <filter id="Adobe_OpacityMaskFilter_1_" filterUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50"> - - <feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/> - </filter> - </defs> - <mask maskUnits="userSpaceOnUse" x="0" y="150.1" width="50" height="50" id="SVGID_2_"> - <g class="st4"> - - <image style="overflow:visible;" width="54" height="55" xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA -EAMCAwYAAAHMAAACSwAAAvr/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX -Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa -JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIADcANgMBIgACEQEDEQH/ -xACRAAEAAgMBAAAAAAAAAAAAAAAAAwcBBAUGAQEAAAAAAAAAAAAAAAAAAAAAEAAABQIFBAMAAAAA -AAAAAAAAAQIDBAUGEBExEzNAMhUWISY2EQABAgIFCwIHAAAAAAAAAAABAAIhBBExcbIDIEGRsdEi -MkKCkzVREmGhwVJiEyQSAQAAAAAAAAAAAAAAAAAAAED/2gAMAwEAAhEDEQAAAPJ+gWQV3mxhXGvZ -+sU07g27HrmxjIEUsRWwJrHrCyDYRiSLOoeAQDid8JQY1w4IP//aAAgBAgABBQDoP//aAAgBAwAB -BQDoP//aAAgBAQABBQCk0nyAasYll6CkegpB2CQkWUTSV0w01CxmiWTbaUpyIZEMiE1lC2ZDZe12 -D2lpjI4ZH6+we0tMZHDI/X2CfwWmMnhkH9vsl9LRMymlo3mhvNjeaE6Y0ll99J3TS5M1hTVar6S8 -7cI87cIOuXCJFYrq0qkTDnf/2gAIAQICBj8AB//aAAgBAwIGPwAH/9oACAEBAQY/AM9dEFTvaVza -SubSVzaSiYwTJOO/T8hSo/cUAAqlUqk6GZSrcxL7rl1HWhkOsUpa+45dR1oZDrFKWvuOXUdaGQ6x -Slr7rlE0RKG8FxBcQXEE4A5lLYlMAX3XL+bCfij8Gl2pbshMmzCfsXjprtP2Lx012n7F46a7T9iI -fIzDR8cN4+ibinDd+4E+1lB91Xov/9k=" transform="matrix(1 0 0 1 -2 148)"> - </image> - </g> - </mask> - <g class="st5"> - <g> - <path class="st3" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> - </g> + <path class="st0" d="M50,196.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V196.1z"/> </g> </g> <g> <g> - <path class="st6" d="M50,46.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46.1z"/> + <path class="st1" d="M50,46c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4V4c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V46z"/> </g> </g> <g> - <path class="st6" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> + <path class="st1" d="M50,96.1c0,2.2-1.8,4-4,4H4c-2.2,0-4-1.8-4-4v-42c0-2.2,1.8-4,4-4h42c2.2,0,4,1.8,4,4V96.1z"/> </g> </g> <g id="Layer_3"> </g> <g id="Layer_1"> - <g> - <path class="st7" d="M26.4,21.4v3.5c0,0.6-0.5,1.1-1.1,1.1H12.1c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 - c-0.1-0.4-0.3-0.9-0.3-1.3h-3.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4H18v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 - c0,0.3,0.3,0.7,0.6,0.7H23c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 - v-4.4C27.3,20.8,26.8,21.1,26.4,21.4z"/> - <path class="st7" d="M28.3,17c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 - H21.7c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C26.9,17.8,27.5,17.1,28.3,17 - C28.3,17,28.3,17,28.3,17z"/> - <path class="st7" d="M36,21.9c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6L33,26 - l-0.8-0.8L30.5,27l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 - c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.2,22.1,36.1,22,36,21.9z"/> - </g> - <path class="st7" d="M11.4,38.2c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2S9.3,39,9.5,39 - c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 - c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6S11,42.9,10.7,43c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2S7.4,42.5,7,42.2 - l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1.1-0.2,1.1-0.7 - c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2c-0.3-0.1-0.6-0.2-0.8-0.3 - c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9c0.1-0.3,0.3-0.5,0.5-0.6 - c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.4,38.2z"/> - <path class="st7" d="M15.4,36.6h1.1l0.7,2.1l0.7-2.1h1.2L18,39.5l0.8,2l1.8-5H22l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L15.4,36.6z"/> - <path class="st7" d="M22.9,42.9v-6.4h1.2v6.4H22.9z"/> - <path class="st7" d="M30.5,37.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.6z"/> - <path class="st7" d="M31,39.7c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 - c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 - c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 - c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 - c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 - c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C31.1,40.5,31,40.1,31,39.7z"/> - <path class="st7" d="M43.1,36.5v6.4h-1.2v-2.7H39v2.7h-1.2v-6.4H39v2.6h2.9v-2.6H43.1z"/> - <g> - <path class="st7" d="M26.4,71.4v3.5c0,0.6-0.5,1.1-1.1,1.1H12.1c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 - c-0.1-0.4-0.3-0.9-0.3-1.3h-3.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4H18v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 - c0,0.3,0.3,0.7,0.6,0.7H23c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 - v-4.4C27.3,70.8,26.8,71.1,26.4,71.4z"/> - <path class="st7" d="M28.3,67c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 - H21.7c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C26.9,67.8,27.5,67.1,28.3,67 - C28.3,67,28.3,67,28.3,67z"/> - <path class="st7" d="M36,71.9c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6L33,76 - l-0.8-0.8L30.5,77l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 - c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.2,72.1,36.1,72,36,71.9z"/> - </g> - <path class="st7" d="M11.4,88.2c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2C9.1,88.9,9.3,89,9.5,89 + <path class="st3" d="M27.7,20.9v3.5c0,0.6-0.5,1.1-1.1,1.1H13.4c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1l3.9,0 + c-0.1-0.5-0.2-1-0.2-1.3l-3.8,0c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + s0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7s-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4V20 + C28.7,20.4,28.2,20.7,27.7,20.9z"/> + <path class="st3" d="M36.2,19.9h-3.7c-0.5,0-0.9-0.4-1.5-1.4c-0.4-0.6-0.9-1.3-1.4-1.3l0-0.6l0,0.6c-0.5,0-0.9,0.6-1.4,1.2 + c-0.6,0.9-1.1,1.5-1.7,1.5h-3.5c-2.4,0-4.3-1.9-4.3-4.3v-2.3c0-2.4,1.9-4.3,4.3-4.3h13.1c2.4,0,4.3,1.9,4.3,4.3v2.3 + C40.5,18,38.6,19.9,36.2,19.9z M32.7,18.7h3.5c1.7,0,3.1-1.4,3.1-3v-2.3c0-1.7-1.4-3-3.1-3H23.1c-1.7,0-3.1,1.4-3.1,3v2.3 + c0,1.7,1.4,3,3.1,3h3.4c0.2-0.2,0.6-0.7,0.7-0.9c0.6-0.8,1.2-1.7,2.3-1.8l0.1,0c1.2,0,1.8,1,2.4,1.8C32.4,18.3,32.6,18.5,32.7,18.7 + z"/> + <path class="st3" d="M37.4,21.5c-0.2-0.1-0.4,0-0.6,0.1L35,23.4l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6l0.8-0.8 + l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 + c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.6,21.6,37.5,21.5,37.4,21.5z"/> + <path class="st3" d="M11.8,37.7c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2C9.1,37.4,9,37.6,9,37.8c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 - c-0.5-0.1-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2 - c0.2,0.1,0.5,0.1,0.7,0.1c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2 - c-0.2-0.1-0.4-0.1-0.7-0.2c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7 - c0-0.3,0.1-0.6,0.2-0.9c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2 - c0.4,0.1,0.7,0.3,1,0.5L11.4,88.2z"/> - <path class="st7" d="M15.4,86.6h1.1l0.7,2.1l0.7-2.1h1.2L18,89.5l0.8,2l1.8-5H22l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L15.4,86.6z"/> - <path class="st7" d="M22.9,92.9v-6.4h1.2v6.4H22.9z"/> - <path class="st7" d="M30.5,87.6h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.6z"/> - <path class="st7" d="M31,89.7c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + S7.8,42,7.4,41.8L8,40.7c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 + c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 + c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4C8,39,7.9,38.9,7.8,38.7c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 + c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4C9.4,36,9.7,36,10.1,36c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.8,37.7z" + /> + <path class="st3" d="M15.8,36.1h1.1l0.7,2.1l0.7-2.1h1.2L18.4,39l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.8,36.1z"/> + <path class="st3" d="M23.3,42.5v-6.4h1.2v6.4H23.3z"/> + <path class="st3" d="M30.8,37.2h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V37.2z"/> + <path class="st3" d="M31.4,39.2c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 + c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 + c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 + C31.5,40.1,31.4,39.7,31.4,39.2z"/> + <path class="st3" d="M43.5,36.1v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43.5z"/> + <g> + <path class="st3" d="M27.7,70.9v3.5c0,0.6-0.5,1.1-1.1,1.1H13.4c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h3.8 + c-0.1-0.4-0.3-0.9-0.3-1.3h-3.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 + V70C28.7,70.4,28.2,70.7,27.7,70.9z"/> + <path class="st3" d="M29.7,66.6c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H23.1c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C28.3,67.4,28.8,66.6,29.7,66.6 + C29.6,66.6,29.7,66.6,29.7,66.6z"/> + <path class="st3" d="M37.4,71.5c-0.2-0.1-0.4,0-0.6,0.1L35,73.4l0.7,0.7l0.9-0.9c0,0,0.3,1.3-0.7,2.4c-1,1-2.3,0.6-2.3,0.6 + l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,1.7,0.3,3.1-1.1 + c1.3-1.3,1-3.1,1-3.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.6,71.6,37.5,71.5,37.4,71.5z"/> + </g> + <path class="st3" d="M11.8,87.7c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2C9.1,87.4,9,87.6,9,87.8c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 + c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + S7.8,92,7.4,91.8L8,90.7c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 + c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 + c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4C8,89,7.9,88.9,7.8,88.7c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 + c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4C9.4,86,9.7,86,10.1,86c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.8,87.7z" + /> + <path class="st3" d="M15.8,86.1h1.1l0.7,2.1l0.7-2.1h1.2L18.4,89l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.8,86.1z"/> + <path class="st3" d="M23.3,92.5v-6.4h1.2v6.4H23.3z"/> + <path class="st3" d="M30.8,87.2h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V87.2z"/> + <path class="st3" d="M31.4,89.2c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C31.1,90.5,31,90.1,31,89.7z"/> - <path class="st7" d="M43.1,86.5v6.4h-1.2v-2.7H39v2.7h-1.2v-6.4H39v2.6h2.9v-2.6H43.1z"/> - <path class="st7" d="M25.2,121.4v4.5c0,0.6-0.5,1.1-1.1,1.1H10.9c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h6.8 - c-0.1-0.4-0.3-0.9-0.3-1.3h-6.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 + C31.5,90.1,31.4,89.7,31.4,89.2z"/> + <path class="st3" d="M43.5,86.1v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43.5z"/> + <path class="st3" d="M26.6,120.8l0,4.7c0,0.6-0.5,1.1-1.1,1.1H12.3c-0.6,0-1.1-0.5-1.1-1.1V119c0-0.6,0.5-1.1,1.1-1.1h7.2 + c-0.1-0.4-0.3-0.9-0.3-1.3h-6.9c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 - v-5.4C26.1,120.9,25.7,121.2,25.2,121.4z"/> - <path class="st7" d="M29.1,116.1c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 - H22.6c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,116.9,28.3,116.2,29.1,116.1 - C29.1,116.1,29.1,116.1,29.1,116.1z"/> - <path class="st7" d="M35.8,121c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6l0.8-0.8 - l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8L31,128c0,0,2.7,0.3,4.1-1.1 - c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.1,121.1,36,121.1,35.8,121z"/> - <path class="st7" d="M11.3,138.3c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 + v-4.7C27.5,120.8,27,120.7,26.6,120.8z"/> + <path class="st3" d="M38,119h-3.7c-0.5,0-0.9-0.4-1.5-1.4c-0.4-0.6-0.9-1.3-1.3-1.3c-0.5,0-0.9,0.6-1.4,1.2 + c-0.6,0.9-1.1,1.5-1.7,1.5h-3.5c-2.4,0-4.3-1.9-4.3-4.3v-2.3c0-2.4,1.9-4.3,4.3-4.3H38c2.4,0,4.3,1.9,4.3,4.3v2.3 + C42.3,117.1,40.4,119,38,119z M34.5,117.7H38c1.7,0,3.1-1.4,3.1-3v-2.3c0-1.7-1.4-3-3.1-3H24.9c-1.7,0-3.1,1.4-3.1,3v2.3 + c0,1.7,1.4,3,3.1,3h3.4c0.2-0.2,0.6-0.7,0.7-0.9c0.6-0.8,1.2-1.7,2.3-1.8l0.1,0c1.2,0,1.8,1,2.4,1.8 + C34.2,117.4,34.4,117.6,34.5,117.7z"/> + <path class="st3" d="M37.2,120.5c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6 + l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,2.7,0.3,4.1-1.1 + c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.4,120.7,37.3,120.6,37.2,120.5z"/> + <path class="st3" d="M11.6,137.8c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 - c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6s-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 s-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.3,138.3z"/> - <path class="st7" d="M15.2,136.6h1.1l0.7,2.1l0.7-2.1H19l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7L16,143h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L15.2,136.6z"/> - <path class="st7" d="M22.7,143v-6.4H24v6.4H22.7z"/> - <path class="st7" d="M30.3,137.7h-2v5.3H27v-5.3h-2v-1.1h5.3V137.7z"/> - <path class="st7" d="M30.9,139.8c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5 + L11.6,137.8z"/> + <path class="st3" d="M15.6,136.2h1.1l0.7,2.1l0.7-2.1h1.2l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.6,136.2z"/> + <path class="st3" d="M23.1,142.6v-6.4h1.2v6.4H23.1z"/> + <path class="st3" d="M30.7,137.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V137.3z"/> + <path class="st3" d="M31.3,139.3c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7s0.8-0.3,1.3-0.3 c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 - c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C30.9,140.6,30.9,140.2,30.9,139.8z"/> - <path class="st7" d="M43,136.6v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43z"/> - <path class="st7" d="M25.2,171.5v4.5c0,0.6-0.5,1.1-1.1,1.1H10.9c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h6.8 + C31.3,140.1,31.3,139.7,31.3,139.3z"/> + <path class="st3" d="M43.3,136.2v6.4h-1.2v-2.7h-2.9v2.7H38v-6.4h1.2v2.6h2.9v-2.6H43.3z"/> + <path class="st3" d="M26.6,171v4.5c0,0.6-0.5,1.1-1.1,1.1H12.3c-0.6,0-1.1-0.5-1.1-1.1v-6.5c0-0.6,0.5-1.1,1.1-1.1h6.8 c-0.1-0.4-0.3-0.9-0.3-1.3h-6.5c-1.4,0-2.4,1.1-2.4,2.4v6.5c0,1.4,1.1,2.4,2.4,2.4h5.9v1.2h-3.4c-0.3,0-0.6,0.3-0.6,0.7 - s0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7s-0.3-0.7-0.6-0.7h-3.7v-1.2c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4v-5.4 - C26.1,171,25.7,171.2,25.2,171.5z"/> - <path class="st7" d="M29.1,166.2c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1h3.7c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 - H22.6c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C27.8,167,28.3,166.2,29.1,166.2 - C29.1,166.2,29.1,166.2,29.1,166.2z"/> - <path class="st7" d="M35.8,171.1c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6 - l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8L31,178c0,0,2.7,0.3,4.1-1.1 - c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C36.1,171.2,36,171.1,35.8,171.1z"/> - <path class="st7" d="M11.3,188.3c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 - c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.5,0.2 + c0,0.3,0.3,0.7,0.6,0.7h8.5c0.3,0,0.6-0.3,0.6-0.7c0-0.3-0.3-0.7-0.6-0.7h-3.7V178c-0.1,0-0.2,0-0.4,0h6.3c1.4,0,2.4-1.1,2.4-2.4 + v-5.4C27.5,170.5,27.1,170.8,26.6,171z"/> + <path class="st3" d="M31.5,165.7c0.8,0,1.4,0.8,1.9,1.6c0.2,0.4,0.8,1.1,1,1.1H38c2,0,3.7-1.6,3.7-3.7v-2.3c0-2-1.7-3.7-3.7-3.7 + H24.9c-2,0-3.7,1.6-3.7,3.7v2.3c0,2,1.7,3.7,3.7,3.7h3.5c0.3,0,0.8-0.7,1.1-1.2C30.1,166.5,30.7,165.7,31.5,165.7 + C31.5,165.7,31.5,165.7,31.5,165.7z"/> + <path class="st3" d="M37.2,170.6c-0.2-0.1-0.4,0-0.6,0.1l-1.8,1.8l0.7,0.7l0.9-0.9c0,0,0.3,2.3-0.7,3.4c-1,1-3.3,0.6-3.3,0.6 + l0.8-0.8l-0.8-0.8l-1.7,1.7l0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2,0,0.4,0.1,0.6l1.8,1.8l0.8-0.8l-0.9-0.9c0,0,2.7,0.3,4.1-1.1 + c1.3-1.3,1-4.1,1-4.1l0.8,0.8l0.8-0.8l-1.6-1.6C37.4,170.7,37.3,170.7,37.2,170.6z"/> + <path class="st3" d="M11.6,187.9c0,0-0.1-0.1-0.2-0.2c-0.1-0.1-0.3-0.1-0.4-0.2c-0.2-0.1-0.3-0.1-0.5-0.2c-0.2,0-0.4-0.1-0.6-0.1 + c-0.4,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.2,0.3,0.2s0.3,0.1,0.5,0.2 c0.2,0.1,0.4,0.1,0.7,0.2c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.2,0.7,0.4c0.2,0.1,0.3,0.3,0.4,0.5c0.1,0.2,0.1,0.5,0.1,0.8 - c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 - s-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 + c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.3,0.5-0.5,0.6s-0.5,0.3-0.8,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-0.5,0-1-0.1-1.5-0.2 + s-0.9-0.4-1.3-0.6l0.6-1.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.7,0.2c0.2,0.1,0.5,0.1,0.7,0.1 c0.7,0,1.1-0.2,1.1-0.7c0-0.1,0-0.3-0.1-0.4c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.1-0.7-0.2 c-0.3-0.1-0.6-0.2-0.8-0.3c-0.2-0.1-0.4-0.2-0.6-0.4c-0.2-0.1-0.3-0.3-0.3-0.5c-0.1-0.2-0.1-0.4-0.1-0.7c0-0.3,0.1-0.6,0.2-0.9 - c0.1-0.3,0.3-0.5,0.5-0.6s0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5L11.3,188.3z"/> - <path class="st7" d="M15.2,186.7h1.1l0.7,2.1l0.7-2.1H19l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 - l1.8,5l0.8-2L15.2,186.7z"/> - <path class="st7" d="M22.7,193.1v-6.4H24v6.4H22.7z"/> - <path class="st7" d="M30.3,187.8h-2v5.3H27v-5.3h-2v-1.1h5.3V187.8z"/> - <path class="st7" d="M30.9,189.8c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7c0.4-0.2,0.8-0.3,1.3-0.3 + c0.1-0.3,0.3-0.5,0.5-0.6c0.2-0.2,0.5-0.3,0.8-0.4c0.3-0.1,0.6-0.1,0.9-0.1c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.7,0.3,1,0.5 + L11.6,187.9z"/> + <path class="st3" d="M15.6,186.2h1.1l0.7,2.1l0.7-2.1h1.2l-1.1,2.9l0.8,2l1.8-5h1.4l-2.6,6.4h-1l-1.1-2.7l-1.1,2.7h-1l-2.6-6.4h1.3 + l1.8,5l0.8-2L15.6,186.2z"/> + <path class="st3" d="M23.1,192.6v-6.4h1.2v6.4H23.1z"/> + <path class="st3" d="M30.7,187.3h-2v5.3h-1.2v-5.3h-2v-1.1h5.3V187.3z"/> + <path class="st3" d="M31.3,189.4c0-0.4,0.1-0.8,0.2-1.2c0.1-0.4,0.3-0.7,0.6-1.1c0.3-0.3,0.6-0.6,1-0.7s0.8-0.3,1.3-0.3 c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,0.9,1l-1,0.7c-0.1-0.2-0.2-0.3-0.3-0.5c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1-0.1-0.3-0.1-0.4-0.2 - c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2s-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 + c-0.1,0-0.3-0.1-0.4-0.1c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.1-0.4,0.3-0.6,0.5c-0.2,0.2-0.3,0.4-0.3,0.7c-0.1,0.3-0.1,0.5-0.1,0.8 c0,0.3,0,0.6,0.1,0.8c0.1,0.3,0.2,0.5,0.4,0.7c0.2,0.2,0.4,0.4,0.6,0.5c0.2,0.1,0.5,0.2,0.7,0.2c0.1,0,0.3,0,0.4-0.1 c0.1,0,0.3-0.1,0.4-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.3,0.3-0.5l1,0.6c-0.1,0.2-0.2,0.5-0.4,0.7c-0.2,0.2-0.4,0.3-0.6,0.5 c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8c-0.3-0.3-0.5-0.7-0.6-1.1 - C30.9,190.7,30.9,190.2,30.9,189.8z"/> - <path class="st7" d="M43,186.7v6.4h-1.2v-2.7h-2.9v2.7h-1.2v-6.4h1.2v2.6h2.9v-2.6H43z"/> + C31.3,190.2,31.3,189.8,31.3,189.4z"/> + <path class="st3" d="M43.3,186.2v6.4h-1.2v-2.7h-2.9v2.7H38v-6.4h1.2v2.6h2.9v-2.6H43.3z"/> + <path class="st3" d="M21.3,21.1c-1.2-0.1-3-1.4-3.6-3.1h-4.1v6.2h12.6v-3.1H21.3z"/> + <path class="st3" d="M22.8,120.7c-1.3,0-2.2-0.4-3-1.7h-7.2v6.2h12.6v-4.5H22.8z"/> </g> </svg> From 02cc6cc567150909587d9f09c39882b354f5c4a3 Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Fri, 1 Jul 2016 12:18:26 -0700 Subject: [PATCH 16/28] hover states --- .../qml/hifi/toolbars/ToolbarButton.qml | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml index a3be4533d2..4356b18253 100644 --- a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml +++ b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml @@ -8,6 +8,7 @@ Item { property var subImage; property int yOffset: 0 property int buttonState: 0 + property int hoverOffset: 0 property var toolbar; property real size: 50 // toolbar ? toolbar.buttonSize : 50 width: size; height: size @@ -36,9 +37,15 @@ Item { } } - + function updateOffset() { + yOffset = size * (buttonState + hoverOffset); + } onButtonStateChanged: { - yOffset = size * buttonState + hoverOffset = 0; // subtle: show the new state without hover. don't wait for mouse to be moved away + // The above is per UX design, but ALSO avoid a subtle issue that would be a problem because + // the hand controllers don't move the mouse when not triggered, so releasing the trigger would + // never show unhovered. + updateOffset(); } Component.onCompleted: { @@ -58,8 +65,18 @@ Item { } MouseArea { + id: mouseArea + hoverEnabled: true anchors.fill: parent onClicked: button.clicked(); + onEntered: { + hoverOffset = 2; + updateOffset(); + } + onExited: { + hoverOffset = 0; + updateOffset(); + } } } From 1ad9cfde99c3a882537f3d39c4f1821939fde12f Mon Sep 17 00:00:00 2001 From: howard-stearns <howard.stearns@gmail.com> Date: Fri, 1 Jul 2016 13:54:00 -0700 Subject: [PATCH 17/28] make hud button participate in buttonState just like other toolbar chicklets --- interface/resources/qml/hifi/Desktop.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 7a7a6b63df..561bd722f2 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -61,8 +61,8 @@ OriginalDesktop.Desktop { pinned: true, }); - toggleHudButton.yOffset = Qt.binding(function(){ - return desktop.pinned ? 50 : 0 + toggleHudButton.buttonState = Qt.binding(function(){ + return desktop.pinned ? 1 : 0 }); toggleHudButton.clicked.connect(function(){ console.log("Clicked on hud button") From 88d28120b683160a65a291884f09704cc6894593 Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Fri, 1 Jul 2016 15:48:58 -0700 Subject: [PATCH 18/28] Adding missed file --- plugins/openvr/src/OpenVrHelpers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp index 399712d920..c93a2178b5 100644 --- a/plugins/openvr/src/OpenVrHelpers.cpp +++ b/plugins/openvr/src/OpenVrHelpers.cpp @@ -268,6 +268,7 @@ void handleOpenVrEvents() { case vr::VREvent_KeyboardClosed: _keyboardFocusObject = nullptr; _keyboardShown = false; + DependencyManager::get<OffscreenUi>()->unfocusWindows(); break; default: From 760f4366e13e357a66603d81e64c2e2a98087f84 Mon Sep 17 00:00:00 2001 From: David Rowe <david@ctrlaltstudio.com> Date: Sat, 2 Jul 2016 11:25:04 +1200 Subject: [PATCH 19/28] Don't show users border when hover mouse if logged out --- scripts/system/users.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/system/users.js b/scripts/system/users.js index d25e1b76b4..2ff2689bad 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -826,6 +826,10 @@ var usersWindow = (function () { function onMouseMoveEvent(event) { var isVisible; + if (!isLoggedIn) { + return; + } + if (isMovingScrollbar) { if (scrollbarBackgroundPosition.x - WINDOW_MARGIN <= event.x && event.x <= scrollbarBackgroundPosition.x + SCROLLBAR_BACKGROUND_WIDTH + WINDOW_MARGIN From d3c006b5daec2769120f3fed9e1b0696291dd69a Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Fri, 1 Jul 2016 18:50:53 -0700 Subject: [PATCH 20/28] Added floating-point audio resampler --- libraries/audio/src/AudioSRC.cpp | 126 +++++++++++++++++++++++++++++-- libraries/audio/src/AudioSRC.h | 4 + 2 files changed, 122 insertions(+), 8 deletions(-) diff --git a/libraries/audio/src/AudioSRC.cpp b/libraries/audio/src/AudioSRC.cpp index 98de36e655..688e36c777 100644 --- a/libraries/audio/src/AudioSRC.cpp +++ b/libraries/audio/src/AudioSRC.cpp @@ -539,6 +539,58 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram } } +// deinterleave stereo +void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { + + if (_numChannels == 1) { + + memcpy(outputs[0], input, numFrames * sizeof(float)); + + } else if (_numChannels == 2) { + + int i = 0; + for (; i < numFrames - 3; i += 4) { + __m128 f0 = _mm_loadu_ps(&input[2*i + 0]); + __m128 f1 = _mm_loadu_ps(&input[2*i + 4]); + + // deinterleave + _mm_storeu_ps(&outputs[0][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(2,0,2,0))); + _mm_storeu_ps(&outputs[1][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(3,1,3,1))); + } + for (; i < numFrames; i++) { + // deinterleave + outputs[0][i] = input[2*i + 0]; + outputs[1][i] = input[2*i + 1]; + } + } +} + +// interleave stereo +void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { + + if (_numChannels == 1) { + + memcpy(output, inputs[0], numFrames * sizeof(float)); + + } else if (_numChannels == 2) { + + int i = 0; + for (; i < numFrames - 3; i += 4) { + __m128 f0 = _mm_loadu_ps(&inputs[0][i]); + __m128 f1 = _mm_loadu_ps(&inputs[1][i]); + + // interleave + _mm_storeu_ps(&output[2*i + 0], _mm_unpacklo_ps(f0, f1)); + _mm_storeu_ps(&output[2*i + 4], _mm_unpackhi_ps(f0, f1)); + } + for (; i < numFrames; i++) { + // interleave + output[2*i + 0] = inputs[0][i]; + output[2*i + 1] = inputs[1][i]; + } + } +} + #else int AudioSRC::multirateFilter1(const float* input0, float* output0, int inputFrames) { @@ -738,6 +790,38 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram } } +// deinterleave stereo +void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { + + if (_numChannels == 1) { + + memcpy(outputs[0], input, numFrames * sizeof(float)); + + } else if (_numChannels == 2) { + for (int i = 0; i < numFrames; i++) { + // deinterleave + outputs[0][i] = input[2*i + 0]; + outputs[1][i] = input[2*i + 1]; + } + } +} + +// interleave stereo +void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { + + if (_numChannels == 1) { + + memcpy(output, inputs[0], numFrames * sizeof(float)); + + } else if (_numChannels == 2) { + for (int i = 0; i < numFrames; i++) { + // interleave + output[2*i + 0] = inputs[0][i]; + output[2*i + 1] = inputs[1][i]; + } + } +} + #endif int AudioSRC::processFloat(float** inputs, float** outputs, int inputFrames) { @@ -749,19 +833,19 @@ int AudioSRC::processFloat(float** inputs, float** outputs, int inputFrames) { if (_numChannels == 1) { // refill history buffers - memcpy(_history[0] + _numHistory, _inputs[0], nh * sizeof(float)); + memcpy(_history[0] + _numHistory, inputs[0], nh * sizeof(float)); // process history buffer - outputFrames += multirateFilter1(_history[0], _outputs[0], nh); + outputFrames += multirateFilter1(_history[0], outputs[0], nh); // process remaining input if (ni) { - outputFrames += multirateFilter1(_inputs[0], _outputs[0] + outputFrames, ni); + outputFrames += multirateFilter1(inputs[0], outputs[0] + outputFrames, ni); } // shift history buffers if (ni) { - memcpy(_history[0], _inputs[0] + ni, _numHistory * sizeof(float)); + memcpy(_history[0], inputs[0] + ni, _numHistory * sizeof(float)); } else { memmove(_history[0], _history[0] + nh, _numHistory * sizeof(float)); } @@ -769,15 +853,15 @@ int AudioSRC::processFloat(float** inputs, float** outputs, int inputFrames) { } else if (_numChannels == 2) { // refill history buffers - memcpy(_history[0] + _numHistory, _inputs[0], nh * sizeof(float)); - memcpy(_history[1] + _numHistory, _inputs[1], nh * sizeof(float)); + memcpy(_history[0] + _numHistory, inputs[0], nh * sizeof(float)); + memcpy(_history[1] + _numHistory, inputs[1], nh * sizeof(float)); // process history buffer - outputFrames += multirateFilter2(_history[0], _history[1], _outputs[0], _outputs[1], nh); + outputFrames += multirateFilter2(_history[0], _history[1], outputs[0], outputs[1], nh); // process remaining input if (ni) { - outputFrames += multirateFilter2(_inputs[0], _inputs[1], _outputs[0] + outputFrames, _outputs[1] + outputFrames, ni); + outputFrames += multirateFilter2(inputs[0], inputs[1], outputs[0] + outputFrames, outputs[1] + outputFrames, ni); } // shift history buffers @@ -885,6 +969,32 @@ int AudioSRC::render(const int16_t* input, int16_t* output, int inputFrames) { return outputFrames; } +// +// This version handles input/output as interleaved float +// +int AudioSRC::render(const float* input, float* output, int inputFrames) { + int outputFrames = 0; + + while (inputFrames) { + + int ni = std::min(inputFrames, _inputBlock); + + convertInputFromFloat(input, _inputs, ni); + + int no = processFloat(_inputs, _outputs, ni); + assert(no <= SRC_BLOCK); + + convertOutputToFloat(_outputs, output, no); + + input += _numChannels * ni; + output += _numChannels * no; + inputFrames -= ni; + outputFrames += no; + } + + return outputFrames; +} + // the min output frames that will be produced by inputFrames int AudioSRC::getMinOutput(int inputFrames) { if (_step == 0) { diff --git a/libraries/audio/src/AudioSRC.h b/libraries/audio/src/AudioSRC.h index a4aefc5ed7..409507f68e 100644 --- a/libraries/audio/src/AudioSRC.h +++ b/libraries/audio/src/AudioSRC.h @@ -35,6 +35,7 @@ public: ~AudioSRC(); int render(const int16_t* input, int16_t* output, int inputFrames); + int render(const float* input, float* output, int inputFrames); int getMinOutput(int inputFrames); int getMaxOutput(int inputFrames); @@ -78,6 +79,9 @@ private: void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames); void convertOutputToInt16(float** inputs, int16_t* output, int numFrames); + void convertInputFromFloat(const float* input, float** outputs, int numFrames); + void convertOutputToFloat(float** inputs, float* output, int numFrames); + int processFloat(float** inputs, float** outputs, int inputFrames); }; From ad8f17a1425b2cf11de348d8daa250dbb4d8111b Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Fri, 1 Jul 2016 19:29:43 -0700 Subject: [PATCH 21/28] Add support for deinterleaved float-point audio (native format) --- libraries/audio/src/AudioSRC.cpp | 6 +++--- libraries/audio/src/AudioSRC.h | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/audio/src/AudioSRC.cpp b/libraries/audio/src/AudioSRC.cpp index 688e36c777..185ad948e7 100644 --- a/libraries/audio/src/AudioSRC.cpp +++ b/libraries/audio/src/AudioSRC.cpp @@ -824,7 +824,7 @@ void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames #endif -int AudioSRC::processFloat(float** inputs, float** outputs, int inputFrames) { +int AudioSRC::render(float** inputs, float** outputs, int inputFrames) { int outputFrames = 0; int nh = std::min(_numHistory, inputFrames); // number of frames from history buffer @@ -955,7 +955,7 @@ int AudioSRC::render(const int16_t* input, int16_t* output, int inputFrames) { convertInputFromInt16(input, _inputs, ni); - int no = processFloat(_inputs, _outputs, ni); + int no = render(_inputs, _outputs, ni); assert(no <= SRC_BLOCK); convertOutputToInt16(_outputs, output, no); @@ -981,7 +981,7 @@ int AudioSRC::render(const float* input, float* output, int inputFrames) { convertInputFromFloat(input, _inputs, ni); - int no = processFloat(_inputs, _outputs, ni); + int no = render(_inputs, _outputs, ni); assert(no <= SRC_BLOCK); convertOutputToFloat(_outputs, output, no); diff --git a/libraries/audio/src/AudioSRC.h b/libraries/audio/src/AudioSRC.h index 409507f68e..e8c8f4370f 100644 --- a/libraries/audio/src/AudioSRC.h +++ b/libraries/audio/src/AudioSRC.h @@ -34,7 +34,13 @@ public: AudioSRC(int inputSampleRate, int outputSampleRate, int numChannels); ~AudioSRC(); + // deinterleaved float input/output (native format) + int render(float** inputs, float** outputs, int inputFrames); + + // interleaved int16_t input/output int render(const int16_t* input, int16_t* output, int inputFrames); + + // interleaved float input/output int render(const float* input, float* output, int inputFrames); int getMinOutput(int inputFrames); @@ -81,8 +87,6 @@ private: void convertInputFromFloat(const float* input, float** outputs, int numFrames); void convertOutputToFloat(float** inputs, float* output, int numFrames); - - int processFloat(float** inputs, float** outputs, int inputFrames); }; #endif // AudioSRC_h From 941067b9d01d6269da07cc6da87082c3734a0811 Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Sat, 2 Jul 2016 07:25:04 -0700 Subject: [PATCH 22/28] Added floating-point audio reverb --- libraries/audio/src/AudioReverb.cpp | 81 ++++++++++++++++++++++++++++- libraries/audio/src/AudioReverb.h | 7 +++ 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioReverb.cpp b/libraries/audio/src/AudioReverb.cpp index 5c57e92ce5..5f1da56b4c 100644 --- a/libraries/audio/src/AudioReverb.cpp +++ b/libraries/audio/src/AudioReverb.cpp @@ -1725,7 +1725,7 @@ void ReverbImpl::reset() { // Public API // -static const int REVERB_BLOCK = 1024; +static const int REVERB_BLOCK = 256; AudioReverb::AudioReverb(float sampleRate) { @@ -1898,6 +1898,44 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF } } +// deinterleave stereo +void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { + + int i = 0; + for (; i < numFrames - 3; i += 4) { + __m128 f0 = _mm_loadu_ps(&input[2*i + 0]); + __m128 f1 = _mm_loadu_ps(&input[2*i + 4]); + + // deinterleave + _mm_storeu_ps(&outputs[0][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(2,0,2,0))); + _mm_storeu_ps(&outputs[1][i], _mm_shuffle_ps(f0, f1, _MM_SHUFFLE(3,1,3,1))); + } + for (; i < numFrames; i++) { + // deinterleave + outputs[0][i] = input[2*i + 0]; + outputs[1][i] = input[2*i + 1]; + } +} + +// interleave stereo +void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { + + int i = 0; + for(; i < numFrames - 3; i += 4) { + __m128 f0 = _mm_loadu_ps(&inputs[0][i]); + __m128 f1 = _mm_loadu_ps(&inputs[1][i]); + + // interleave + _mm_storeu_ps(&output[2*i + 0],_mm_unpacklo_ps(f0,f1)); + _mm_storeu_ps(&output[2*i + 4],_mm_unpackhi_ps(f0,f1)); + } + for(; i < numFrames; i++) { + // interleave + output[2*i + 0] = inputs[0][i]; + output[2*i + 1] = inputs[1][i]; + } +} + #else // convert int16_t to float, deinterleave stereo @@ -1944,6 +1982,26 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF } } +// deinterleave stereo +void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { + + for (int i = 0; i < numFrames; i++) { + // deinterleave + outputs[0][i] = input[2*i + 0]; + outputs[1][i] = input[2*i + 1]; + } +} + +// interleave stereo +void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { + + for (int i = 0; i < numFrames; i++) { + // interleave + output[2*i + 0] = inputs[0][i]; + output[2*i + 1] = inputs[1][i]; + } +} + #endif // @@ -1966,3 +2024,24 @@ void AudioReverb::render(const int16_t* input, int16_t* output, int numFrames) { numFrames -= n; } } + +// +// This version handles input/output as interleaved float +// +void AudioReverb::render(const float* input, float* output, int numFrames) { + + while (numFrames) { + + int n = MIN(numFrames, REVERB_BLOCK); + + convertInputFromFloat(input, _inout, n); + + _impl->process(_inout, _inout, n); + + convertOutputToFloat(_inout, output, n); + + input += 2 * n; + output += 2 * n; + numFrames -= n; + } +} diff --git a/libraries/audio/src/AudioReverb.h b/libraries/audio/src/AudioReverb.h index 639d62d8ec..ee163698ea 100644 --- a/libraries/audio/src/AudioReverb.h +++ b/libraries/audio/src/AudioReverb.h @@ -64,13 +64,20 @@ public: // interleaved int16_t input/output void render(const int16_t* input, int16_t* output, int numFrames); + // interleaved float input/output + void render(const float* input, float* output, int numFrames); + private: ReverbImpl *_impl; ReverbParameters _params; float* _inout[2]; + void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames); void convertOutputToInt16(float** inputs, int16_t* output, int numFrames); + + void convertInputFromFloat(const float* input, float** outputs, int numFrames); + void convertOutputToFloat(float** inputs, float* output, int numFrames); }; #endif // hifi_AudioReverb_h From b7874116b9377bf6029ac6842c99b15f3221e595 Mon Sep 17 00:00:00 2001 From: humbletim <humbletim@gmail.com> Date: Sat, 2 Jul 2016 23:36:08 -0400 Subject: [PATCH 23/28] fix TypedArray byte ordering and .subarray end indexing --- .../script-engine/src/TypedArrayPrototype.cpp | 4 +- libraries/script-engine/src/TypedArrays.cpp | 12 +++- .../diagnostics/typedArraysUnitTest.js | 58 ++++++++++++++++++- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/TypedArrayPrototype.cpp b/libraries/script-engine/src/TypedArrayPrototype.cpp index bb612b393f..4de948e806 100644 --- a/libraries/script-engine/src/TypedArrayPrototype.cpp +++ b/libraries/script-engine/src/TypedArrayPrototype.cpp @@ -71,8 +71,10 @@ QScriptValue TypedArrayPrototype::subarray(qint32 begin, qint32 end) { end = (end < 0) ? length + end : end; // here we clamp the indices to fit the array + // note: begin offset is *inclusive* while end offset is *exclusive* + // (see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/subarray#Parameters) begin = glm::clamp(begin, 0, (length - 1)); - end = glm::clamp(end, 0, (length - 1)); + end = glm::clamp(end, 0, length); byteOffset += begin * bytesPerElement; length = (end - begin > 0) ? end - begin : 0; diff --git a/libraries/script-engine/src/TypedArrays.cpp b/libraries/script-engine/src/TypedArrays.cpp index c1c4117f76..4d5181ff33 100644 --- a/libraries/script-engine/src/TypedArrays.cpp +++ b/libraries/script-engine/src/TypedArrays.cpp @@ -88,7 +88,11 @@ QScriptValue TypedArray::construct(QScriptContext* context, QScriptEngine* engin if (arrayBuffer) { if (context->argumentCount() == 1) { // Case for entire ArrayBuffer - newObject = cls->newInstance(bufferArg, 0, arrayBuffer->size()); + if (arrayBuffer->size() % cls->_bytesPerElement != 0) { + engine->evaluate("throw \"RangeError: byteLength is not a multiple of BYTES_PER_ELEMENT\""); + } + quint32 length = arrayBuffer->size() / cls->_bytesPerElement; + newObject = cls->newInstance(bufferArg, 0, length); } else { QScriptValue byteOffsetArg = context->argument(1); if (!byteOffsetArg.isNumber()) { @@ -206,6 +210,7 @@ QScriptValue propertyHelper(const QByteArray* arrayBuffer, const QScriptString& QDataStream stream(*arrayBuffer); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); T result; stream >> result; return result; @@ -218,6 +223,7 @@ void setPropertyHelper(QByteArray* arrayBuffer, const QScriptString& name, uint if (arrayBuffer && value.isNumber()) { QDataStream stream(arrayBuffer, QIODevice::ReadWrite); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); stream << (T)value.toNumber(); } @@ -357,6 +363,7 @@ QScriptValue Float32ArrayClass::property(const QScriptValue& object, const QScri if (ok && arrayBuffer) { QDataStream stream(*arrayBuffer); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); stream.setFloatingPointPrecision(QDataStream::SinglePrecision); float result; @@ -375,6 +382,7 @@ void Float32ArrayClass::setProperty(QScriptValue& object, const QScriptString& n if (ba && value.isNumber()) { QDataStream stream(ba, QIODevice::ReadWrite); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); stream.setFloatingPointPrecision(QDataStream::SinglePrecision); stream << (float)value.toNumber(); @@ -392,6 +400,7 @@ QScriptValue Float64ArrayClass::property(const QScriptValue& object, const QScri if (ok && arrayBuffer) { QDataStream stream(*arrayBuffer); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); stream.setFloatingPointPrecision(QDataStream::DoublePrecision); double result; @@ -410,6 +419,7 @@ void Float64ArrayClass::setProperty(QScriptValue& object, const QScriptString& n if (ba && value.isNumber()) { QDataStream stream(ba, QIODevice::ReadWrite); stream.skipRawData(id); + stream.setByteOrder(QDataStream::LittleEndian); stream.setFloatingPointPrecision(QDataStream::DoublePrecision); stream << (double)value.toNumber(); diff --git a/scripts/developer/utilities/diagnostics/typedArraysUnitTest.js b/scripts/developer/utilities/diagnostics/typedArraysUnitTest.js index a50a40e43e..c61865c8d6 100644 --- a/scripts/developer/utilities/diagnostics/typedArraysUnitTest.js +++ b/scripts/developer/utilities/diagnostics/typedArraysUnitTest.js @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -Script.include("../../libraries/unitTest.js"); +Script.include("../../../../script-archive/libraries/unitTest.js"); // e.g. extractbits([0xff, 0x80, 0x00, 0x00], 23, 30); inclusive function extractbits(bytes, lo, hi) { @@ -551,6 +551,20 @@ test('TypedArray.subarray', function () { this.arrayEqual(a.subarray(-1, -4), []); this.arrayEqual(a.subarray(1).subarray(1), [3, 4, 5]); this.arrayEqual(a.subarray(1, 4).subarray(1, 2), [3]); + + var a = new Float32Array(16); + a[0] = -1; + a[15] = 1/8; + this.assertEquals(a.length, 16); + this.assertEquals(a.byteLength, a.length * a.BYTES_PER_ELEMENT); + + this.assertEquals(a.subarray(-12).length, 12, '[-12,)'); + this.arrayEqual(a.subarray(-16), a, '[-16,)'); + this.arrayEqual(a.subarray(12, 16), [0,0,0,1/8], '[12,16)'); + this.arrayEqual(a.subarray(0, 4), [-1,0,0,0],'[0,4)'); + this.arrayEqual(a.subarray(-16, -12), [-1,0,0,0],'[-16,-12)'); + this.assertEquals(a.subarray(0, -12).length, 4,'[0,-12)'); + this.arrayEqual(a.subarray(-10), a.subarray(6),'[-10,)'); }); @@ -706,3 +720,45 @@ test('Regression Tests', function() { this.assertEquals(truncated, -minFloat32, 'smallest 32 bit float should not truncate to zero'); }); +test('new TypedArray(ArrayBuffer).length Tests', function() { + var uint8s = new Uint8Array([0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff]), + buffer = uint8s.buffer; + + this.assertEquals(buffer.byteLength, 8, 'buffer.length'); + + var _this = this; + [ + 'Uint8Array', 'Uint16Array', 'Uint32Array', 'Int8Array', 'Int16Array', 'Int32Array', + 'Float32Array', 'Float64Array', 'Uint8ClampedArray' + ].forEach(function(typeArrayName) { + var typeArray = eval(typeArrayName); + var a = new typeArray(buffer); + _this.assertEquals(a.BYTES_PER_ELEMENT, typeArrayName.match(/\d+/)[0]/8, typeArrayName+'.BYTES_PER_ELEMENT'); + _this.assertEquals(a.byteLength, buffer.byteLength, typeArrayName+'.byteLength'); + _this.assertEquals(a.length, buffer.byteLength / typeArray.BYTES_PER_ELEMENT, typeArrayName+'.length'); + }); +}); + +test('Native endianness check', function() { + var buffer = ArrayBuffer(4); + new Uint8Array(buffer).set([0xaa, 0xbb, 0xcc, 0xdd]); + var endian = { aabbccdd: 'big', ddccbbaa: 'little' }[ + new Uint32Array(buffer)[0].toString(16) + ]; + this.assertEquals(endian, 'little'); +}); + +test('TypeArray byte order tests', function() { + var uint8s = new Uint8Array([0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff]), + buffer = uint8s.buffer; + + this.arrayEqual(new Uint8Array(buffer), [0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff], "Uint8Array"); + this.arrayEqual(new Uint16Array(buffer), [0x00ff, 0x0000, 0x0000, 0xff00], "Uint16Array"); + this.arrayEqual(new Uint32Array(buffer), [0x000000ff, 0xff000000], "Uint32Array"); + + this.arrayEqual(new Int8Array(buffer), [-1,0,0,0,0,0,0,-1], "Int8Array"); + this.arrayEqual(new Int16Array(buffer), [255, 0, 0, -256], "Int16Array"); + + this.arrayEqual(new Float32Array(buffer), [3.5733110840282835e-43, -1.7014118346046923e+38], "Float32Array"); + this.arrayEqual(new Float64Array(buffer), [-5.486124068793999e+303], "Float64Array"); +}); From f7c9957bb1d391a33c096485a9fb1cc637c6600e Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Sun, 3 Jul 2016 11:33:05 -0700 Subject: [PATCH 24/28] PR feedback: better naming of convertInput() and convertOutput() --- libraries/audio/src/AudioSRC.cpp | 28 ++++++++++++++-------------- libraries/audio/src/AudioSRC.h | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/audio/src/AudioSRC.cpp b/libraries/audio/src/AudioSRC.cpp index 185ad948e7..5dba63b349 100644 --- a/libraries/audio/src/AudioSRC.cpp +++ b/libraries/audio/src/AudioSRC.cpp @@ -389,7 +389,7 @@ int AudioSRC::multirateFilter2(const float* input0, const float* input1, float* } // convert int16_t to float, deinterleave stereo -void AudioSRC::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { +void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames) { __m128 scale = _mm_set1_ps(1/32768.0f); if (_numChannels == 1) { @@ -467,8 +467,8 @@ static inline __m128 dither4() { return _mm_mul_ps(d0, _mm_set1_ps(1/65536.0f)); } -// convert float to int16_t, interleave stereo -void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { +// convert float to int16_t with dither, interleave stereo +void AudioSRC::convertOutput(float** inputs, int16_t* output, int numFrames) { __m128 scale = _mm_set1_ps(32768.0f); if (_numChannels == 1) { @@ -540,7 +540,7 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram } // deinterleave stereo -void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { +void AudioSRC::convertInput(const float* input, float** outputs, int numFrames) { if (_numChannels == 1) { @@ -566,7 +566,7 @@ void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int nu } // interleave stereo -void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { +void AudioSRC::convertOutput(float** inputs, float* output, int numFrames) { if (_numChannels == 1) { @@ -726,7 +726,7 @@ int AudioSRC::multirateFilter2(const float* input0, const float* input1, float* } // convert int16_t to float, deinterleave stereo -void AudioSRC::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { +void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames) { const float scale = 1/32768.0f; if (_numChannels == 1) { @@ -750,8 +750,8 @@ static inline float dither() { return (int32_t)(r0 - r1) * (1/65536.0f); } -// convert float to int16_t, interleave stereo -void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { +// convert float to int16_t with dither, interleave stereo +void AudioSRC::convertOutput(float** inputs, int16_t* output, int numFrames) { const float scale = 32768.0f; if (_numChannels == 1) { @@ -791,7 +791,7 @@ void AudioSRC::convertOutputToInt16(float** inputs, int16_t* output, int numFram } // deinterleave stereo -void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int numFrames) { +void AudioSRC::convertInput(const float* input, float** outputs, int numFrames) { if (_numChannels == 1) { @@ -807,7 +807,7 @@ void AudioSRC::convertInputFromFloat(const float* input, float** outputs, int nu } // interleave stereo -void AudioSRC::convertOutputToFloat(float** inputs, float* output, int numFrames) { +void AudioSRC::convertOutput(float** inputs, float* output, int numFrames) { if (_numChannels == 1) { @@ -953,12 +953,12 @@ int AudioSRC::render(const int16_t* input, int16_t* output, int inputFrames) { int ni = std::min(inputFrames, _inputBlock); - convertInputFromInt16(input, _inputs, ni); + convertInput(input, _inputs, ni); int no = render(_inputs, _outputs, ni); assert(no <= SRC_BLOCK); - convertOutputToInt16(_outputs, output, no); + convertOutput(_outputs, output, no); input += _numChannels * ni; output += _numChannels * no; @@ -979,12 +979,12 @@ int AudioSRC::render(const float* input, float* output, int inputFrames) { int ni = std::min(inputFrames, _inputBlock); - convertInputFromFloat(input, _inputs, ni); + convertInput(input, _inputs, ni); int no = render(_inputs, _outputs, ni); assert(no <= SRC_BLOCK); - convertOutputToFloat(_outputs, output, no); + convertOutput(_outputs, output, no); input += _numChannels * ni; output += _numChannels * no; diff --git a/libraries/audio/src/AudioSRC.h b/libraries/audio/src/AudioSRC.h index e8c8f4370f..f7becc22c3 100644 --- a/libraries/audio/src/AudioSRC.h +++ b/libraries/audio/src/AudioSRC.h @@ -82,11 +82,11 @@ private: int multirateFilter1_AVX2(const float* input0, float* output0, int inputFrames); int multirateFilter2_AVX2(const float* input0, const float* input1, float* output0, float* output1, int inputFrames); - void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames); - void convertOutputToInt16(float** inputs, int16_t* output, int numFrames); + void convertInput(const int16_t* input, float** outputs, int numFrames); + void convertOutput(float** inputs, int16_t* output, int numFrames); - void convertInputFromFloat(const float* input, float** outputs, int numFrames); - void convertOutputToFloat(float** inputs, float* output, int numFrames); + void convertInput(const float* input, float** outputs, int numFrames); + void convertOutput(float** inputs, float* output, int numFrames); }; #endif // AudioSRC_h From 014f6fa259f5b12f9492fd534c39fa28a3617f18 Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Sun, 3 Jul 2016 11:40:32 -0700 Subject: [PATCH 25/28] PR feedback: better naming of convertInput() and convertOutput() --- libraries/audio/src/AudioReverb.cpp | 28 ++++++++++++++-------------- libraries/audio/src/AudioReverb.h | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/audio/src/AudioReverb.cpp b/libraries/audio/src/AudioReverb.cpp index 5f1da56b4c..652f7ed58d 100644 --- a/libraries/audio/src/AudioReverb.cpp +++ b/libraries/audio/src/AudioReverb.cpp @@ -1804,7 +1804,7 @@ void AudioReverb::render(float** inputs, float** outputs, int numFrames) { #include <emmintrin.h> // convert int16_t to float, deinterleave stereo -void AudioReverb::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { +void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFrames) { __m128 scale = _mm_set1_ps(1/32768.0f); int i = 0; @@ -1855,8 +1855,8 @@ static inline __m128 dither4() { return _mm_mul_ps(d0, _mm_set1_ps(1/65536.0f)); } -// convert float to int16_t, interleave stereo -void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { +// convert float to int16_t with dither, interleave stereo +void AudioReverb::convertOutput(float** inputs, int16_t* output, int numFrames) { __m128 scale = _mm_set1_ps(32768.0f); int i = 0; @@ -1899,7 +1899,7 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF } // deinterleave stereo -void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { +void AudioReverb::convertInput(const float* input, float** outputs, int numFrames) { int i = 0; for (; i < numFrames - 3; i += 4) { @@ -1918,7 +1918,7 @@ void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int } // interleave stereo -void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { +void AudioReverb::convertOutput(float** inputs, float* output, int numFrames) { int i = 0; for(; i < numFrames - 3; i += 4) { @@ -1939,7 +1939,7 @@ void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFra #else // convert int16_t to float, deinterleave stereo -void AudioReverb::convertInputFromInt16(const int16_t* input, float** outputs, int numFrames) { +void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFrames) { const float scale = 1/32768.0f; for (int i = 0; i < numFrames; i++) { @@ -1957,8 +1957,8 @@ static inline float dither() { return (int32_t)(r0 - r1) * (1/65536.0f); } -// convert float to int16_t, interleave stereo -void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numFrames) { +// convert float to int16_t with dither, interleave stereo +void AudioReverb::convertOutput(float** inputs, int16_t* output, int numFrames) { const float scale = 32768.0f; for (int i = 0; i < numFrames; i++) { @@ -1983,7 +1983,7 @@ void AudioReverb::convertOutputToInt16(float** inputs, int16_t* output, int numF } // deinterleave stereo -void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int numFrames) { +void AudioReverb::convertInput(const float* input, float** outputs, int numFrames) { for (int i = 0; i < numFrames; i++) { // deinterleave @@ -1993,7 +1993,7 @@ void AudioReverb::convertInputFromFloat(const float* input, float** outputs, int } // interleave stereo -void AudioReverb::convertOutputToFloat(float** inputs, float* output, int numFrames) { +void AudioReverb::convertOutput(float** inputs, float* output, int numFrames) { for (int i = 0; i < numFrames; i++) { // interleave @@ -2013,11 +2013,11 @@ void AudioReverb::render(const int16_t* input, int16_t* output, int numFrames) { int n = MIN(numFrames, REVERB_BLOCK); - convertInputFromInt16(input, _inout, n); + convertInput(input, _inout, n); _impl->process(_inout, _inout, n); - convertOutputToInt16(_inout, output, n); + convertOutput(_inout, output, n); input += 2 * n; output += 2 * n; @@ -2034,11 +2034,11 @@ void AudioReverb::render(const float* input, float* output, int numFrames) { int n = MIN(numFrames, REVERB_BLOCK); - convertInputFromFloat(input, _inout, n); + convertInput(input, _inout, n); _impl->process(_inout, _inout, n); - convertOutputToFloat(_inout, output, n); + convertOutput(_inout, output, n); input += 2 * n; output += 2 * n; diff --git a/libraries/audio/src/AudioReverb.h b/libraries/audio/src/AudioReverb.h index ee163698ea..adb8890f6a 100644 --- a/libraries/audio/src/AudioReverb.h +++ b/libraries/audio/src/AudioReverb.h @@ -73,11 +73,11 @@ private: float* _inout[2]; - void convertInputFromInt16(const int16_t* input, float** outputs, int numFrames); - void convertOutputToInt16(float** inputs, int16_t* output, int numFrames); + void convertInput(const int16_t* input, float** outputs, int numFrames); + void convertOutput(float** inputs, int16_t* output, int numFrames); - void convertInputFromFloat(const float* input, float** outputs, int numFrames); - void convertOutputToFloat(float** inputs, float* output, int numFrames); + void convertInput(const float* input, float** outputs, int numFrames); + void convertOutput(float** inputs, float* output, int numFrames); }; #endif // hifi_AudioReverb_h From f43c6447e1abd6c3f3ec8934eef82a217ce0c698 Mon Sep 17 00:00:00 2001 From: Ken Cooke <ken@highfidelity.io> Date: Sun, 3 Jul 2016 11:46:23 -0700 Subject: [PATCH 26/28] remove unneeded #pragma --- libraries/audio/src/AudioReverb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioReverb.cpp b/libraries/audio/src/AudioReverb.cpp index 652f7ed58d..c561231376 100644 --- a/libraries/audio/src/AudioReverb.cpp +++ b/libraries/audio/src/AudioReverb.cpp @@ -13,13 +13,13 @@ #include "AudioReverb.h" #ifdef _MSC_VER -#pragma warning(disable : 4351) // new behavior: elements of array will be default initialized #include <intrin.h> inline static int MULHI(int a, int b) { long long c = __emul(a, b); return ((int*)&c)[1]; } + #else #define MULHI(a,b) (int)(((long long)(a) * (b)) >> 32) From 0ad7aa72fb09f7b67da3399a2ff0cb83d33e05d2 Mon Sep 17 00:00:00 2001 From: David Rowe <david@ctrlaltstudio.com> Date: Mon, 4 Jul 2016 14:34:38 +1200 Subject: [PATCH 27/28] Prevent users window from being dragged offscreen --- scripts/system/users.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 2ff2689bad..853067b90b 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -344,6 +344,7 @@ var usersWindow = (function () { windowTextHeight, windowLineSpacing, windowLineHeight, // = windowTextHeight + windowLineSpacing + windowMinimumHeight, usersOnline, // Raw users data linesOfUsers = [], // Array of indexes pointing into usersOnline @@ -435,6 +436,11 @@ var usersWindow = (function () { } } + function saturateWindowPosition() { + windowPosition.x = Math.max(0, Math.min(viewport.x - WINDOW_WIDTH, windowPosition.x)); + windowPosition.y = Math.max(windowMinimumHeight, Math.min(viewport.y, windowPosition.y)); + } + function updateOverlayPositions() { // Overlay positions are all relative to windowPosition; windowPosition is the position of the windowPane overlay. var windowLeft = windowPosition.x, @@ -854,6 +860,8 @@ var usersWindow = (function () { x: event.x - movingClickOffset.x, y: event.y - movingClickOffset.y }; + + saturateWindowPosition(); calculateWindowHeight(); updateOverlayPositions(); updateUsersDisplay(); @@ -947,6 +955,7 @@ var usersWindow = (function () { windowTextHeight = Math.floor(Overlays.textSize(textSizeOverlay, "1").height); windowLineSpacing = Math.floor(Overlays.textSize(textSizeOverlay, "1\n2").height - 2 * windowTextHeight); windowLineHeight = windowTextHeight + windowLineSpacing; + windowMinimumHeight = windowTextHeight + WINDOW_MARGIN + WINDOW_BASE_MARGIN; Overlays.deleteOverlay(textSizeOverlay); viewport = Controller.getViewportDimensions(); @@ -958,7 +967,6 @@ var usersWindow = (function () { if (offset.hasOwnProperty("x") && offset.hasOwnProperty("y")) { windowPosition.x = offset.x < 0 ? viewport.x + offset.x : offset.x; windowPosition.y = offset.y <= 0 ? viewport.y + offset.y : offset.y; - } else { hmdViewport = Controller.getRecommendedOverlayRect(); windowPosition = { @@ -967,6 +975,7 @@ var usersWindow = (function () { }; } + saturateWindowPosition(); calculateWindowHeight(); windowBorder = Overlays.addOverlay("rectangle", { From d6250d4c5af23014da55b30a54380bce448de65a Mon Sep 17 00:00:00 2001 From: Brad Davis <bdavis@saintandreas.org> Date: Mon, 4 Jul 2016 21:19:14 -0700 Subject: [PATCH 28/28] Fix export entities by region --- interface/src/Application.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1c9ec94dc4..82cbaf93c2 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3049,17 +3049,20 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt } bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) { - glm::vec3 offset(x, y, z); + glm::vec3 center(x, y, z); + glm::vec3 minCorner = center - vec3(scale); + float cubeSize = scale * 2; + AACube boundingCube(minCorner, cubeSize); QVector<EntityItemPointer> entities; QVector<EntityItemID> ids; auto entityTree = getEntities()->getTree(); entityTree->withReadLock([&] { - entityTree->findEntities(AACube(offset, scale), entities); + entityTree->findEntities(boundingCube, entities); foreach(EntityItemPointer entity, entities) { ids << entity->getEntityItemID(); } }); - return exportEntities(filename, ids, &offset); + return exportEntities(filename, ids, ¢er); } void Application::loadSettings() {