jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353493 )
Change subject: Replace CodeMirror icons with new icons (#36C) ...................................................................... Replace CodeMirror icons with new icons (#36C) Bug: T164441 Change-Id: I2e185dfa468ede51bd1a0e41b3b4dcf43a74313c --- M resources/ext.CodeMirror.js M resources/ext.CodeMirror.less A resources/images/cm-icon.png A resources/images/cm-icon.svg M resources/images/cm-off.png M resources/images/cm-off.svg M resources/images/cm-on.png M resources/images/cm-on.svg M resources/images/old-cm-off.png M resources/images/old-cm-off.svg M resources/images/old-cm-on.png M resources/images/old-cm-on.svg 12 files changed, 55 insertions(+), 264 deletions(-) Approvals: jenkins-bot: Verified Kaldari: Looks good to me, approved diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index ed1ae7d..7f766dd 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -242,34 +242,40 @@ * Adds the CodeMirror button to WikiEditor */ function addCodeMirrorToWikiEditor() { - if ( $( '#wikiEditor-section-main' ).length > 0 ) { - $( '#wpTextbox1' ).wikiEditor( - 'addToToolbar', - { - section: 'main', - groups: { - codemirror: { - tools: { - CodeMirror: { - label: mw.msg( 'codemirror-toggle-label' ), - type: 'button', - offset: [ 2, 2 ], - action: { - type: 'callback', - execute: function ( context ) { - // eslint-disable-next-line no-use-before-define - switchCodeMirror( context ); - } + var $codeMirrorButton; + + $( '#wpTextbox1' ).wikiEditor( + 'addToToolbar', + { + section: 'main', + groups: { + codemirror: { + tools: { + CodeMirror: { + label: mw.msg( 'codemirror-toggle-label' ), + type: 'button', + action: { + type: 'callback', + execute: function () { + // eslint-disable-next-line no-use-before-define + switchCodeMirror(); } } } } } } - ); - // eslint-disable-next-line no-use-before-define - updateToolbarButton( $( '#wpTextbox1' ).data( 'wikiEditor-context' ) ); - } + } + ); + + $codeMirrorButton = $( '#wpTextbox1' ).data( 'wikiEditor-context' ).modules.toolbar.$toolbar.find( 'a.tool[rel=CodeMirror]' ); + // FIXME in extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js + $codeMirrorButton + .css( 'background-image', '' ) + .attr( 'id', 'mw-editbutton-codemirror' ); + + // eslint-disable-next-line no-use-before-define + updateToolbarButton(); } // define JQuery hook for searching and replacing text using JS if CodeMirror is enabled, see Bug: T108711 @@ -309,27 +315,17 @@ /** * Updates CodeMirror button on the toolbar according to the current state (on/off) - * - * @param {Object} [wikiEditor] WikiEditor, if present */ - function updateToolbarButton( wikiEditor ) { - if ( wikiEditor ) { - wikiEditor.modules.toolbar.$toolbar.find( 'a.tool[rel=CodeMirror]' ) - .toggleClass( 'tool-codemirror-on', !!useCodeMirror ) - .toggleClass( 'tool-codemirror-off', !useCodeMirror ); - } else { - $( '#mw-editbutton-codemirror' ) - .toggleClass( 'mw-editbutton-codemirror-on', !!useCodeMirror ) - .toggleClass( 'mw-editbutton-codemirror-off', !useCodeMirror ); - } + function updateToolbarButton() { + $( '#mw-editbutton-codemirror' ) + .toggleClass( 'mw-editbutton-codemirror-on', !!useCodeMirror ) + .toggleClass( 'mw-editbutton-codemirror-off', !useCodeMirror ); } /** * Enables or disables CodeMirror - * - * @param {Object} [wikiEditor] WikiEditor, if present */ - function switchCodeMirror( wikiEditor ) { + function switchCodeMirror() { if ( codeMirror ) { setCodeEditorPreference( false ); codeMirror.save(); @@ -342,7 +338,7 @@ enableCodeMirror(); setCodeEditorPreference( true ); } - updateToolbarButton( wikiEditor ); + updateToolbarButton(); } /** diff --git a/resources/ext.CodeMirror.less b/resources/ext.CodeMirror.less index 600820f..b8830a5 100644 --- a/resources/ext.CodeMirror.less +++ b/resources/ext.CodeMirror.less @@ -15,19 +15,25 @@ } .mw-editbutton-codemirror-on { - .background-image-svg( 'images/old-cm-on.svg', 'images/old-cm-on.png' ); + // WikiEditor toolbar + &.tool-button { + .background-image-svg( 'images/cm-on.svg', 'images/cm-on.png' ); + } + // Classic toolbar + &.mw-toolbar-editbutton { + .background-image-svg( 'images/old-cm-on.svg', 'images/old-cm-on.png' ); + } } .mw-editbutton-codemirror-off { - .background-image-svg( 'images/old-cm-off.svg', 'images/old-cm-off.png' ); -} - -.wikiEditor-ui-toolbar .tool-codemirror-on { - .background-image-svg( 'images/cm-on.svg', 'images/cm-on.png' ); -} - -.wikiEditor-ui-toolbar .tool-codemirror-off { - .background-image-svg( 'images/cm-off.svg', 'images/cm-off.png' ); + // WikiEditor toolbar + &.tool-button { + .background-image-svg( 'images/cm-off.svg', 'images/cm-off.png' ); + } + // Classic toolbar + &.mw-toolbar-editbutton { + .background-image-svg( 'images/old-cm-off.svg', 'images/old-cm-off.png' ); + } } .oo-ui-popupWidget.ve-init-mw-switchPopupWidget { diff --git a/resources/images/cm-icon.png b/resources/images/cm-icon.png new file mode 100644 index 0000000..3fb98e8 --- /dev/null +++ b/resources/images/cm-icon.png Binary files differ diff --git a/resources/images/cm-icon.svg b/resources/images/cm-icon.svg new file mode 100644 index 0000000..a79d147 --- /dev/null +++ b/resources/images/cm-icon.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24"><g fill="#36c"><path id="a" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.59.335-.11.872-.25 1.835-.25H10v1h-.752c-.457 0-.77.19-.936.406-.167.216-.312.446-.312 1.07v1.856c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.31.238.76.238 1.49v1.86c0 .62.145.85.312 1.06.166.22.48.41.936.41H10v1H8.973c-.963 0-1.5-.133-1.835-.248a1.578 1.578 0 0 1-.808-.59 1.68 1.68 0 0 1-.257-.626C6.023 16.283 6 15.9 6 15.386V13c0-1 0-1-1-1H4z"/><use transform="matrix(-1 0 0 1 24 0)" width="24" height="24" xlink:href="#a"/></g></svg> \ No newline at end of file diff --git a/resources/images/cm-off.png b/resources/images/cm-off.png index d9fb454..560e02e 100644 --- a/resources/images/cm-off.png +++ b/resources/images/cm-off.png Binary files differ diff --git a/resources/images/cm-off.svg b/resources/images/cm-off.svg index dfd8b8b..bb1e542 100644 --- a/resources/images/cm-off.svg +++ b/resources/images/cm-off.svg @@ -1,25 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" id="svg4587" version="1" width="22" height="22"> - <g id="g4585" transform="translate(-8.168 -7.868) scale(.2995)"> - <circle id="circle4545" cx="85.233" cy="41.768" r="5.993"/> - <circle id="circle4547" cx="71.773" cy="33.995" r="5.992"/> - <circle id="circle4549" cx="93.006" cy="55.229" r="5.993"/> - <circle id="circle4551" cx="56.226" cy="33.995" r="5.994"/> - <circle id="circle4553" cx="93.005" cy="70.773" r="5.992"/> - <path id="path4555" d="M38.527 37.53a5.997 5.997 0 0 1 8.478 0 5.996 5.996 0 0 1 0 8.475 5.998 5.998 0 0 1-8.478.002 5.998 5.998 0 0 1 0-8.477zm42.47 42.465a5.996 5.996 0 0 1 8.474 0 5.995 5.995 0 0 1-8.473 8.477 5.997 5.997 0 0 1 0-8.477zM36.543 49.442a5.99 5.99 0 0 1 4.24 7.338 5.99 5.99 0 0 1-7.34 4.236 5.987 5.987 0 0 1-4.237-7.34 5.987 5.987 0 0 1 7.337-4.234zM70.22 86.216a5.99 5.99 0 0 1 7.34 4.24 5.992 5.992 0 0 1-11.576 3.1 5.992 5.992 0 0 1 4.237-7.34zm-36.78-21.23a5.993 5.993 0 1 1-4.234 7.34 5.987 5.987 0 0 1 4.236-7.34z"/> - <circle id="circle4557" cx="56.226" cy="92.005" r="5.993"/> - <path id="path4559" d="M38.527 79.995a5.998 5.998 0 0 1 8.477 0 5.998 5.998 0 0 1 0 8.477 5.998 5.998 0 0 1-8.477 0 5.998 5.998 0 0 1 0-8.477zm0-33.99a5.998 5.998 0 0 0 8.477 0 5.996 5.996 0 0 0 0-8.476 5.997 5.997 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.474zm-5.083 15.01a5.99 5.99 0 1 0 3.1-11.573 5.988 5.988 0 0 0-7.337 4.234 5.987 5.987 0 0 0 4.237 7.34z"/> - <circle id="circle4561" cx="34.993" cy="70.773" r="5.992"/> - <path id="path4563" d="M47.004 88.472a5.998 5.998 0 0 0 0-8.477 5.998 5.998 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.477 5.998 5.998 0 0 0 8.477 0z"/> - <circle id="circle4565" cx="56.228" cy="92.006" r="5.992"/> - <path id="path4567" d="M62.017 32.445a5.993 5.993 0 0 0-11.577 3.1 5.99 5.99 0 0 0 7.338 4.24 5.996 5.996 0 0 0 4.24-7.34zm13.613 23.84a3.352 3.352 0 0 1 1.227-4.573 3.35 3.35 0 0 1 4.574 1.225 3.35 3.35 0 0 1-5.8 3.35z"/> - <circle id="circle4569" cx="72.389" cy="48.469" r="3.347"/> - <path id="path4571" d="M60.652 46.223a3.347 3.347 0 0 1 3.346-3.35 3.344 3.344 0 0 1 3.35 3.35 3.348 3.348 0 0 1-6.696 0zM77.43 63a3.35 3.35 0 0 1 6.7-.002 3.346 3.346 0 0 1-3.35 3.35A3.347 3.347 0 0 1 77.43 63zM53.934 45.57a3.348 3.348 0 0 1 4.576 1.226 3.347 3.347 0 0 1-1.226 4.575 3.35 3.35 0 0 1-4.575-1.223 3.353 3.353 0 0 1 1.222-4.574z"/> - <circle id="circle4573" cx="78.531" cy="71.391" r="3.349"/> - <path id="path4575" d="M51.142 51.713a3.348 3.348 0 1 1-4.573 1.223 3.344 3.344 0 0 1 4.57-1.223z"/> - <circle id="circle4577" cx="72.391" cy="77.531" r="3.348"/> - <path id="path4579" d="M50.568 63c0 1.85-1.5 3.35-3.347 3.346A3.343 3.343 0 0 1 43.877 63a3.34 3.34 0 0 1 3.346-3.348c1.853 0 3.35 1.5 3.35 3.348z"/> - <circle id="circle4581" cx="64" cy="79.778" r="3.348"/> - <path id="path4583" d="M47.793 68.49a3.35 3.35 0 1 1 3.35 5.8 3.35 3.35 0 0 1-3.35-5.8zM58.51 79.206a3.35 3.35 0 1 1-5.8-3.35 3.35 3.35 0 0 1 5.8 3.35z"/> - </g> -</svg> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1" width="22" height="22"><g transform="translate(-1 -.499)"><path id="a" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.59.335-.11.872-.25 1.835-.25H10v1h-.752c-.457 0-.77.19-.936.406-.167.216-.312.446-.312 1.07v1.856c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.31.238.76.238 1.49v1.86c0 .62.145.85.312 1.06.166.22.48.41.936.41H10v1H8.973c-.963 0-1.5-.133-1.835-.248a1.578 1.578 0 0 1-.808-.59 1.68 1.68 0 0 1-.257-.626C6.023 16.283 6 15.9 6 15.386V13c0-1 0-1-1-1z"/><use transform="matrix(-1 0 0 1 24 0)" width="24" height="24" xlink:href="#a"/></g></svg> \ No newline at end of file diff --git a/resources/images/cm-on.png b/resources/images/cm-on.png index 1b96ec0..b63ce26 100644 --- a/resources/images/cm-on.png +++ b/resources/images/cm-on.png Binary files differ diff --git a/resources/images/cm-on.svg b/resources/images/cm-on.svg index dca8601..2be553c 100644 --- a/resources/images/cm-on.svg +++ b/resources/images/cm-on.svg @@ -1,39 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" id="svg2606" height="22" width="22" version="1"> - <g id="layer1"> - <g id="g2519" transform="translate(-8.168 -7.868) scale(.2995)"> - <circle id="circle2521" r="5.993" cy="41.768" cx="85.233" fill="#fc0"/> - <circle id="circle2523" r="5.992" cy="33.995" cx="71.773" fill="#f90"/> - <circle id="circle2525" r="5.993" cy="55.229" cx="93.006" fill="#ff0"/> - <circle id="circle2527" r="5.994" cy="33.995" cx="56.226" fill="#f60"/> - <circle id="circle2529" r="5.992" cy="70.773" cx="93.005" fill="#9f0"/> - <path id="path2531" d="M38.527 37.53a5.997 5.997 0 0 1 8.478 0 5.996 5.996 0 0 1 0 8.475 5.998 5.998 0 0 1-8.478.002 5.998 5.998 0 0 1 0-8.477z" fill="red"/> - <path id="path2533" d="M80.996 79.995a5.996 5.996 0 0 1 8.475 0A5.995 5.995 0 0 1 81 88.472a5.997 5.997 0 0 1 0-8.477z" fill="#0c0"/> - <path id="path2535" d="M36.544 49.442a5.99 5.99 0 0 1 4.24 7.338 5.99 5.99 0 0 1-7.34 4.236 5.987 5.987 0 0 1-4.237-7.34 5.987 5.987 0 0 1 7.337-4.234z" fill="#c09"/> - <path id="path2537" d="M70.222 86.216a5.99 5.99 0 0 1 7.338 4.24 5.992 5.992 0 0 1-11.575 3.1 5.992 5.992 0 0 1 4.237-7.34z" fill="#099"/> - <path id="path2539" d="M33.443 64.985a5.993 5.993 0 1 1-4.236 7.34 5.987 5.987 0 0 1 4.236-7.34z" fill="#609"/> - <circle id="circle2541" r="5.993" cy="92.005" cx="56.226" fill="#03c"/> - <path id="path2543" d="M38.527 79.995a5.998 5.998 0 0 1 8.477 0 5.998 5.998 0 0 1 0 8.477 5.998 5.998 0 0 1-8.477 0 5.998 5.998 0 0 1 0-8.477z" fill="#309"/> - <path id="path2545" d="M38.527 46.006a5.998 5.998 0 0 0 8.477-.002 5.996 5.996 0 0 0 0-8.475 5.997 5.997 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.473z" fill="none"/> - <path id="path2547" d="M33.444 61.016a5.99 5.99 0 1 0 3.1-11.574 5.988 5.988 0 0 0-7.337 4.234 5.987 5.987 0 0 0 4.237 7.34z" fill="none"/> - <circle id="circle2549" r="5.992" cy="70.773" cx="34.993" fill="none"/> - <path id="path2551" d="M47.004 88.472a5.998 5.998 0 0 0 0-8.477 5.998 5.998 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.477 5.998 5.998 0 0 0 8.477 0z" fill="none"/> - <circle id="circle2553" r="5.992" cy="92.006" cx="56.228" fill="none"/> - <path id="path2555" d="M62.017 32.445a5.993 5.993 0 0 0-11.577 3.1 5.99 5.99 0 0 0 7.338 4.24 5.996 5.996 0 0 0 4.24-7.34z" fill="none"/> - <g id="XMLID_1_"> - <path id="path2558" d="M75.63 56.286a3.352 3.352 0 0 1 1.227-4.574 3.35 3.35 0 0 1 4.574 1.225 3.35 3.35 0 0 1-5.8 3.35z" fill="#ffe500"/> - <circle id="circle2560" r="3.347" cy="48.469" cx="72.389" fill="#ffb200"/> - <path id="path2562" d="M60.652 46.223a3.347 3.347 0 0 1 3.346-3.35 3.344 3.344 0 0 1 3.35 3.35 3.348 3.348 0 0 1-6.696 0z" fill="#ff8000"/> - <path id="path2564" d="M77.43 63a3.348 3.348 0 0 1 6.7-.002 3.346 3.346 0 0 1-3.35 3.35A3.347 3.347 0 0 1 77.43 63z" fill="#cf0"/> - <path id="path2566" d="M53.934 45.57a3.348 3.348 0 0 1 4.576 1.226 3.347 3.347 0 0 1-1.226 4.575 3.35 3.35 0 0 1-4.575-1.222 3.353 3.353 0 0 1 1.22-4.574z" fill="#f30"/> - <circle id="circle2568" r="3.349" cy="71.391" cx="78.531" fill="#3f0"/> - <path id="path2570" d="M51.142 51.713a3.348 3.348 0 1 1-4.573 1.223 3.344 3.344 0 0 1 4.57-1.223z" fill="#e50066"/> - <circle id="circle2572" r="3.348" cy="77.531" cx="72.391" fill="#00b266"/> - <path id="path2574" d="M50.568 63c0 1.85-1.5 3.35-3.347 3.346A3.343 3.343 0 0 1 43.878 63a3.34 3.34 0 0 1 3.346-3.348c1.853 0 3.35 1.5 3.35 3.348z" fill="#909"/> - <circle id="circle2576" r="3.348" cy="79.778" cx="64" fill="#0066b2"/> - <path id="path2578" d="M47.793 68.49a3.35 3.35 0 1 1 3.35 5.8 3.35 3.35 0 0 1-3.35-5.8z" fill="#400099"/> - <path id="path2580" d="M58.51 79.206a3.35 3.35 0 1 1-5.8-3.35 3.35 3.35 0 0 1 5.8 3.35z" fill="#1919b2"/> - </g> - </g> - </g> -</svg> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="22" width="22" version="1"><defs><clipPath id="a"><path transform="scale(-1)" opacity=".546" fill="none" stroke-width="1.417" d="M0 0h22v22H0z"/></clipPath></defs><image clip-path="url(#a)" transform="scale(-1)" width="45.28" height="33" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAhCAIAAACX21boAAAAOklEQVR4AUxMhRVAQQjy3f4L/zjs bgXOBQ4RdTJnt52jx50bg8Rcbm7ne3ntqeE6nFzuO7TLvr5+CgCX2x/ak7EiEwAAAABJRU5ErkJg gg==" x="-32.428" y="-27.5" fill="none" image-rendering="optimizeSpeed"/><g transform="translate(-1 -.499)" fill="#36c"><path id="b" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.59.335-.11.872-.25 1.835-.25H10v1h-.752c-.457 0-.77.19-.936.406-.167.216-.312.446-.312 1.07v1.856c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.31.238.76.238 1.49v1.86c0 .62.145.85.312 1.06.166.22.48.41.936.41H10v1H8.973c-.963 0-1.5-.133-1.835-.248a1.578 1.578 0 0 1-.808-.59 1.68 1.68 0 0 1-.257-.626C6.023 16.283 6 15.9 6 15.386V13c0-1 0-1-1-1z"/><use transform="matrix(-1 0 0 1 24 0)" width="24" height="24" xlink:href="#b"/></g><path fill="none" stroke="#dae5ec" d="M.5.5h21v21H.5z"/><path fill="none" stroke="#eef2f6" d="M.976 1.024h20v20h-20z"/></svg> \ No newline at end of file diff --git a/resources/images/old-cm-off.png b/resources/images/old-cm-off.png index 578a90a..29d4f78 100644 --- a/resources/images/old-cm-off.png +++ b/resources/images/old-cm-off.png Binary files differ diff --git a/resources/images/old-cm-off.svg b/resources/images/old-cm-off.svg index cf7b952..c00972b 100644 --- a/resources/images/old-cm-off.svg +++ b/resources/images/old-cm-off.svg @@ -1,70 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" height="22" width="23"> - <defs id="defs4"> - <linearGradient id="linearGradient1"> - <stop offset="0" id="stop1" stop-color="#d7e7fe"/> - <stop offset=".632" id="stop2" stop-color="#a3b6d0"/> - <stop offset=".895" id="stop3" stop-color="#90a3bd"/> - <stop offset="1" id="stop4" stop-color="#7588a3"/> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient2" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3018" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3022" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3026" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3030" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3034" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3038" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3042" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3046" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3050" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3054" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3058" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3062" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3066" y2="20.5" x2="0" y1="1.5"/> - <filter id="filter4646" color-interpolation-filters="sRGB"> - <feGaussianBlur id="feGaussianBlur4648" stdDeviation=".72"/> - </filter> - </defs> - <path id="rect3016" fill="url(#linearGradient3018)" d="M.5.5h22v21H.5z"/> - <path id="rect3020" fill="url(#linearGradient3022)" d="M.5.5h22v21H.5z"/> - <path id="rect3024" fill="url(#linearGradient3026)" d="M.5.5h22v21H.5z"/> - <path id="rect3028" fill="url(#linearGradient3030)" d="M.5.5h22v21H.5z"/> - <path id="rect3032" fill="url(#linearGradient3034)" d="M.5.5h22v21H.5z"/> - <path id="rect3036" fill="url(#linearGradient3038)" d="M.5.5h22v21H.5z"/> - <path id="rect3040" fill="url(#linearGradient3042)" d="M.5.5h22v21H.5z"/> - <path id="rect3044" fill="url(#linearGradient3046)" d="M.5.5h22v21H.5z"/> - <path id="rect3048" fill="url(#linearGradient3050)" d="M.5.5h22v21H.5z"/> - <path id="rect3052" fill="url(#linearGradient3054)" d="M.5.5h22v21H.5z"/> - <path id="rect3056" fill="url(#linearGradient3058)" d="M.5.5h22v21H.5z"/> - <path id="rect3060" fill="url(#linearGradient3062)" d="M.5.5h22v21H.5z"/> - <path id="rect3064" fill="url(#linearGradient3066)" d="M.5.5h22v21H.5z"/> - <path id="rect12" fill="url(#linearGradient2)" d="M.5.5h22v21H.5z"/> - <path id="path14" d="M22.1 0v1H1v20.1H0V.9S0 0 .9 0" fill="#fff"/> - <path id="path16" d="M22 1l.1-1s.9 0 .9.9v20.2s0 .9-.9.9H.9s-.9 0-.9-.9l1-.1h21" fill="#435978"/> - <text style="line-height:125%;-inkscape-font-specification:Sans" id="text2991" y="8.576" x="8.203" font-size="12" font-weight="400" letter-spacing="0" word-spacing="0" font-family="Sans"/> - <g id="g4347"> - <g id="g4585" transform="matrix(.237 0 0 .237 -3.656 -3.92)"> - <circle id="circle4545" cx="85.233" cy="41.768" r="5.993"/> - <circle id="circle4547" cx="71.773" cy="33.995" r="5.992"/> - <circle id="circle4549" cx="93.006" cy="55.229" r="5.993"/> - <circle id="circle4551" cx="56.226" cy="33.995" r="5.994"/> - <circle id="circle4553" cx="93.005" cy="70.773" r="5.992"/> - <path id="path4555" d="M38.527 37.53a5.997 5.997 0 0 1 8.478 0 5.996 5.996 0 0 1 0 8.475 5.998 5.998 0 0 1-8.478.002 5.998 5.998 0 0 1 0-8.477zm42.47 42.465a5.996 5.996 0 0 1 8.474 0A5.995 5.995 0 0 1 81 88.472a5.997 5.997 0 0 1 0-8.477zM36.543 49.442a5.99 5.99 0 0 1 4.24 7.338 5.99 5.99 0 0 1-7.34 4.236 5.987 5.987 0 0 1-4.237-7.34 5.987 5.987 0 0 1 7.337-4.234zM70.22 86.216a5.99 5.99 0 0 1 7.34 4.24 5.992 5.992 0 0 1-11.576 3.1 5.992 5.992 0 0 1 4.237-7.34zm-36.78-21.23a5.993 5.993 0 1 1-4.234 7.34 5.987 5.987 0 0 1 4.236-7.34z"/> - <circle id="circle4557" cx="56.226" cy="92.005" r="5.993"/> - <path id="path4559" d="M38.527 79.995a5.998 5.998 0 0 1 8.477 0 5.998 5.998 0 0 1 0 8.477 5.998 5.998 0 0 1-8.477 0 5.998 5.998 0 0 1 0-8.477zm0-33.99a5.998 5.998 0 0 0 8.477 0 5.996 5.996 0 0 0 0-8.476 5.997 5.997 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.473zm-5.083 15.01a5.99 5.99 0 1 0 3.1-11.573 5.988 5.988 0 0 0-7.337 4.234 5.987 5.987 0 0 0 4.237 7.34z"/> - <circle id="circle4561" cx="34.993" cy="70.773" r="5.992"/> - <path id="path4563" d="M47.004 88.472a5.998 5.998 0 0 0 0-8.477 5.998 5.998 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.477 5.998 5.998 0 0 0 8.477 0z"/> - <circle id="circle4565" cx="56.228" cy="92.006" r="5.992"/> - <path id="path4567" d="M62.017 32.445a5.993 5.993 0 0 0-11.577 3.1 5.99 5.99 0 0 0 7.338 4.24 5.996 5.996 0 0 0 4.24-7.34zm13.613 23.84a3.352 3.352 0 0 1 1.227-4.573 3.35 3.35 0 0 1 4.574 1.225 3.35 3.35 0 0 1-5.8 3.35z"/> - <circle id="circle4569" cx="72.389" cy="48.469" r="3.347"/> - <path id="path4571" d="M60.652 46.223a3.347 3.347 0 0 1 3.346-3.35 3.344 3.344 0 0 1 3.35 3.35 3.348 3.348 0 0 1-6.696 0zM77.43 63a3.35 3.35 0 0 1 6.7-.002 3.346 3.346 0 0 1-3.35 3.35A3.347 3.347 0 0 1 77.43 63zM53.934 45.57a3.348 3.348 0 0 1 4.576 1.226 3.347 3.347 0 0 1-1.226 4.575 3.35 3.35 0 0 1-4.575-1.222 3.353 3.353 0 0 1 1.22-4.574z"/> - <circle id="circle4573" cx="78.531" cy="71.391" r="3.349"/> - <path id="path4575" d="M51.142 51.713a3.348 3.348 0 1 1-4.573 1.223 3.344 3.344 0 0 1 4.57-1.223z"/> - <circle id="circle4577" cx="72.391" cy="77.531" r="3.348"/> - <path id="path4579" d="M50.568 63c0 1.85-1.5 3.35-3.347 3.346A3.343 3.343 0 0 1 43.878 63a3.34 3.34 0 0 1 3.346-3.348c1.853 0 3.35 1.5 3.35 3.348z"/> - <circle id="circle4581" cx="64" cy="79.778" r="3.348"/> - <path id="path4583" d="M47.793 68.49a3.35 3.35 0 1 1 3.35 5.8 3.35 3.35 0 0 1-3.35-5.8zM58.51 79.206a3.35 3.35 0 1 1-5.8-3.35 3.35 3.35 0 0 1 5.8 3.35z"/> - </g> - <path id="circle3121-3" d="M293.1-26.356c-.18.01-.386.06-.568.08-.496.057-.992.117-1.462.245-.06.01-.102.06-.163.08-1.057.304-2.047.84-2.923 1.46-.225.16-.442.31-.65.485-.345.29-.674.557-.975.892-.207.227-.39.486-.57.73-.1.13-.158.272-.247.406-.66.992-1.198 2.076-1.462 3.248-.016.078.016.167 0 .245-.104.525-.226 1.08-.242 1.623-.003.106 0 .22 0 .325v.163a9.75 9.75 0 0 0 .324 2.356c.1.367.27.708.406 1.054.056.138.106.274.165.408.18.402.423.77.65 1.138.138.22.25.44.406.65.127.17.27.325.41.487.31.37.61.736.972 1.055.06.052.106.113.165.163.38.32.792.635 1.218.894.053.032.11.05.163.08a9.5 9.5 0 0 0 1.3.65c.337.135.7.23 1.054.326.62.17 1.29.2 1.95.245.585.038 1.19.07 1.787 0a9.67 9.67 0 0 0 3.25-.975c.366-.184.72-.343 1.054-.568.19-.13.39-.265.57-.407.32-.248.61-.528.893-.812.04-.04.04-.12.08-.16a9.66 9.66 0 0 0 1.382-1.785c.02-.032.06-.05.08-.08.03-.053.05-.11.08-.164.277-.495.544-.992.73-1.54.054-.153.037-.33.083-.487.13-.45.26-.903.323-1.38.114-.81.1-1.675 0-2.516a9.828 9.828 0 0 0-.243-1.38c-.023-.088-.056-.16-.08-.245a9.82 9.82 0 0 0-2.925-4.55 10.64 10.64 0 0 0-1.058-.81c-.164-.107-.32-.227-.49-.325-.127-.074-.274-.094-.405-.162-.976-.506-2.034-.902-3.168-1.055a9.166 9.166 0 0 0-1.87-.08zm25.908 0c-5.406 0-9.746 4.42-9.746 9.827a9.716 9.716 0 0 0 9.746 9.75c5.407 0 9.828-4.34 9.828-9.745 0-5.405-4.42-9.826-9.828-9.826zm-47.35 12.67c-2.506 0-4.99 1.012-6.902 2.923a9.75 9.75 0 0 0 0 13.807 9.748 9.748 0 0 0 13.806 0 9.75 9.75 0 0 0 0-13.807c-1.912-1.91-4.396-2.924-6.903-2.924zm69.36 0c-5.407 0-9.746 4.42-9.746 9.827a9.715 9.715 0 0 0 9.746 9.75c5.407 0 9.827-4.34 9.827-9.745 0-5.406-4.42-9.827-9.827-9.827zm-34.68 11.613c-3.018.002-5.44 2.498-5.44 5.523a5.422 5.422 0 0 0 5.44 5.442 5.422 5.422 0 0 0 5.442-5.442c0-3.025-2.414-5.53-5.44-5.523zm13.726 3.655c-3.02 0-5.523 2.503-5.523 5.523 0 3.02 2.508 5.44 5.528 5.44a5.423 5.423 0 0 0 5.442-5.44c0-3.02-2.423-5.523-5.443-5.523zm-28.1.08c-.707.09-1.376.273-2.03.65-2.612 1.51-3.538 4.856-2.032 7.473 1.51 2.614 4.86 3.538 7.472 2.03 2.62-1.51 3.542-4.85 2.03-7.47-1.13-1.964-3.324-2.945-5.44-2.682zm-32.406 6.66c-4.544-.274-8.848 2.66-10.07 7.23-1.406 5.225 1.676 10.623 6.902 12.02 5.22 1.4 10.62-1.68 12.02-6.904 1.4-5.223-1.68-10.625-6.903-12.02a9.776 9.776 0 0 0-1.95-.325zm94.13 0c-5.407 0-9.746 4.42-9.746 9.828a9.715 9.715 0 0 0 9.746 9.746c5.407 0 9.827-4.34 9.827-9.746 0-5.407-4.42-9.827-9.827-9.827zm-71.47 3.33a5.557 5.557 0 0 0-4.387 2.762c-1.504 2.62-.58 5.966 2.036 7.472 2.62 1.51 5.96.59 7.472-2.03 1.51-2.62.59-5.966-2.03-7.472a5.358 5.358 0 0 0-3.087-.73zm47.186 0c-.705.088-1.376.355-2.03.732-2.614 1.51-3.537 4.855-2.03 7.472 1.512 2.617 4.854 3.54 7.47 2.03 2.617-1.506 3.544-4.853 2.032-7.472-1.134-1.96-3.327-3.023-5.442-2.76zM278.887 25.38a5.413 5.413 0 0 0-5.44 5.44c-.003 3.022 2.498 5.442 5.52 5.442a5.42 5.42 0 0 0 5.443-5.442c0-3.02-2.497-5.44-5.523-5.44zm54.903 0c-3.02-.003-5.52 2.418-5.523 5.44.002 3.024 2.5 5.44 5.523 5.442a5.415 5.415 0 0 0 5.44-5.442 5.423 5.423 0 0 0-5.44-5.44zm-75.45 8.364c-.19.01-.38.06-.57.08a9.828 9.828 0 0 0-1.38.245c-.086.02-.158.05-.243.08-1.084.322-2.116.802-3.005 1.46-.238.172-.43.373-.65.57-.276.24-.484.54-.73.81-.22.24-.46.47-.65.73-.105.14-.23.26-.326.406-.186.282-.33.59-.487.892-.488.93-.897 1.93-1.06 3.004-.04.27.02.538 0 .812-.016.22-.08.423-.08.65v.16c.003.32.04.65.08.976.052.468.126.935.243 1.38.006.026-.007.056 0 .082.016.06.063.1.08.16.167.57.39 1.104.65 1.626.202.403.4.773.65 1.138.044.065.118.1.163.163.16.225.307.443.486.65.29.345.558.674.894.975.228.202.487.388.732.568.11.082.21.166.323.244 2.268 1.526 5.194 2.142 8.04 1.38 1.21-.324 2.3-.93 3.25-1.625.08-.06.166-.1.244-.162.09-.07.154-.17.242-.243.402-.34.793-.656 1.136-1.057A9.422 9.422 0 0 0 268 47.3c.023-.056.06-.106.08-.16.135-.34.23-.705.325-1.058a9.76 9.76 0 0 0 .243-1.22c.113-.812.1-1.676 0-2.517a9.695 9.695 0 0 0-.244-1.38c-.01-.036-.07-.05-.08-.083-.174-.614-.37-1.226-.65-1.786-.773-1.542-1.87-2.81-3.25-3.735-.177-.12-.384-.214-.57-.322a9.957 9.957 0 0 0-1.136-.568c-.056-.025-.106-.06-.162-.08-.34-.136-.702-.23-1.056-.327a9.36 9.36 0 0 0-1.218-.245c-.63-.086-1.3-.12-1.95-.08zm95.348 0a9.716 9.716 0 0 0-9.746 9.746c0 5.406 4.34 9.827 9.746 9.827 5.406 0 9.827-4.42 9.827-9.827 0-5.406-4.42-9.746-9.827-9.746zm-23.634 5.28c-3.022 0-5.442 2.5-5.442 5.522a5.42 5.42 0 0 0 5.442 5.44c3.02 0 5.523-2.42 5.523-5.44 0-3.022-2.502-5.523-5.523-5.523zm-48.162.08c-.705.088-1.375.273-2.03.65-2.616 1.51-3.542 4.855-2.03 7.472 1.51 2.615 4.853 3.54 7.47 2.03 2.615-1.512 3.538-4.856 2.032-7.472-1.135-1.965-3.325-2.943-5.442-2.68zm10.396 9.99a5.548 5.548 0 0 0-4.386 2.76c-1.512 2.617-.583 5.962 2.03 7.473 2.618 1.51 5.963.585 7.473-2.03 1.51-2.617.593-5.963-2.03-7.472a5.363 5.363 0 0 0-3.087-.73zm27.776 0c-3.02 0-5.523 2.42-5.523 5.44 0 3.022 2.508 5.524 5.528 5.524 3.02 0 5.442-2.502 5.442-5.523a5.42 5.42 0 0 0-5.443-5.44zM306.34 52.75a5.422 5.422 0 0 0-5.443 5.44c0 3.02 2.42 5.523 5.442 5.523 3.02 0 5.44-2.502 5.44-5.523a5.42 5.42 0 0 0-5.44-5.44zm-34.68 3.004c-2.507 0-4.993.932-6.904 2.842a9.75 9.75 0 0 0 0 13.807 9.748 9.748 0 0 0 13.806 0 9.748 9.748 0 0 0 0-13.807c-1.91-1.91-4.397-2.842-6.903-2.842zm69.358 0c-2.506 0-4.992.933-6.903 2.842a9.746 9.746 0 0 0 0 13.807 9.748 9.748 0 0 0 13.807 0 9.743 9.743 0 0 0 0-13.807c-1.91-1.91-4.398-2.843-6.904-2.842zm-47.35 12.67c-.675 0-1.392.03-2.03.162-.637.13-1.2.32-1.786.568-3.514 1.487-6.01 4.96-6.01 9.015 0 5.402 4.42 9.823 9.827 9.823.67 0 1.31-.032 1.944-.163 4.46-.912 7.797-4.933 7.797-9.664a9.694 9.694 0 0 0-2.842-6.904 9.693 9.693 0 0 0-6.903-2.843zm24.772 0c-.65.038-1.297.15-1.95.324-5.224 1.402-8.304 6.798-6.903 12.02 1.4 5.223 6.793 8.307 12.02 6.904 5.218-1.4 8.304-6.798 6.904-12.02-1.22-4.573-5.52-7.5-10.07-7.23z" fill-opacity=".5" transform="matrix(.14507 0 0 .14507 -32.948 6.652)"/> - </g> -</svg> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="22" width="23"><defs><linearGradient id="a"><stop offset="0" stop-color="#d7e7fe"/><stop offset=".632" stop-color="#a3b6d0"/><stop offset=".895" stop-color="#90a3bd"/><stop offset="1" stop-color="#7588a3"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="o" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="b" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="c" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="d" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="e" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="f" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="g" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="h" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="i" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="j" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="k" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="l" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="m" y2="20.5" x2="0" y1="1.5"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="n" y2="20.5" x2="0" y1="1.5"/></defs><path fill="url(#b)" d="M.5.5h22v21H.5z"/><path fill="url(#c)" d="M.5.5h22v21H.5z"/><path fill="url(#d)" d="M.5.5h22v21H.5z"/><path fill="url(#e)" d="M.5.5h22v21H.5z"/><path fill="url(#f)" d="M.5.5h22v21H.5z"/><path fill="url(#g)" d="M.5.5h22v21H.5z"/><path fill="url(#h)" d="M.5.5h22v21H.5z"/><path fill="url(#i)" d="M.5.5h22v21H.5z"/><path fill="url(#j)" d="M.5.5h22v21H.5z"/><path fill="url(#k)" d="M.5.5h22v21H.5z"/><path fill="url(#l)" d="M.5.5h22v21H.5z"/><path fill="url(#m)" d="M.5.5h22v21H.5z"/><path fill="url(#n)" d="M.5.5h22v21H.5z"/><path fill="url(#o)" d="M.5.5h22v21H.5z"/><path d="M22.1 0v1H1v20.1H0V.9S0 0 .9 0" fill="#fff"/><path d="M22 1l.1-1s.9 0 .9.9v20.2s0 .9-.9.9H.9s-.9 0-.9-.9l1-.1h21" fill="#435978"/><g transform="translate(-.5 -.499)"><path id="p" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.59.335-.11.872-.25 1.835-.25H10v1h-.752c-.457 0-.77.19-.936.406-.167.216-.312.446-.312 1.07v1.856c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.31.238.76.238 1.49v1.86c0 .62.145.85.312 1.06.166.22.48.41.936.41H10v1H8.973c-.963 0-1.5-.133-1.835-.248a1.578 1.578 0 0 1-.808-.59 1.68 1.68 0 0 1-.257-.626C6.023 16.283 6 15.9 6 15.386V13c0-1 0-1-1-1z"/><use transform="matrix(-1 0 0 1 24 0)" width="24" height="24" xlink:href="#p"/></g></svg> \ No newline at end of file diff --git a/resources/images/old-cm-on.png b/resources/images/old-cm-on.png index b263f3b..97325a0 100644 --- a/resources/images/old-cm-on.png +++ b/resources/images/old-cm-on.png Binary files differ diff --git a/resources/images/old-cm-on.svg b/resources/images/old-cm-on.svg index bb8f45e..145109f 100644 --- a/resources/images/old-cm-on.svg +++ b/resources/images/old-cm-on.svg @@ -1,82 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" height="22" width="23"> - <defs id="defs4"> - <linearGradient id="linearGradient1"> - <stop offset="0" id="stop1" stop-color="#d7e7fe"/> - <stop offset=".632" id="stop2" stop-color="#a3b6d0"/> - <stop offset=".895" id="stop3" stop-color="#90a3bd"/> - <stop offset="1" id="stop4" stop-color="#7588a3"/> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient2" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3018" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3022" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3026" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3030" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3034" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3038" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3042" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3046" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3050" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3054" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3058" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3062" y2="20.5" x2="0" y1="1.5"/> - <linearGradient gradientUnits="userSpaceOnUse" xlink:href="#linearGradient1" id="linearGradient3066" y2="20.5" x2="0" y1="1.5"/> - <filter id="filter4646" color-interpolation-filters="sRGB"> - <feGaussianBlur id="feGaussianBlur4648" stdDeviation=".72"/> - </filter> - </defs> - <path id="rect3016" fill="url(#linearGradient3018)" d="M.5.5h22v21H.5z"/> - <path id="rect3020" fill="url(#linearGradient3022)" d="M.5.5h22v21H.5z"/> - <path id="rect3024" fill="url(#linearGradient3026)" d="M.5.5h22v21H.5z"/> - <path id="rect3028" fill="url(#linearGradient3030)" d="M.5.5h22v21H.5z"/> - <path id="rect3032" fill="url(#linearGradient3034)" d="M.5.5h22v21H.5z"/> - <path id="rect3036" fill="url(#linearGradient3038)" d="M.5.5h22v21H.5z"/> - <path id="rect3040" fill="url(#linearGradient3042)" d="M.5.5h22v21H.5z"/> - <path id="rect3044" fill="url(#linearGradient3046)" d="M.5.5h22v21H.5z"/> - <path id="rect3048" fill="url(#linearGradient3050)" d="M.5.5h22v21H.5z"/> - <path id="rect3052" fill="url(#linearGradient3054)" d="M.5.5h22v21H.5z"/> - <path id="rect3056" fill="url(#linearGradient3058)" d="M.5.5h22v21H.5z"/> - <path id="rect3060" fill="url(#linearGradient3062)" d="M.5.5h22v21H.5z"/> - <path id="rect3064" fill="url(#linearGradient3066)" d="M.5.5h22v21H.5z"/> - <path id="rect12" fill="url(#linearGradient2)" d="M.5.5h22v21H.5z"/> - <path id="path14" d="M22.1 0v1H1v20.1H0V.9S0 0 .9 0" fill="#fff"/> - <path id="path16" d="M22 1l.1-1s.9 0 .9.9v20.2s0 .9-.9.9H.9s-.9 0-.9-.9l1-.1h21" fill="#435978"/> - <text style="line-height:125%;-inkscape-font-specification:Sans" id="text2991" y="8.576" x="8.203" font-size="12" font-weight="400" letter-spacing="0" word-spacing="0" font-family="Sans"/> - <g id="layer1"> - <path transform="translate(-32.95 6.562) scale(.14507)" fill-opacity=".5" d="M293.1-26.356c-.18.01-.386.06-.568.08-.496.057-.992.117-1.462.245-.06.01-.102.06-.163.08-1.057.304-2.047.84-2.923 1.46-.225.16-.442.31-.65.485-.345.29-.674.557-.975.892-.207.227-.39.486-.57.73-.1.13-.158.272-.247.406-.66.992-1.198 2.076-1.462 3.248-.016.078.016.167 0 .245-.104.525-.226 1.08-.242 1.623-.003.106 0 .22 0 .325v.163a9.75 9.75 0 0 0 .324 2.356c.1.367.27.708.406 1.054.056.138.106.274.165.408.18.402.423.77.65 1.138.138.22.25.44.406.65.127.17.27.325.41.487.31.37.61.736.972 1.055.06.052.106.113.165.163.38.32.792.635 1.218.894.053.032.11.05.163.08a9.5 9.5 0 0 0 1.3.65c.337.135.7.23 1.054.326.62.17 1.29.2 1.95.245.585.038 1.19.07 1.787 0a9.67 9.67 0 0 0 3.25-.975c.366-.184.72-.343 1.054-.568.19-.13.39-.265.57-.407.32-.248.61-.528.893-.812.04-.04.04-.12.08-.16a9.66 9.66 0 0 0 1.382-1.785c.02-.032.06-.05.08-.08.03-.053.05-.11.08-.164.277-.495.544-.992.73-1.54.054-.153.037-.33.083-.487.13-.45.26-.903.323-1.38.114-.81.1-1.675 0-2.516a9.828 9.828 0 0 0-.243-1.38c-.023-.088-.056-.16-.08-.245a9.82 9.82 0 0 0-2.925-4.55 10.64 10.64 0 0 0-1.058-.81c-.164-.107-.32-.227-.49-.325-.127-.074-.274-.094-.405-.162-.976-.506-2.034-.902-3.168-1.055a9.166 9.166 0 0 0-1.87-.08zm25.908 0c-5.406 0-9.746 4.42-9.746 9.827a9.716 9.716 0 0 0 9.746 9.75c5.407 0 9.828-4.34 9.828-9.745 0-5.405-4.42-9.826-9.828-9.826zm-47.35 12.67c-2.506 0-4.99 1.012-6.902 2.923a9.75 9.75 0 0 0 0 13.807 9.748 9.748 0 0 0 13.806 0 9.75 9.75 0 0 0 0-13.807c-1.912-1.91-4.396-2.924-6.903-2.924zm69.36 0c-5.407 0-9.746 4.42-9.746 9.827a9.715 9.715 0 0 0 9.746 9.75c5.407 0 9.827-4.34 9.827-9.745 0-5.406-4.42-9.827-9.827-9.827zm-34.68 11.613c-3.018.002-5.44 2.498-5.44 5.523a5.422 5.422 0 0 0 5.44 5.442 5.422 5.422 0 0 0 5.442-5.442c0-3.025-2.414-5.53-5.44-5.523zm13.726 3.655c-3.02 0-5.523 2.503-5.523 5.523 0 3.02 2.508 5.44 5.528 5.44a5.423 5.423 0 0 0 5.442-5.44c0-3.02-2.423-5.523-5.443-5.523zm-28.1.08c-.707.09-1.376.273-2.03.65-2.612 1.51-3.538 4.856-2.032 7.473 1.51 2.614 4.86 3.538 7.472 2.03 2.62-1.51 3.542-4.85 2.03-7.47-1.13-1.964-3.324-2.945-5.44-2.682zm-32.406 6.66c-4.544-.274-8.848 2.66-10.07 7.23-1.406 5.225 1.676 10.623 6.902 12.02 5.22 1.4 10.62-1.68 12.02-6.904 1.4-5.223-1.68-10.625-6.903-12.02a9.776 9.776 0 0 0-1.95-.325zm94.13 0c-5.407 0-9.746 4.42-9.746 9.828a9.715 9.715 0 0 0 9.746 9.746c5.407 0 9.827-4.34 9.827-9.746 0-5.407-4.42-9.827-9.827-9.827zm-71.47 3.33a5.557 5.557 0 0 0-4.387 2.762c-1.504 2.62-.58 5.966 2.036 7.472 2.62 1.51 5.96.59 7.472-2.03 1.51-2.62.59-5.966-2.03-7.472a5.358 5.358 0 0 0-3.087-.73zm47.186 0c-.705.088-1.376.355-2.03.732-2.614 1.51-3.537 4.855-2.03 7.472 1.512 2.617 4.854 3.54 7.47 2.03 2.617-1.506 3.544-4.853 2.032-7.472-1.134-1.96-3.327-3.023-5.442-2.76zM278.887 25.38a5.413 5.413 0 0 0-5.44 5.44c-.003 3.022 2.498 5.442 5.52 5.442a5.42 5.42 0 0 0 5.443-5.442c0-3.02-2.497-5.44-5.523-5.44zm54.903 0c-3.02-.003-5.52 2.418-5.523 5.44.002 3.024 2.5 5.44 5.523 5.442a5.415 5.415 0 0 0 5.44-5.442 5.423 5.423 0 0 0-5.44-5.44zm-75.45 8.364c-.19.01-.38.06-.57.08a9.828 9.828 0 0 0-1.38.245c-.086.02-.158.05-.243.08-1.084.322-2.116.802-3.005 1.46-.238.172-.43.373-.65.57-.276.24-.484.54-.73.81-.22.24-.46.47-.65.73-.105.14-.23.26-.326.406-.186.282-.33.59-.487.892-.488.93-.897 1.93-1.06 3.004-.04.27.02.538 0 .812-.016.22-.08.423-.08.65v.16c.003.32.04.65.08.976.052.468.126.935.243 1.38.006.026-.007.056 0 .082.016.06.063.1.08.16.167.57.39 1.104.65 1.626.202.403.4.773.65 1.138.044.065.118.1.163.163.16.225.307.443.486.65.29.345.558.674.894.975.228.202.487.388.732.568.11.082.21.166.323.244 2.268 1.526 5.194 2.142 8.04 1.38 1.21-.324 2.3-.93 3.25-1.625.08-.06.166-.1.244-.162.09-.07.154-.17.242-.243.402-.34.793-.656 1.136-1.057A9.422 9.422 0 0 0 268 47.3c.023-.056.06-.106.08-.16.135-.34.23-.705.325-1.058a9.76 9.76 0 0 0 .243-1.22c.113-.812.1-1.676 0-2.517a9.695 9.695 0 0 0-.244-1.38c-.01-.036-.07-.05-.08-.083-.174-.614-.37-1.226-.65-1.786-.773-1.542-1.87-2.81-3.25-3.735-.177-.12-.384-.214-.57-.322a9.957 9.957 0 0 0-1.136-.568c-.056-.025-.106-.06-.162-.08-.34-.136-.702-.23-1.056-.327a9.36 9.36 0 0 0-1.218-.245c-.63-.086-1.3-.12-1.95-.08zm95.348 0a9.716 9.716 0 0 0-9.746 9.746c0 5.406 4.34 9.827 9.746 9.827 5.406 0 9.827-4.42 9.827-9.827 0-5.406-4.42-9.746-9.827-9.746zm-23.634 5.28c-3.022 0-5.442 2.5-5.442 5.522a5.42 5.42 0 0 0 5.442 5.44c3.02 0 5.523-2.42 5.523-5.44 0-3.022-2.502-5.523-5.523-5.523zm-48.162.08c-.705.088-1.375.273-2.03.65-2.616 1.51-3.542 4.855-2.03 7.472 1.51 2.615 4.853 3.54 7.47 2.03 2.615-1.512 3.538-4.856 2.032-7.472-1.135-1.965-3.325-2.943-5.442-2.68zm10.396 9.99a5.548 5.548 0 0 0-4.386 2.76c-1.512 2.617-.583 5.962 2.03 7.473 2.618 1.51 5.963.585 7.473-2.03 1.51-2.617.593-5.963-2.03-7.472a5.363 5.363 0 0 0-3.087-.73zm27.776 0c-3.02 0-5.523 2.42-5.523 5.44 0 3.022 2.508 5.524 5.528 5.524 3.02 0 5.442-2.502 5.442-5.523a5.42 5.42 0 0 0-5.443-5.44zM306.34 52.75a5.422 5.422 0 0 0-5.443 5.44c0 3.02 2.42 5.523 5.442 5.523 3.02 0 5.44-2.502 5.44-5.523a5.42 5.42 0 0 0-5.44-5.44zm-34.68 3.004c-2.507 0-4.993.932-6.904 2.842a9.75 9.75 0 0 0 0 13.807 9.748 9.748 0 0 0 13.806 0 9.748 9.748 0 0 0 0-13.807c-1.91-1.91-4.397-2.842-6.903-2.842zm69.358 0c-2.506 0-4.992.933-6.903 2.842a9.746 9.746 0 0 0 0 13.807 9.748 9.748 0 0 0 13.807 0 9.743 9.743 0 0 0 0-13.807c-1.91-1.91-4.398-2.843-6.904-2.842zm-47.35 12.67c-.675 0-1.392.03-2.03.162-.637.13-1.2.32-1.786.568-3.514 1.487-6.01 4.96-6.01 9.015 0 5.402 4.42 9.823 9.827 9.823.67 0 1.31-.032 1.944-.163 4.46-.912 7.797-4.933 7.797-9.664a9.694 9.694 0 0 0-2.842-6.904 9.693 9.693 0 0 0-6.903-2.843zm24.772 0c-.65.038-1.297.15-1.95.324-5.224 1.402-8.304 6.798-6.903 12.02 1.4 5.223 6.793 8.307 12.02 6.904 5.218-1.4 8.304-6.798 6.904-12.02-1.22-4.573-5.52-7.5-10.07-7.23z" id="circle3121"/> - <g transform="matrix(.237 0 0 .237 -3.657 -4.01)" id="g2519"> - <circle fill="#fc0" cx="85.233" cy="41.768" r="5.993" id="circle2521"/> - <circle fill="#f90" cx="71.773" cy="33.995" r="5.992" id="circle2523"/> - <circle fill="#ff0" cx="93.006" cy="55.229" r="5.993" id="circle2525"/> - <circle fill="#f60" cx="56.226" cy="33.995" r="5.994" id="circle2527"/> - <circle fill="#9f0" cx="93.005" cy="70.773" r="5.992" id="circle2529"/> - <path fill="red" d="M38.527 37.53a5.997 5.997 0 0 1 8.478 0 5.996 5.996 0 0 1 0 8.475 5.998 5.998 0 0 1-8.478.002 5.998 5.998 0 0 1 0-8.477z" id="path2531"/> - <path fill="#0c0" d="M80.996 79.995a5.996 5.996 0 0 1 8.475 0A5.995 5.995 0 0 1 81 88.472a5.997 5.997 0 0 1 0-8.477z" id="path2533"/> - <path fill="#c09" d="M36.544 49.442a5.99 5.99 0 0 1 4.24 7.338 5.99 5.99 0 0 1-7.34 4.236 5.987 5.987 0 0 1-4.237-7.34 5.987 5.987 0 0 1 7.337-4.234z" id="path2535"/> - <path fill="#099" d="M70.222 86.216a5.99 5.99 0 0 1 7.338 4.24 5.992 5.992 0 0 1-11.575 3.1 5.992 5.992 0 0 1 4.237-7.34z" id="path2537"/> - <path fill="#609" d="M33.443 64.985a5.993 5.993 0 1 1-4.236 7.34 5.987 5.987 0 0 1 4.236-7.34z" id="path2539"/> - <circle fill="#03c" cx="56.226" cy="92.005" r="5.993" id="circle2541"/> - <path fill="#309" d="M38.527 79.995a5.998 5.998 0 0 1 8.477 0 5.998 5.998 0 0 1 0 8.477 5.998 5.998 0 0 1-8.477 0 5.998 5.998 0 0 1 0-8.477z" id="path2543"/> - <path fill="none" d="M38.527 46.006a5.998 5.998 0 0 0 8.477-.002 5.996 5.996 0 0 0 0-8.475 5.997 5.997 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.472z" id="path2545"/> - <path fill="none" d="M33.444 61.016a5.99 5.99 0 1 0 3.1-11.574 5.988 5.988 0 0 0-7.337 4.234 5.987 5.987 0 0 0 4.237 7.34z" id="path2547"/> - <circle fill="none" cx="34.993" cy="70.773" r="5.992" id="circle2549"/> - <path fill="none" d="M47.004 88.472a5.998 5.998 0 0 0 0-8.477 5.998 5.998 0 0 0-8.477 0 5.998 5.998 0 0 0 0 8.477 5.998 5.998 0 0 0 8.477 0z" id="path2551"/> - <circle fill="none" cx="56.228" cy="92.006" r="5.992" id="circle2553"/> - <path fill="none" d="M62.017 32.445a5.993 5.993 0 0 0-11.577 3.1 5.99 5.99 0 0 0 7.338 4.24 5.996 5.996 0 0 0 4.24-7.34z" id="path2555"/> - <g id="XMLID_1_"> - <path fill="#ffe500" d="M75.63 56.286a3.352 3.352 0 0 1 1.227-4.574 3.35 3.35 0 0 1 4.574 1.225 3.35 3.35 0 0 1-5.8 3.35z" id="path2558"/> - <circle fill="#ffb200" cx="72.389" cy="48.469" r="3.347" id="circle2560"/> - <path fill="#ff8000" d="M60.652 46.223a3.347 3.347 0 0 1 3.346-3.35 3.344 3.344 0 0 1 3.35 3.35 3.348 3.348 0 0 1-6.696 0z" id="path2562"/> - <path fill="#cf0" d="M77.43 63a3.35 3.35 0 0 1 6.7-.002 3.346 3.346 0 0 1-3.35 3.35A3.347 3.347 0 0 1 77.43 63z" id="path2564"/> - <path fill="#f30" d="M53.934 45.57a3.348 3.348 0 0 1 4.576 1.226 3.347 3.347 0 0 1-1.226 4.575 3.35 3.35 0 0 1-4.575-1.22 3.353 3.353 0 0 1 1.22-4.575z" id="path2566"/> - <circle fill="#3f0" cx="78.531" cy="71.391" r="3.349" id="circle2568"/> - <path fill="#e50066" d="M51.142 51.713a3.348 3.348 0 1 1-4.573 1.223 3.344 3.344 0 0 1 4.57-1.223z" id="path2570"/> - <circle fill="#00b266" cx="72.391" cy="77.531" r="3.348" id="circle2572"/> - <path fill="#909" d="M50.568 63c0 1.85-1.5 3.35-3.347 3.346A3.343 3.343 0 0 1 43.88 63a3.34 3.34 0 0 1 3.346-3.348c1.853 0 3.35 1.5 3.35 3.348z" id="path2574"/> - <circle fill="#0066b2" cx="64" cy="79.778" r="3.348" id="circle2576"/> - <path fill="#400099" d="M47.793 68.49a3.35 3.35 0 1 1 3.35 5.8 3.35 3.35 0 0 1-3.35-5.8z" id="path2578"/> - <path fill="#1919b2" d="M58.51 79.206a3.35 3.35 0 1 1-5.8-3.35 3.35 3.35 0 0 1 5.8 3.35z" id="path2580"/> - </g> - </g> - </g> -</svg> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="22" width="23"><defs><linearGradient id="a"><stop offset="0" stop-color="#d7e7fe"/><stop offset=".632" stop-color="#a3b6d0"/><stop offset=".895" stop-color="#90a3bd"/><stop offset="1" stop-color="#7588a3"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="o" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="b" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="c" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="d" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="e" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="f" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="g" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="h" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="i" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="j" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="k" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="l" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="m" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/><linearGradient gradientUnits="userSpaceOnUse" xlink:href="#a" id="n" y2="20.5" x2="0" y1="1.5" gradientTransform="rotate(-180 11.5 11)"/></defs><path d="M22.5 21.5H.5V.5h22z" fill="url(#b)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#c)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#d)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#e)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#f)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#g)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#h)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#i)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#j)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#k)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#l)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#m)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#n)"/><path d="M22.5 21.5H.5V.5h22z" fill="url(#o)"/><path d="M.9 22v-1H22V.9h1v20.2s0 .9-.9.9" fill="#fff"/><path d="M1 21l-.1 1s-.9 0-.9-.9V.9S0 0 .9 0h21.2s.9 0 .9.9L22 1H1" fill="#435978"/><g transform="translate(-.5 -.499)" fill="#36c"><path id="p" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.59.335-.11.872-.25 1.835-.25H10v1h-.752c-.457 0-.77.19-.936.406-.167.216-.312.446-.312 1.07v1.856c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.31.238.76.238 1.49v1.86c0 .62.145.85.312 1.06.166.22.48.41.936.41H10v1H8.973c-.963 0-1.5-.133-1.835-.248a1.578 1.578 0 0 1-.808-.59 1.68 1.68 0 0 1-.257-.626C6.023 16.283 6 15.9 6 15.386V13c0-1 0-1-1-1z"/><use transform="matrix(-1 0 0 1 24 0)" width="24" height="24" xlink:href="#p"/></g></svg> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/353493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e185dfa468ede51bd1a0e41b3b4dcf43a74313c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Pastakhov <pastak...@yandex.ru> Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org> Gerrit-Reviewer: Niharika29 <nko...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits