http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css index 2461ffa..511fa78 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css @@ -17,9 +17,6 @@ /* status history dialog */ #status-history-dialog { - display: none; - z-index: 1301; - padding: 10px; cursor: move; } @@ -34,15 +31,7 @@ #status-history-refresh-container { width: 100%; - height: 24px; -} - -#status-history-last-refreshed-container { - float: left; - color: #666; - font-weight: normal; - margin-top: 6px; - margin-left: 3px; + height: 32px; } #status-history-loading-container { @@ -58,12 +47,6 @@ font-weight: bold; } -#status-history-refresh-button { - height: 24px; - width: 26px; - float: left; -} - #status-history-loading-container { float: left; width: 16px; @@ -75,26 +58,20 @@ #status-history-metric-combo { float: right; - height: 18px; - line-height: 18px; width: 175px; } #status-history-container { float: left; - margin-left: 2px; - margin-bottom: 35px; - margin-top: -50px; + margin-bottom: 30px; } #status-history-chart-container { - width: 494px; + width: 100%; height: 325px; border: 1px solid #aaa; background-color: #fff; overflow: hidden; - padding: 5px; - margin-top: 5px; cursor: default; } @@ -106,15 +83,11 @@ #status-history-details { float: left; - width: 275px; - padding-top: 8px; - padding: 3px; overflow: auto; - margin-top: -50px; } div.status-history-detail { - margin-bottom: 12px; + margin-bottom: 12px; cursor: auto; } @@ -148,7 +121,7 @@ div.detail-item-value { margin-top: 5px; cursor: default; overflow: hidden; - padding: 5px; + width: 100%; } div.legend-entry {
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css index e882f89..f3f31fa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css @@ -22,40 +22,23 @@ #summary { position: absolute; top: 0px; - bottom: 0px; + bottom: 35px; left: 0px; right: 0px; } -#summary-header-and-filter { - height: 35px; - margin-top: 20px; - margin-left: 20px; - margin-right: 20px; -} - #summary-header-text { - float: left; - font-size: 16px; + font-size: 18px; font-weight: bold; + color: #728E9B; + font-family: Roboto Slab; + margin-bottom: 30px; } #flow-summary-refresh-container { - height: 27px; - margin-left: 20px; - margin-right: 20px; - margin-top: 18px; - border-bottom: 2px solid #666; -} - -#summary-last-refreshed-container { - float: left; - color: #666; - font-weight: normal; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; + position: absolute; + width: 100%; + bottom: 0px; } #summary-loading-container { @@ -81,59 +64,31 @@ div.status-text { line-height: normal; } -#refresh-button { - height: 24px; - width: 26px; - float: left; -} - /* view options */ #view-options-container { display: none; - color: #9F6000; - font-weight: bold; - line-height: normal; - float: left; - clear: left; - margin-top: 4px; -} - -span.view-summary-link { - color: #31849B; - cursor: pointer; - font-weight: bold; - line-height: normal; - text-decoration: underline; + float: right; + margin-top: 12px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; } /* view single node dialog */ #view-single-node-dialog { display: none; - width: 327px; - height: 130px; - z-index: 1301; } #cluster-search-example { - color: #9F6000; + color: #775351; font-weight: bold; line-height: normal; margin-top: 3px; margin-left: 5px; } -#cluster-search-field { - padding: 3px 0px 1px 3px; - font-size: 12px; - height: 18px; - line-height: 20px; - width: 300px; - border: 1px solid #ccc; - margin-right: 3px; -} - div.search-match { margin-left: 5px; color: #888; @@ -158,66 +113,12 @@ input.search-nodes { color: #888; } -/* filter controls */ - -#summary-filter-controls { - float: right; -} - -#summary-filter-container { - height: 24px; - width: 318px; -} - -#summary-filter { - padding: 3px 0px 1px 3px; - font-size: 12px; - height: 18px; - line-height: 20px; - width: 173px; - border: 1px solid #ccc; - margin-right: 3px; - float: left; -} - -input.summary-filter-list { - color: #888; -} - -#summary-filter-type { - width: 127px; - height: 18px; - line-height: 18px; - float: left; -} - -#summary-filter-status { - font-size: 9px; - font-weight: bold; - color: #9f6000; - clear: left; - line-height: normal; - margin-left: 5px; -} - /* system diagnostics dialog */ -#system-diagnostics-refresh-container { - height: 27px; - margin-left: 10px; - margin-right: 10px; - margin-top: -5px; - border-bottom: 2px solid #666; -} - -#system-diagnostics-last-refreshed-container { - float: left; - color: #666; - font-weight: normal; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; +#system-diagnostics-refresh-container{ + position: absolute; + top: 66px; + right: 20px; } #system-diagnostics-loading-container { @@ -234,9 +135,13 @@ input.summary-filter-list { } #system-diagnostics-refresh-button { - height: 24px; - width: 26px; - float: left; + float: right; +} + +#system-diagnostics-last-refreshed-container { + float: right; + margin-right: 5px; + margin-left: 0px; } #system-diagnostics-loading-container { @@ -250,65 +155,52 @@ input.summary-filter-list { #system-diagnostics-dialog div.configuration-tab { display: none; - padding: 15px 10px 10px 10px; } #system-diagnostics-link-container { - position: absolute; - right: 20px; - top: 80px; + float: right; + margin-top: 8px; } -#system-diagnostics-dialog div.settings-left { - width: 190px; - float: left; +#heap-table { + border-collapse: collapse; } -#system-diagnostics-dialog div.settings-right { - width: 190px; - float: left; +#heap-table tr{ + height: 20px; } -#heap-table { - border-collapse: collapse; +#heap-table span { + font-weight: bold; } -#heap-table .memory-header { - padding-right: 15px; +#available-processors { + font-weight: bold; } -#garbage-collection-container { - border: 1px solid #aaa; - height: 207px; - overflow-y: scroll; - padding: 3px; +#processor-load-average { + font-weight: bold; } #garbage-collection-table { border-collapse: collapse; } -#garbage-collection-table td { - padding-right: 20px; +#garbage-collection-table tr { + height: 20px; } #content-repository-storage-usage-container { - border: 1px solid #aaa; height: 179px; overflow-y: scroll; - padding: 3px; } #content-repository-storage-usage-container div.storage-usage { margin-bottom: 10px; } -span.storage-identifier { - float: left; -} - -span.storage-usage-details { - float: right; +.storage-usage-details { + padding-top: 4px; } div.storage-usage-progressbar { @@ -363,9 +255,6 @@ div.storage-usage-progressbar div.ui-progressbar-value { top: 103px; left: 20px; right: 20px; - background-color: transparent; - background: linear-gradient(to bottom, #dddddd, #ffffff); - filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr=#dddddd, endColorstr=#ffffff); } #summary div.configuration-tab { @@ -374,11 +263,10 @@ div.storage-usage-progressbar div.ui-progressbar-value { div.summary-table { position: absolute; - top: 115px; - left: 25px; - bottom: 20px; - right: 25px; - border: 1px solid #666; + top: 151px; + left: 0px; + bottom: 0px; + right: 0px; overflow: hidden; background-color: #fff; } @@ -395,17 +283,10 @@ span.sorted { /* cluster processor summary table */ -#cluster-processor-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-processor-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-processor-summary-header { @@ -421,14 +302,6 @@ span.sorted { float: left; } -#cluster-processor-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-processor-summary-last-refreshed { font-weight: bold; } @@ -471,17 +344,10 @@ span.sorted { /* cluster input port summary table */ -#cluster-input-port-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-input-port-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-input-port-summary-header { @@ -497,14 +363,6 @@ span.sorted { float: left; } -#cluster-input-port-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-input-port-summary-last-refreshed { font-weight: bold; } @@ -548,17 +406,10 @@ span.sorted { /* cluster output port summary table */ -#cluster-output-port-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-output-port-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-output-port-summary-header { @@ -574,14 +425,6 @@ span.sorted { float: left; } -#cluster-output-port-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-output-port-summary-last-refreshed { font-weight: bold; } @@ -625,17 +468,10 @@ span.sorted { /* cluster remote process group summary table */ -#cluster-remote-process-group-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-remote-process-group-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-remote-process-group-summary-header { @@ -651,14 +487,6 @@ span.sorted { float: left; } -#cluster-remote-process-group-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-remote-process-group-summary-last-refreshed { font-weight: bold; } @@ -700,17 +528,11 @@ span.sorted { /* cluster connection summary table */ -#cluster-connection-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-connection-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + width: 100%; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-connection-summary-header { @@ -726,14 +548,6 @@ span.sorted { float: left; } -#cluster-connection-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-connection-summary-last-refreshed { font-weight: bold; } @@ -776,17 +590,10 @@ span.sorted { /* cluster process group summary table */ -#cluster-process-group-summary-dialog { - display: none; - width: 778px; - height: 450px; - z-index: 1301; -} - #cluster-process-group-summary-table { - width: 758px; - height: 300px; - border-bottom: 1px solid #666; + overflow: hidden; + height: 80%; + width: 100%; } #cluster-process-group-summary-header { @@ -802,14 +609,6 @@ span.sorted { float: left; } -#cluster-process-group-summary-last-refreshed-container { - float: left; - margin-top: 6px; - margin-left: 3px; - -webkit-user-select: none; - -moz-user-select: none; -} - #cluster-process-group-summary-last-refreshed { font-weight: bold; } http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css index 623a8ef..fb7e665 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css @@ -24,36 +24,22 @@ bottom: 0px; left: 0px; right: 0px; -} - -#templates-header-and-filter { - height: 35px; - margin-top: 20px; - margin-left: 20px; - margin-right: 20px; + height: 90%; + overflow: auto; } #templates-header-text { - float: left; - font-size: 16px; + font-size: 18px; font-weight: bold; + color: #728E9B; + font-family: Roboto Slab; + margin-bottom: 30px; } #templates-refresh-container { - height: 26px; - margin-left: 20px; - margin-right: 20px; - margin-top: 18px; - -webkit-user-select: none; - -moz-user-select: none; -} - -#templates-last-refreshed-container { - float: left; - color: #666; - font-weight: normal; - margin-top: 6px; - margin-left: 3px; + position: absolute; + width: 100%; + bottom: 0px; } #templates-loading-container { @@ -73,12 +59,6 @@ padding-top: 10px; } -#refresh-button { - height: 24px; - width: 26px; - float: left; -} - /* filter controls */ #templates-filter-controls { @@ -86,17 +66,12 @@ } #templates-filter-container { - height: 24px; + height: 32px; width: 318px; } #templates-filter { - padding: 3px 0px 1px 3px; - font-size: 12px; - height: 18px; - line-height: 20px; width: 173px; - border: 1px solid #ccc; margin-right: 3px; float: left; } @@ -106,19 +81,12 @@ input.templates-filter-list { } #templates-filter-type { - width: 127px; - height: 18px; - line-height: 18px; + width: 120px; float: left; } -#templates-filter-stats { - font-size: 9px; - font-weight: bold; - color: #9f6000; - clear: left; - line-height: normal; - margin-left: 5px; +#new-template-description { + height: 210px; } /* upload */ @@ -152,25 +120,11 @@ input.templates-filter-list { color: #888888; } -.template-button { - height: 20px; - line-height: 20px; - float: right; - border-top: 1px solid #d1d1d1; - border-right: 1px solid #a7a7a7; - border-bottom: 1px solid #828282; - border-left: 1px solid #a7a7a7; - cursor: pointer; - font-weight: bold; - padding: 0 10px; -} - -#cancel-upload-template-button { - margin-right: 4px; -} - #upload-template-container { float: right; + position: relative; + top: -28px; + overflow: hidden; } #submit-template-container { @@ -178,11 +132,13 @@ input.templates-filter-list { } #selected-template-name { - color: #444444; float: right; font-weight: bold; margin-right: 20px; margin-top: 6px; + font-family: Roboto; + font-size: 13px; + color: #728e9b; } #upload-template-status { @@ -191,13 +147,16 @@ input.templates-filter-list { margin-right: 20px; margin-top: 6px; line-height: normal; + font-family: Roboto; + font-size: 13px; + color: #728e9b; } -#select-template-button { - margin: 0; - width: 50px; - overflow: hidden; - position: relative; +#upload-template-container button { + float: right; + font-size: 16px; + line-height: 14px; + margin-left: 1px; } #template-upload-form-container { @@ -219,11 +178,8 @@ input.templates-filter-list { /* templates table */ #templates-table { - position: absolute; - top: 100px; - left: 20px; - bottom: 20px; - right: 20px; - border: 1px solid #666; overflow: hidden; + height: 70%; + width: 100%; + top: -28px; } http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css index 99d76e8..e731854 100755 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css @@ -1,13 +1,13 @@ @font-face { - font-family: 'flowfont'; - src: url('./flowfont.eot?17998772'); - src: url('./flowfont.eot?17998772#iefix') format('embedded-opentype'), - url('./flowfont.woff2?17998772') format('woff2'), - url('./flowfont.woff?17998772') format('woff'), - url('./flowfont.ttf?17998772') format('truetype'), - url('./flowfont.svg?17998772#flowfont') format('svg'); - font-weight: normal; - font-style: normal; + font-family: 'flowfont'; + src: url('./flowfont.eot?33669169'); + src: url('./flowfont.eot?33669169#iefix') format('embedded-opentype'), + url('./flowfont.woff2?33669169') format('woff2'), + url('./flowfont.woff?33669169') format('woff'), + url('./flowfont.ttf?33669169') format('truetype'), + url('./flowfont.svg?33669169#flowfont') format('svg'); + font-weight: normal; + font-style: normal; } /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ @@ -15,47 +15,47 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'flowfont'; - src: url('../font/flowfont.svg?17998772#flowfont') format('svg'); + src: url('../font/flowfont.svg?33669169#flowfont') format('svg'); } } */ - + [class^="icon-"]:before, [class*=" icon-"]:before { font-family: "flowfont"; font-style: normal; font-weight: normal; speak: none; - + display: inline-block; text-decoration: inherit; width: 1em; margin-right: .2em; text-align: center; /* opacity: .8; */ - + /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; - + /* Animation center compensation - margins should be symmetric */ /* remove if not needed */ /*margin-left: .2em;*/ - + /* you can be more comfortable with increased icons size */ /* font-size: 120%; */ - + /* Font smoothing. That was taken from TWBS */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - + /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } - -.icon-bulletin:before { content: '\e800'; } /* 'î ' */ + +.icon-funnel-add:before { content: '\e800'; } /* 'î ' */ .icon-counter:before { content: '\e801'; } /* 'î ' */ .icon-enable-false:before { content: '\e802'; } /* 'î ' */ .icon-funnel:before { content: '\e803'; } /* 'î ' */ @@ -68,7 +68,19 @@ .icon-transmit-false:before { content: '\e80a'; } /* 'î ' */ .icon-zoom-actual:before { content: '\e80b'; } /* 'î ' */ .icon-zoom-fit:before { content: '\e80c'; } /* 'î ' */ +.icon-label-add:before { content: '\e80d'; } /* 'î ' */ +.icon-template-add:before { content: '\e80e'; } /* 'î ' */ +.icon-group-add:before { content: '\e80f'; } /* 'î ' */ +.icon-template-import:before { content: '\e810'; } /* 'î ' */ +.icon-template-save:before { content: '\e811'; } /* 'î ' */ +.icon-group-remote-add:before { content: '\e812'; } /* 'î ' */ +.icon-port-out-add:before { content: '\e813'; } /* 'î ' */ +.icon-port-in-add:before { content: '\e814'; } /* 'î ' */ +.icon-processor-add:before { content: '\e815'; } /* 'î ' */ +.icon-lineage:before { content: '\e816'; } /* 'î ' */ .icon-port-in:before { content: '\e832'; } /* 'î ²' */ .icon-port-out:before { content: '\e833'; } /* 'î ³' */ .icon-connect:before { content: '\e834'; } /* 'î ´' */ -.icon-threads:before { content: '\e83f'; } /* 'î ¿' */ \ No newline at end of file +.icon-connect-add:before { content: '\e835'; } /* 'î µ' */ +.icon-threads:before { content: '\e83f'; } /* 'î ¿' */ +.icon-drop:before { content: '\e888'; } /* 'î¢' */ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot index 18795d6..48a3ab1 100755 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot differ http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg index 11c0468..4b7cd8a 100755 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg @@ -4,41 +4,65 @@ <metadata>Copyright (C) 2016 by original authors @ fontello.com</metadata> <defs> <font id="flowfont" horiz-adv-x="1000" > -<font-face font-family="flowfont" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" /> +<font-face font-family="flowfont" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="860" descent="-140" /> <missing-glyph horiz-adv-x="1000" /> -<glyph glyph-name="bulletin" unicode="" d="M1000 121c0-35-20-83-44-107l-120-120c-24-24-72-44-107-44h-666c-35 0-63 28-63 62v876c0 34 28 62 63 62h875c34 0 62-28 62-62v-667z m-83 62v584h-834v-834h584v188c0 34 28 62 62 62h188z m-167-83v-161c11 3 22 9 27 14l120 120c5 5 11 16 14 27h-161z" horiz-adv-x="1000" /> +<glyph glyph-name="funnel-add" unicode="" d="M948 796h-114a52 52 0 0 1-53-52v-147l-183-77a305 305 0 0 1-35 11l78 110h51a52 52 0 0 1 52 52v115a52 52 0 0 1-52 52h-114a52 52 0 0 1-52-52v-114a52 52 0 0 1 52-53h29l-74-108c-9 0-18-2-28-2s-19 4-28 3l-73 107h18a52 52 0 0 1 52 52v115a52 52 0 0 1-52 52h-114a52 52 0 0 1-51-52v-114a52 52 0 0 1 51-53h61l75-111a379 379 0 0 1-38-8l-187 75v147a52 52 0 0 1-53 52h-114a52 52 0 0 1-52-52v-114a52 52 0 0 1 52-51h156l159-68a39 39 0 0 1-28-29c0-28 74-51 166-51s167 22 167 50a40 40 0 0 1-29 31l159 67h146a52 52 0 0 1 52 51v114a52 52 0 0 1-52 52z m-365-128a31 31 0 0 0-32 31v104a31 31 0 0 0 32 31h105a31 31 0 0 0 31-31v-104a31 31 0 0 0-31-31h-105z m-270 0a31 31 0 0 0-32 31v104a31 31 0 0 0 32 31h104a31 31 0 0 0 31-31v-104a31 31 0 0 0-31-31h-104z m-121-33a31 31 0 0 0-31-32h-104a31 31 0 0 0-31 32v104a31 31 0 0 0 31 31h104a31 31 0 0 0 31-31v-104z m781 0a31 31 0 0 0-31-32h-103a31 31 0 0 0-31 32v104a31 31 0 0 0 31 31h104a31 31 0 0 0 31-31v-104z m-689-257a234 2 34 0 1 1 234-234 234 234 0 0 1-234 234z m140-268a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m153 252v-164a18 18 0 0 1 19-19h60c12 0 14-7 7-15l-115-122a281 281 0 0 1-164 366 514 514 0 0 1 121-14c20 0 194 2 202 80h12v-2a31 31 0 0 0 0-5c0-69-78-95-142-104z m51-301v-150a52 52 0 0 0-52-51h-138a52 52 0 0 0-43 22 281 281 0 0 1 43 23 31 31 0 0 1 18-6h104a31 31 0 0 1 31 31v96z" horiz-adv-x="1000" /> -<glyph glyph-name="counter" unicode="" d="M878-17h-756c-67 0-122 54-122 121v492c0 67 55 121 122 121h756c68 0 122-54 122-121v-492c0-67-54-121-122-121z m-756 670c-32 0-58-26-58-57v-492c0-31 26-57 58-57h756c32 0 58 26 58 57v492c0 31-26 57-58 57h-756z m358-535h-314v62l148 158c20 22 35 42 45 58 10 17 15 33 15 47 0 21-5 37-15 48-11 12-25 18-45 18-20 0-36-7-48-21-12-15-18-33-18-56h-91c0 28 7 53 20 76 13 23 32 41 56 54 25 13 52 20 83 20 47 0 84-11 110-34s39-55 39-96c0-22-6-45-18-69-11-23-31-51-60-82l-104-110h197v-73z m344 457c8-17 12-36 12-57 0-21-7-41-19-58-13-18-30-31-51-41 26-9 45-23 58-41 13-19 19-40 19-66 0-40-15-73-44-97s-69-37-118-37c-46 0-83 12-112 36-29 24-44 56-44 96h91c0-18 7-32 20-42 12-11 28-17 47-17 22 0 39 6 51 17 12 12 18 27 18 46 0 45-25 68-75 68h-48v71h48c23 0 40 6 51 17 12 12 17 27 17 46 0 19-5 33-16 43-11 11-26 16-45 16l140 0z m-141 0c-18 0-32-5-44-15-11-9-17-21-17-37h-91c0 19 4 36 12 52h140z m0-457l25 39h92v-39h-117z" horiz-adv-x="1000" /> +<glyph glyph-name="counter" unicode="" d="M878-7h-756c-67 0-122 54-122 121v492c0 67 55 121 122 121h756c68 0 122-54 122-121v-492c0-67-54-121-122-121z m-756 670c-32 0-58-26-58-57v-492c0-31 26-57 58-57h756c32 0 58 26 58 57v492c0 31-26 57-58 57h-756z m358-535h-314v62l148 158c20 22 35 42 45 58 10 17 15 33 15 47 0 21-5 37-15 48-11 12-25 18-45 18-20 0-36-7-48-21-12-15-18-33-18-56h-91c0 28 7 53 20 76 13 23 32 41 56 54 25 13 52 20 83 20 47 0 84-11 110-34s39-55 39-96c0-22-6-45-18-69-11-23-31-51-60-82l-104-110h197v-73z m344 457c8-17 12-36 12-57 0-21-7-41-19-58-13-18-30-31-51-41 26-9 45-23 58-41 13-19 19-40 19-66 0-40-15-73-44-97s-69-37-118-37c-46 0-83 12-112 36-29 24-44 56-44 96h91c0-18 7-32 20-42 12-11 28-17 47-17 22 0 39 6 51 17 12 12 18 27 18 46 0 45-25 68-75 68h-48v71h48c23 0 40 6 51 17 12 12 17 27 17 46 0 19-5 33-16 43-11 11-26 16-45 16l140 0z m-141 0c-18 0-32-5-44-15-11-9-17-21-17-37h-91c0 19 4 36 12 52h140z m0-457l25 39h92v-39h-117z" horiz-adv-x="1000" /> -<glyph glyph-name="enable-false" unicode="" d="M912-123l-297 296-144-308c-5-9-14-15-25-15-3 0-6 1-9 1-13 4-21 17-18 30l96 392-71 70-150-37c-3-1-5-1-7-1-7 0-14 2-19 7-7 5-10 14-8 23l38 154-251 250 41 42 865-862-41-42z m-117 683c5 9 3 20-4 27-5 5-12 9-20 9-3 0-5-1-7-1l-238-59 102 278c2 4 3 7 3 11 0 14-12 25-27 25h-197c-12 0-23-8-26-19l-42-172 343-342 113 243z" horiz-adv-x="1000" /> +<glyph glyph-name="enable-false" unicode="" d="M912-113l-297 296-144-308c-5-9-14-15-25-15-3 0-6 1-9 1-13 4-21 17-18 30l96 392-71 70-150-37c-3-1-5-1-7-1-7 0-14 2-19 7-7 5-10 14-8 23l38 154-251 250 41 42 865-862-41-42z m-117 683c5 9 3 20-4 27-5 5-12 9-20 9-3 0-5-1-7-1l-238-59 102 278c2 4 3 7 3 11 0 14-12 25-27 25h-197c-12 0-23-8-26-19l-42-172 343-342 113 243z" horiz-adv-x="1000" /> -<glyph glyph-name="funnel" unicode="" d="M782 734v-147l-183-77c-11 2-21 9-35 11l77 111h51c28 0 52 23 52 52v114c0 29-24 52-52 52h-114c-29 0-52-23-52-52v-114c0-29 23-52 52-52h29l-74-108c-9 0-18-2-28-2-9 0-19 3-28 3l-73 107h18c29 0 52 23 52 52v114c0 29-23 52-52 52h-113c-29 0-53-23-53-52v-114c0-29 24-52 53-52h60l75-111c-13-2-27-6-38-9l-188 75v147c0 29-23 52-52 52h-114c-29 0-52-23-52-52v-114c0-29 23-52 52-52h157l158-68c-18-8-28-19-28-29 0-27 74-50 166-50 92 0 166 22 166 49 0 10-10 22-28 30l159 68h146c29 0 52 23 52 52v114c0 29-23 52-52 52h-114c-29 0-52-23-52-52z m-231-45v104c0 17 14 31 32 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31h-104c-18 0-32 14-32 31z m-269 0v104c0 17 14 31 31 31h105c17 0 31-14 31-31v-104c0-17-14-31-31-31h-105c-17 0-31 14-31 31z m-121-95h-104c-17 0-31 14-31 31v104c0 17 14 31 31 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31z m782 0h-104c-17 0-31 14-31 31v104c0 17 14 31 31 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31z m-452-592c8-9 20-9 28 0l144 153c8 8 5 16- 6 16h-61c-11 0-19 7-19 18v164c64 9 142 35 142 104 0 2-1 3-1 5l-1 2-10 0c-8-78-182-80-202-80-20 0-194 2-202 80l-10 0 0-2c0-2 0-3 0-5 0-69 79-95 143-104v-164c0-11-11-18-22-18h-60c-11 0-14-8-7-16l144-153z m137 50v-150c0-29-23-52-52-52h-139c-29 0-52 23-52 52v150l38-36v-96c0-18 14-32 31-32h105c17 0 31 14 31 32v96l38 36z" horiz-adv-x="1000" /> +<glyph glyph-name="funnel" unicode="" d="M782 744v-147l-183-77c-11 2-21 9-35 11l77 111h51c28 0 52 23 52 52v114c0 29-24 52-52 52h-114c-29 0-52-23-52-52v-114c0-29 23-52 52-52h29l-74-108c-9 0-18-2-28-2-9 0-19 3-28 3l-73 107h18c29 0 52 23 52 52v114c0 29-23 52-52 52h-113c-29 0-53-23-53-52v-114c0-29 24-52 53-52h60l75-111c-13-2-27-6-38-9l-188 75v147c0 29-23 52-52 52h-114c-29 0-52-23-52-52v-114c0-29 23-52 52-52h157l158-68c-18-8-28-19-28-29 0-27 74-50 166-50 92 0 166 22 166 49 0 10-10 22-28 30l159 68h146c29 0 52 23 52 52v114c0 29-23 52-52 52h-114c-29 0-52-23-52-52z m-231-45v104c0 17 14 31 32 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31h-104c-18 0-32 14-32 31z m-269 0v104c0 17 14 31 31 31h105c17 0 31-14 31-31v-104c0-17-14-31-31-31h-105c-17 0-31 14-31 31z m-121-95h-104c-17 0-31 14-31 31v104c0 17 14 31 31 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31z m782 0h-104c-17 0-31 14-31 31v104c0 17 14 31 31 31h104c17 0 31-14 31-31v-104c0-17-14-31-31-31z m-452-592c8-9 20-9 28 0l144 153c8 8 5 16- 6 16h-61c-11 0-19 7-19 18v164c64 9 142 35 142 104 0 2-1 3-1 5l-1 2-10 0c-8-78-182-80-202-80-20 0-194 2-202 80l-10 0 0-2c0-2 0-3 0-5 0-69 79-95 143-104v-164c0-11-11-18-22-18h-60c-11 0-14-8-7-16l144-153z m137 50v-150c0-29-23-52-52-52h-139c-29 0-52 23-52 52v150l38-36v-96c0-18 14-32 31-32h105c17 0 31 14 31 32v96l38 36z" horiz-adv-x="1000" /> -<glyph glyph-name="group" unicode="" d="M82 842c-45 0-82-36-82-82v-110h192v192h-110z m53-134h-77v36c0 22 18 41 41 41h36v-77z m783 134h-110v-192h192v110c0 46-37 82-82 82z m24-134h-77v77h36c23 0 41-19 41-41v-36z m-942-658v-110c0-46 37-82 82-82h110v192h-192z m135-135h-36c-23 0-41 19-41 41v36h77v-77z m673 135v-192h110c45 0 82 36 82 82v110h-192z m134-94c0-22-18-41-41-41h-36v77h77v-36z m-883 126v536h75v-536h-75z m807 0v536h75v-536h-75z m-634 627v75h536v-75h-536z m0-793v75h536v-75h-536z m454 530h-92v71c0 46-37 82-82 82h-179c-45 0-82-36-82-82v-178c0-46 37-82 82-82h92v-72c0-45 37-82 82-82h179c45 0 82 37 82 82v179c0 45-37 82-82 82z m-261-82v-67h-84c-27 0-49 22-49 49v164c0 27 22 49 49 49h163c27 0 49-22 49-49v-64h-46c-45 0-82-37-82-82z m302-172c0-27-22-49-49-49h-164c-27 0-49 22-49 49v164c0 27 22 49 49 49h164c27 0 49-22 49-49v-163z" horiz-adv-x="1000" /> +<glyph glyph-name="group" unicode="" d="M82 852c-45 0-82-36-82-82v-110h192v192h-110z m53-134h-77v36c0 22 18 41 41 41h36v-77z m783 134h-110v-192h192v110c0 46-37 82-82 82z m24-134h-77v77h36c23 0 41-19 41-41v-36z m-942-658v-110c0-46 37-82 82-82h110v192h-192z m135-135h-36c-23 0-41 19-41 41v36h77v-77z m673 135v-192h110c45 0 82 36 82 82v110h-192z m134-94c0-22-18-41-41-41h-36v77h77v-36z m-883 126v536h75v-536h-75z m807 0v536h75v-536h-75z m-634 627v75h536v-75h-536z m0-793v75h536v-75h-536z m454 530h-92v71c0 46-37 82-82 82h-179c-45 0-82-36-82-82v-178c0-46 37-82 82-82h92v-72c0-45 37-82 82-82h179c45 0 82 37 82 82v179c0 45-37 82-82 82z m-261-82v-67h-84c-27 0-49 22-49 49v164c0 27 22 49 49 49h163c27 0 49-22 49-49v-64h-46c-45 0-82-37-82-82z m302-172c0-27-22-49-49-49h-164c-27 0-49 22-49 49v164c0 27 22 49 49 49h164c27 0 49-22 49-49v-163z" horiz-adv-x="1000" /> -<glyph glyph-name="group-remote" unicode="" d="M82 842c-45 0-82-36-82-82v-110h192v192h-110z m53-134h-77v36c0 22 18 41 41 41h36v-77z m783 134h-110v-192h192v110c0 46-37 82-82 82z m24-134h-77v77h36c23 0 41-19 41-41v-36z m-942-658v-110c0-46 37-82 82-82h110v192h-192z m135-135h-36c-23 0-41 19-41 41v36h77v-77z m673 135v-192h110c45 0 82 36 82 82v110h-192z m134-94c0-22-18-41-41-41h-36v77h77v-36z m-211 433c-5 78-69 138-147 138-42 0-82-18-110-49-16 17-38 26-61 26-48 0-87-39-87-86l0-2c-4 1-7 1-11 1-67 0-122-55-122-122 0-67 55-122 122-122h384c60 0 110 50 110 111 0 49-32 91-78 105z m-32-158h-384c-86 0-75 143 11 127l68-13-10 68c-4 28 34 43 51 22l39-50 40 50c49 62 157 27 159-54l1-38 37-9c57-13 46-103-12-103z m-640-149v536h75v-536h-75z m882 0h-75v536h75v-536z m-709 627v75h536v-75h-536z m0-793v75h536v-75h-536z" horiz-adv-x="1000" /> +<glyph glyph-name="group-remote" unicode="" d="M82 852c-45 0-82-36-82-82v-110h192v192h-110z m53-134h-77v36c0 22 18 41 41 41h36v-77z m783 134h-110v-192h192v110c0 46-37 82-82 82z m24-134h-77v77h36c23 0 41-19 41-41v-36z m-942-658v-110c0-46 37-82 82-82h110v192h-192z m135-135h-36c-23 0-41 19-41 41v36h77v-77z m673 135v-192h110c45 0 82 36 82 82v110h-192z m134-94c0-22-18-41-41-41h-36v77h77v-36z m-211 433c-5 78-69 138-147 138-42 0-82-18-110-49-16 17-38 26-61 26-48 0-87-39-87-86l0-2c-4 1-7 1-11 1-67 0-122-55-122-122 0-67 55-122 122-122h384c60 0 110 50 110 111 0 49-32 91-78 105z m-32-158h-384c-86 0-75 143 11 127l68-13-10 68c-4 28 34 43 51 22l39-50 40 50c49 62 157 27 159-54l1-38 37-9c57-13 46-103-12-103z m-640-149v536h75v-536h-75z m882 0h-75v536h75v-536z m-709 627v75h536v-75h-536z m0-793v75h536v-75h-536z" horiz-adv-x="1000" /> -<glyph glyph-name="label" unicode="" d="M670 157c2 4 5 7 8 11l322 321v-43l-303-303c-3-3-7-6-11-8l-36-18 20 40z m-225-271l315 93c7 2 13 6 18 11l222 222v83l-207-207c-3-3-5-5-6-8l-40-65c-5-8-12-14-21-18l-167-60-5 10c-15 33-41 59-74 75l-10 5 60 166c3 9 10 17 18 21l62 38c3 2 6 4 8 6l382 382v83l-475-473c-5-5-8-11-10-18l-96-320c-5-16 10-31 26-26z m160 712c40 0 70 18 70 41s-30 40-70 40h-535c-40 0-70-17-70-40s30-41 70-41h535z m-59-136c40 0 70 18 70 41s-30 41-70 41h-476c-40 0-70-18-70-41s30-41 70-41h476z m-228-135c40 0 70 17 70 40 0 24-30 41-70 41h-248c-40 0-70-17-70-40 0-24 30-41 70-41h248z m178 407c40 0 70 17 70 40s-30 41-70 41h-426c-40 0-70-17-70-41s30-40 70-40h426z" horiz-adv-x="1000" /> +<glyph glyph-name="label" unicode="" d="M670 167c2 4 5 7 8 11l322 321v-43l-303-303c-3-3-7-6-11-8l-36-18 20 40z m-225-271l315 93c7 2 13 6 18 11l222 222v83l-207-207c-3-3-5-5-6-8l-40-65c-5-8-12-14-21-17l-167-61-5 10c-15 33-41 59-74 75l-10 5 60 166c3 9 10 17 18 21l62 38c3 2 6 4 8 6l382 382v83l-475-473c-5-5-8-11-10-18l-96-320c-5-16 10-31 26-26z m160 712c40 0 70 18 70 41s-30 40-70 40h-535c-40 0-70-17-70-40s30-41 70-41h535z m-59-136c40 0 70 18 70 41s-30 41-70 41h-476c-40 0-70-18-70-41s30-41 70-41h476z m-228-135c40 0 70 17 70 40 0 24-30 41-70 41h-248c-40 0-70-17-70-40 0-24 30-41 70-41h248z m178 407c40 0 70 17 70 40s-30 41-70 41h-426c-40 0-70-17-70-41s30-40 70-40h426z" horiz-adv-x="1000" /> -<glyph glyph-name="processor" unicode="" d="M101 832l-50-50-39-88 39 39v-120l-39-88 39 39v-120l-39-87 39 39v-121l-39-87 39 39v-121l-39-87 39 39v-121l-39-87 63 63h121l-15-63 63 63h121l-15-63 63 63h120l-14-63 63 63h120l-14-63 63 63h120l-15-63 114 113c11 12 18 28 18 44v760c0 46-37 83-83 83h-760c-16 0-32-7-44-18z m798-850h-738c-23 0-41 18-41 41v738c0 23 18 42 41 42h738c23 0 42-19 42-42v-738c0-23-19-41-42-41z m-119 564c-2 9-4 19-11 27-57 75-144 119-239 119-65 0-128-21-180-60-127-96-156-278-66-409 1-3 2-6 4-8 57-76 144-120 239-120 66 0 128 21 180 61 68 51 111 123 122 202 9 66-8 133-49 188z m-54-322c-39-30-87-45-137-45-80 0-157 40-208 106-11 15-28 24-46 24-13 0-25-4-36-12-12-10-20-23-23-39 0-4 1-7 1-11-60 110-39 246 55 317 39 29 86 45 136 45 80 0 158-40 208-107 11-15 28-23 47-23 13 0 25 4 35 11 16 13 23 32 22 51 63-110 42-245-54-317z" horiz-adv-x="1000" /> +<glyph glyph-name="processor" unicode="" d="M101 842l-50-50-39-88 39 39v-120l-39-88 39 39v-120l-39-87 39 39v-121l-39-87 39 39v-121l-39-87 39 39v-121l-39-87 63 63h121l-15-63 63 63h121l-15-63 63 63h120l-14-63 63 63h120l-14-63 63 63h120l-15-63 114 113c11 12 18 28 18 44v760c0 46-37 83-83 83h-760c-16 0-32-7-44-18z m798-850h-738c-23 0-41 18-41 41v738c0 23 18 42 41 42h738c23 0 42-19 42-42v-738c0-23-19-41-42-41z m-119 564c-2 9-4 19-11 27-57 75-144 119-239 119-65 0-128-21-180-60-127-96-156-278-66-409 1-3 2-6 4-8 57-76 144-120 239-120 66 0 128 21 180 61 68 51 111 123 122 202 9 66-8 133-49 188z m-54-322c-39-30-87-45-137-45-80 0-157 40-208 106-11 15-28 24-46 24-13 0-25-4-36-12-12-10-20-23-23-39 0-4 1-7 1-11-60 110-39 246 55 317 39 29 86 45 136 45 80 0 158-40 208-107 11-15 28-23 47-23 13 0 25 4 35 11 16 13 23 32 22 51 63-110 42-245-54-317z" horiz-adv-x="1000" /> -<glyph glyph-name="provenance" unicode="" d="M827 160v-258c0-29-23-52-51-52h-724c-29 0-52 23-52 52v724c0 28 23 51 52 51h258v-465c0-29 23-52 52-52h465z m-193 293c-17 0-31 14-31 31v271h-150c-17 0-31-13-31-30v-422c0-17 14-30 31-30h422c17 0 30 13 30 30v150h-271z m366 145v193c0 33-26 59-59 59h-193c-32 0-58-26-58-59v-193c0-32 26-58 58-58h193c33 0 59 26 59 58z m-241 183h172v-172h-172v172z" horiz-adv-x="1000" /> +<glyph glyph-name="provenance" unicode="" d="M827 170v-258c0-29-23-52-51-52h-724c-29 0-52 23-52 52v724c0 28 23 51 52 51h258v-465c0-29 23-52 52-52h465z m-193 293c-17 0-31 14-31 31v271h-150c-17 0-31-13-31-30v-422c0-17 14-30 31-30h422c17 0 30 13 30 30v150h-271z m366 145v193c0 33-26 59-59 59h-193c-32 0-58-26-58-59v-193c0-32 26-58 58-58h193c33 0 59 26 59 58z m-241 183h172v-172h-172v172z" horiz-adv-x="1000" /> -<glyph glyph-name="template" unicode="" d="M474 318v14h-98v-213h98v14c0 23 18 41 41 41h255c23 0 41-18 41-41v-65c0-22-18-40-41-40h-255c-23 0-41 18-41 40v15h-134v443h-110c-23 0-41 18-41 41v65c0 22 18 40 41 40h255c23 0 41-18 41-40v-65c0-23-18-41-41-41h-109v-158h98v15c0 22 18 40 41 40h255c23 0 41-18 41-40v-65c0-23-18-41-41-41h-255c-23 0-41 18-41 41z m438-463l-19 64c-5-2-10-2-15-2h-89v-67h89c12 0 23 2 34 5z m-212 62h-89v-67h89v67z m-178 0h-89v-67h89v67z m-178 0h-88v-67h88v67z m-177 0h-45c-9 0-18 2-26 6l-32-58c18-10 38-15 58-15h45v67z m833 55v64h-67v-64c0-5 0-10-2-16l64-18c3 11 5 23 5 34z m-933-4l0 87h-67v-83l0-8 67 4z m933 246h-67v-89h67v89z m-933 19h-67v-89h67v89z m933 158h-67v-89h67v89z m-933 19h-67v-89h67v89z m933 159h-67v-89h67v89z m-933 19h-67v-89h67v89z m933 140c0 9-1 17-3 26l-65-14c1-4 1-8 1-12v-70h67v70z m-933 0c0 8 1 16 5 23l-61 28c-7-16-11-34-11-51v-51h67v51z m854 114c-14 5-28 8-43 8h-57v-67h57c7 0 13-1 19-3l24 62z m-799-59h76v67h-76c-6 0-12 0-17-1l9-66c3 0 6 0 8 0z m61 0 67h-89v-67h89v67z m-178 0h-89v-67h89v67z m-178 0h-89v-67h89v67z" horiz-adv-x="1000" /> +<glyph glyph-name="template" unicode="" d="M995 423v-157a31 31 0 0 0-31-31h-231l-195-156h153a31 31 0 0 0 32-31v-157a31 31 0 0 0-32-31h-434a31 31 0 0 0-31 31v157a31 31 0 0 0 31 31h231l196 156h-153a31 31 0 0 0-31 31v157a31 31 0 0 0 31 31h122l-373 187h-244a31 31 0 0 0-31 32v156a31 31 0 0 0 31 31h433a31 31 0 0 0 31-31v-156a31 31 0 0 0-31-32h-122l373-187h244a31 31 0 0 0 31-31z" horiz-adv-x="1000" /> -<glyph glyph-name="transmit-false" unicode="" d="M44 835l-44-44 163-163c-52-74-83-165-83-262 0-255 206-461 460-461 98 0 189 32 264 85l125-125 44 44-929 926z m287-374l60-60c-2-11-4-23-4-36 0-84 68-153 153-153 12 0 24 2 36 5l60-60c-29-14-62-22-96-22-127 0-230 103-230 230 0 35 8 67 21 96z m209-479c-212 0-383 172-383 383 0 77 23 148 62 208l55-55c-26-45-41-97-41-153 0-169 138-306 307-306 56 0 108 15 153 41l56-55c-60-40-132-63-209-63z m0 767c212 0 383-172 383-383 0-75-21-145-58-204l55-55v0c50 73 80 163 80 258 0 255-206 460-460 460-96 0-186-29-260-80l56-55c59 37 129 59 204 59z m269-531c24 44 38 94 38 148 0 169-138 306-307 306-54 0-104-14-148-38l57-57c28 12 59 18 91 18 127 0 230-102 230-230 0-32-7-62-18-90l57-57z m-299 298l180-180c2 10 3 19 3 30 0 84-68 153-153 153-10 0-20-1-30-3z" horiz-adv-x="1000" /> +<glyph glyph-name="transmit-false" unicode="" d="M44 845l-44-44 163-163c-52-74-83-165-83-262 0-255 206-461 460-461 98 0 189 32 264 85l125-125 44 44-929 926z m287-374l60-60c-2-11-4-23-4-36 0-84 68-153 153-153 12 0 24 2 36 5l60-60c-29-14-62-22-96-22-127 0-230 103-230 230 0 35 8 67 21 96z m209-479c-212 0-383 172-383 383 0 77 23 148 62 208l55-55c-26-45-41-97-41-153 0-169 138-306 307-306 56 0 108 15 153 41l56-55c-60-40-132-63-209-63z m0 767c212 0 383-172 383-383 0-75-21-145-58-204l55-55v0c50 73 80 163 80 258 0 255-206 460-460 460-96 0-186-29-260-80l56-55c59 37 129 59 204 59z m269-531c24 44 38 94 38 148 0 169-138 306-307 306-54 0-104-14-148-38l57-57c28 12 59 18 91 18 127 0 230-102 230-230 0-32-7-62-18-90l57-57z m-299 298l180-180c2 10 3 19 3 30 0 84-68 153-153 153-10 0-20-1-30-3z" horiz-adv-x="1000" /> -<glyph glyph-name="zoom-actual" unicode="" d="M42-150c-23 0-42 19-42 42v916c0 23 19 42 42 42h83c23 0 42-19 42-42v-916c0-23-19-42-42-42h-83z m416 233c-22 0-41 19-41 42v108c0 23 19 42 41 42h84c23 0 41-19 41-42v-108c0-23-18-42-41-42h-84z m0 343c-22 0-41 18-41 41v108c0 23 19 42 41 42h84c23 0 41-19 41-42v-108c0-23-18-41-41-41h-84z m417-576c-23 0-42 19-42 42v916c0 23 19 42 42 42h83c23 0 42-19 42-42v-916c0-23-19-42-42-42h-83z" horiz-adv-x="1000" /> +<glyph glyph-name="zoom-actual" unicode="" d="M42-140c-23 0-42 19-42 42v916c0 23 19 42 42 42h83c23 0 42-19 42-42v-916c0-23-19-42-42-42h-83z m416 233c-22 0-41 19-41 42v108c0 23 19 42 41 42h84c23 0 41-19 41-42v-108c0-23-18-42-41-42h-84z m0 343c-22 0-41 18-41 41v108c0 23 19 42 41 42h84c23 0 41-19 41-42v-108c0-23-18-41-41-41h-84z m417-576c-23 0-42 19-42 42v916c0 23 19 42 42 42h83c23 0 42-19 42-42v-916c0-23-19-42-42-42h-83z" horiz-adv-x="1000" /> -<glyph glyph-name="zoom-fit" unicode="" d="M637 779c-12 12-15 30-9 45 7 16 22 26 39 26h291c23 0 42-19 42-42v-291c0-17-10-32-25-39-6-2-11-3-17-3-11 0-21 5-29 12l-292 292z m-566-292c-8-7-18-12-29-12-6 0-11 1-16 3-16 7-26 22-26 39v291c0 23 19 42 42 42h291c17 0 32-10 39-26 6-15 3-33-9-45l-292-292z m292-566c12-12 15-30 9-45-7-16-22-26-39-26h-291c-23 0-42 19-42 42v291c0 17 10 32 26 39 15 6 33 3 45-9l292-292z m566 292c12 12 30 15 46 9 15-7 25-22 25-39v-291c0-23-19-42-42-42h-291c-17 0-32 10-39 26-6 15-3 33 9 45l292 292z" horiz-adv-x="1000" /> +<glyph glyph-name="zoom-fit" unicode="" d="M637 789c-12 12-15 30-9 45 7 16 22 26 39 26h291c23 0 42-19 42-42v-291c0-17-10-32-25-39-6-2-11-3-17-3-11 0-21 5-29 12l-292 292z m-566-292c-8-7-18-12-29-12-6 0-11 1-16 3-16 7-26 22-26 39v291c0 23 19 42 42 42h291c17 0 32-10 39-26 6-15 3-33-9-45l-292-292z m292-566c12-12 15-30 9-45-7-16-22-26-39-26h-291c-23 0-42 19-42 42v291c0 17 10 32 26 39 15 6 33 3 45-9l292-292z m566 292c12 12 30 15 46 9 15-7 25-22 25-39v-291c0-23-19-42-42-42h-291c-17 0-32 10-39 26-6 15-3 33 9 45l292 292z" horiz-adv-x="1000" /> -<glyph glyph-name="port-in" unicode="" d="M1000-10v735l-42 43a60 60 0 0 1-42 18h-671a63 63 0 0 1-62-63l41-40v22a40 40 0 0 0 40 40h637a40 40 0 0 0 39-40v-636a40 40 0 0 0-39-40h-449l-60-60h587z m-1000 412v-231a23 23 0 0 1 23-23h192a23 23 0 0 0 23-22v-200c0-13 7-15 16-7l353 351a23 23 0 0 1 0 32l-353 351c-9 10-16 6-16-6v-200a23 23 0 0 0-22-23h-193a23 23 0 0 1-23-22z m63-52a11 11 0 0 0 11 11h216a11 11 0 0 1 12 12v133c0 7 3 8 8 4l218-217a11 11 0 0 0 0-15l-218-217c-5-4-8-3-8 4v135a11 11 0 0 1-12 12h-215a11 11 0 0 0-12 11v127z m722-201h-53v275h54v-276z" horiz-adv-x="1000" /> +<glyph glyph-name="label-add" unicode="" d="M670 167a42 42 0 0 0 8 11l322 321v-43l-303-303a42 42 0 0 0-11-8l-36-17z m-65 441c40 0 70 18 70 41s-31 40-70 40h-535c-39 0-70-16-70-40s31-41 70-41h535z m-58-135c40 0 70 17 70 40s-32 41-70 41h-477c-39 0-70-18-70-41s31-40 70-40h477z m-51 271c40 0 70 17 70 40s-31 41-70 41h-426c-39 0-70-17-70-41s31-40 70-40h426z m-426-406h6a283 283 0 0 0 137 81h-143c-39-1-70-18-70-41s31-41 70-41z m214 40a234 234 0 1 1 234-234 234 234 0 0 1-234 234z m140-268a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m363-22l-40-64a42 42 0 0 0-21-18l-167-60-4 10a156 156 0 0 1-28 40 285 285 0 0 0-100-99 20 20 0 0 1 18-3l315 94a42 42 0 0 1 18 11l222 223v82l-207-206a42 42 0 0 1-6-8z m-250 182a281 281 0 0 0 17-43l56 34a42 42 0 0 1 8 6l382 383v83z" horiz-adv-x="1000" /> -<glyph glyph-name="port-out" unicode="" d="M0 3v710l41 41a58 58 0 0 0 41 17h630a77 77 0 0 0 77-77v-102l-39 39v63a38 38 0 0 1-39 37h-615a38 38 0 0 1-38-37v-616a38 38 0 0 1 38-38h482v-58h-558z m653-69l341 339a22 22 0 0 1 0 31l-341 339c-9 9-16 6-16-6v-193a22 22 0 0 0-22-22h-187a22 22 0 0 1-22-22v-222a22 22 0 0 1 22-22h187a22 22 0 0 0 22-22v-193c0-13 7-16 16-7z m45 141v131a11 11 0 0 1-10 11h-208a11 11 0 0 0-11 11v122a11 11 0 0 0 11 11h208a11 11 0 0 1 10 11v130c0 6 4 7 8 3l212-209a11 11 0 0 0 0-15l-212-209c-4-3-8-3-8 3z m-467 347a127 127 0 0 1-118-134 127 127 0 0 1 118-133 127 127 0 0 1 119 133 127 127 0 0 1-119 134z m0-223a84 84 0 0 0-79 89 84 84 0 0 0 79 89 84 84 0 0 0 79-89 84 84 0 0 0-79-89z" horiz-adv-x="1000" /> +<glyph glyph-name="template-add" unicode="" d="M723 48v-157a31 31 0 0 0-32-31h-406a283 283 0 0 1 276 219h132a31 31 0 0 0 30-31z m241 406h-244l-372 187h121a31 31 0 0 1 31 32v156a31 31 0 0 1-31 31h-433a31 31 0 0 1-31-31v-156a31 31 0 0 1 31-32h244l372-187h-121a31 31 0 0 1-31-31v-94a283 283 0 0 0 53-94h132l-117-94a284 284 0 0 0-5-43l170 137h231a31 31 0 0 1 31 31v157a31 31 0 0 1-31 31z m-446-310a234 234 0 1 0-234 234 234 234 0 0 0 234-234z m-94 32a9 9 0 0 1-9 9h-81a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-66a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-80a9 9 0 0 1-9-9v-66a9 9 0 0 1 9-9h81a9 9 0 0 0 10-9v-81a9 9 0 0 1 9-9h65a9 9 0 0 1 9 9v81a9 9 0 0 0 9 9h81a9 9 0 0 1 8 9v66z" horiz-adv-x="1000" /> -<glyph glyph-name="connect" unicode="" d="M853 703a500 500 0 1 0-753-53 31 31 0 0 0 46 2l279-279a16 16 0 0 0 0-22l-93-94a8 8 0 0 1 3-13l332-74a8 8 0 0 1 9 9l-72 334a8 8 0 0 1-13 3l-94-93a16 16 0 0 0-22 0l-278 280a31 31 0 0 0 4 47 500 500 0 0 0 652-47z" horiz-adv-x="1000" /> +<glyph glyph-name="group-add" unicode="" d="M82 852a82 82 0 0 1-82-82v-110h192v192h-110z m53-134h-77v35a41 41 0 0 0 41 41h36v-76z m783 134h-110v-192h192v110a82 82 0 0 1-82 82z m24-134h-77v76h36a41 41 0 0 0 41-41v-35z m-134-657v-192h110a82 82 0 0 1 82 81v110h-192z m134-94a41 41 0 0 0-41-40h-36v76h77v-36z m-76 126v535h75v-536h-75z m-634 626v74h536v-75h-536z m536-719v-75h-302a285 285 0 0 1 62 75h240z m-485 375a234 234 0 1 1 235-234 234 234 0 0 1-234 237z m141-265a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m-365 206v312h75v-243a285 285 0 0 1-75-69z m709 58v-179a82 82 0 0 0-82-82h-120a286 286 0 0 1 1 31v10h111a49 49 0 0 1 49 50v162a49 49 0 0 1-49 49h-164a49 49 0 0 1-49-49v-6a284 284 0 0 1-38 27 82 82 0 0 0 80 67h46v66a49 49 0 0 1-49 49h-163a49 49 0 0 1-49-49v-94h-8a286 286 0 0 1-31-2v103a82 82 0 0 0 80 83h179a82 8 2 0 0 0 82-83v-72h92a82 82 0 0 0 82-81z" horiz-adv-x="1000" /> -<glyph glyph-name="threads" unicode="" d="M308 350a149 149 0 1 0-149 149 149 149 0 0 0 149-149z m10 341a159 159 0 1 1-159-158 159 159 0 0 1 159 158z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m248 149a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m-182-831a159 159 0 1 1-159-159 159 159 0 0 1 159 159z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m248 149a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m341 0a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m159 192a159 159 0 1 1-159-159 159 159 0 0 1 159 159z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m66 341a159 159 0 1 1-159-158 159 159 0 0 1 159 158z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m-434-192a149 149 0 1 1 149-149 149 149 0 0 1-149 149z" horiz-adv-x="1000" /> +<glyph glyph-name="template-import" unicode="" d="M990 442v-153a31 31 0 0 0-31-31h-430a31 31 0 0 0-31 31v153a31 31 0 0 0 31 31h116l-361 172h-243a31 31 0 0 0-31 31v153a31 31 0 0 0 31 31h430a31 31 0 0 0 31-31v-153a31 31 0 0 0-31-32h-115l360-171h243a31 31 0 0 0 31-31z m-656-558h-113a63 63 0 0 0-57 38h-154v-31a31 31 0 0 1 31-31h474a31 31 0 0 1 31 31v31h-154a63 63 0 0 0-57-39z m-115 31h115a31 31 0 0 1 31 31v151a13 13 0 0 0 14 13h159c8 0 10 4 5 9l-256 259a13 13 0 0 1-19 0l-255-258c-5-5-3-10 4-10h159a13 13 0 0 0 14-13v-152a31 31 0 0 1 31-31z" horiz-adv-x="1000" /> + +<glyph glyph-name="template-save" unicode="" d="M990 442v-153a31 31 0 0 0-31-31h-430a31 31 0 0 0-31 31v153a31 31 0 0 0 31 31h116l-361 172h-243a31 31 0 0 0-31 31v153a31 31 0 0 0 31 31h430a31 31 0 0 0 31-31v-153a31 31 0 0 0-31-32h-115l360-171h243a31 31 0 0 0 31-31z m-508-560a22 22 0 0 0-22-22h-438a22 22 0 0 0-22 22v437a22 22 0 0 0 22 22h312a47 47 0 0 0 29-12l106-106a47 47 0 0 0 12-28v-313z m-40 18v286a25 25 0 0 1-7 15l-91 92a44 44 0 0 1-23 9v-139a22 22 0 0 0-22-22h-197a22 22 0 0 0-22 22v139h-40v-402h40v139a22 22 0 0 0 22 22h278a22 22 0 0 0 22-22v-139h40z m-81 0v121h-240v-121h241z m-80 402h-93v-121h71a22 22 0 0 1 22 23v98z" horiz-adv-x="1000" /> + +<glyph glyph-name="group-remote-add" unicode="" d="M82 852a82 82 0 0 1-82-82v-110h192v192h-110z m53-134h-77v35a41 41 0 0 0 41 41h36v-76z m783 134h-110v-192h192v110a82 82 0 0 1-82 82z m24-134h-77v76h36a41 41 0 0 0 41-41v-35z m-134-657v-192h110a82 82 0 0 1 82 81v110h-192z m134-94a41 41 0 0 0-41-40h-36v76h77v-36z m0 126h-75v535h75v-536z m-710 626v74h536v-75h-536z m536-719v-75h-302a285 285 0 0 1 62 75h240z m-485 375a234 234 0 1 1 235-234 234 234 0 0 1-234 237z m141-265a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m-365 206v312h75v-243a285 285 0 0 1-75-69z m750-22a111 111 0 0 0-111-111h-134a281 281 0 0 1-14 59h148a53 53 0 0 1 13 103l-37 9v38a91 91 0 0 1-160 53l-39-50-39 50a29 29 0 0 1-52-22l3-16a281 281 0 0 1-61 16v3a87 87 0 0 0 148 61 148 148 0 0 0 257-89 110 110 0 0 0 78-104z" horiz-adv-x="1000" /> + +<glyph glyph-name="port-out-add" unicode="" d="M284 378a234 234 0 1 1 234-234 234 234 0 0 1-234 234z m140-268a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m365 594v-102l-39 39v63a38 38 0 0 1-39 37h-615a38 38 0 0 1-38-37v-390a281 281 0 0 1-58-170v579l41 41a58 58 0 0 0 41 17h630a77 77 0 0 0 77-77z m205-421l-341-339c-9-8-16-6-16 7v192a22 22 0 0 1-22 22h-49a281 281 0 0 1-11 63h133a11 11 0 0 0 10-11v-132c0-6 4-7 8-3l212 209a11 11 0 0 1 0 15l-212 210c-4 5-8 3-8-3v-130a11 11 0 0 0-10-11h-208a11 11 0 0 1-11-12 283 283 0 0 1-63 40v10a22 22 0 0 0 22 22h188a22 22 0 0 1 22 21v194c0 11 6 15 15 6l341-339a22 22 0 0 0 0-31z" horiz-adv-x="1000" /> + +<glyph glyph-name="port-in-add" unicode="" d="M786 158h-54v276h54v-276z m-179 154l-353 351c-9 10-16 6-16-6v-200a23 23 0 0 0-22-23h-193a23 23 0 0 1-23-22v-231a22 22 0 0 1 2-8 281 281 0 0 0 62 149v38a11 11 0 0 0 11 11h39a281 281 0 0 0 170 57h18v88c0 7 3 8 8 4l218-217a11 11 0 0 0 0-15 281 281 0 0 0 27-60l53 52a23 23 0 0 1-1 32z m-323 66a234 234 0 1 1 234-234 234 234 0 0 1-234 234z m140-268a9 9 0 0 0-9-9h-81a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-66a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-80a9 9 0 0 0-9 9v66a9 9 0 0 0 9 9h81a9 9 0 0 1 10 9v82a9 9 0 0 0 7 8h65a9 9 0 0 0 9-9v-81a9 9 0 0 1 9-9h81a9 9 0 0 0 9-9v-66z m534 668a60 60 0 0 1-42 18h-671a63 63 0 0 1-62-63l41-40v22a40 40 0 0 0 40 40h637a40 40 0 0 0 39-40v-636a40 40 0 0 0-39-40h-354a281 281 0 0 0-31-60h463l21 21v735z" horiz-adv-x="1000" /> + +<glyph glyph-name="processor-add" unicode="" d="M988 777v-761a63 63 0 0 0-19-43l-113-113 15 62h-121l-62-62 14 62h-120l-63-62 15 62h-73a285 285 0 0 1 62 69h375a42 42 0 0 1 42 42v738a42 42 0 0 1-42 42h-737a42 42 0 0 1-42-42v-396a285 285 0 0 1-68-69v99l-39-38 39 87v120l-39-39 39 88v120l-39-39 39 88 50 50a63 63 0 0 0 44 18h760a83 83 0 0 0 83-83z m-469-634a234 234 0 1 0-234 235 234 234 0 0 0 233-234z m-94 32a9 9 0 0 1-9 9h-81a9 9 0 0 0-9 9v81a9 9 0 0 1-9 9h-67a9 9 0 0 1-9-9v-81a9 9 0 0 0-9-9h-80a9 9 0 0 1-9-9v-65a9 9 0 0 1 9-9h81a9 9 0 0 0 10-9v-81a9 9 0 0 1 9-9h65a9 9 0 0 1 9 9v81a9 9 0 0 0 9 9h81a9 9 0 0 1 8 9v66z m356 381a57 57 0 0 1-10 27 299 299 0 0 1-539-160l14 2a221 221 0 0 0 223 194 263 263 0 0 0 208-107 58 58 0 0 1 104 39 242 242 0 0 0-55-316 225 225 0 0 0-137-45 242 242 0 0 0-26 0 256 256 0 0 0 0-82 297 297 0 0 1 142 58 304 304 0 0 1 122 202 256 256 0 0 1-46 188z" horiz-adv-x="1000" /> + +<glyph glyph-name="lineage" unicode="" d="M785 415a214 214 0 0 1-83-17l-58 87a215 215 0 1 1-266-18l-82-184a215 215 0 1 1 72-31l82 185a210 210 0 0 1 127 8l59-90a215 215 0 1 1 149 60z m-539-438a98 98 0 1 0 98 98 98 98 0 0 0-98-98z m157 668a98 98 0 1 0 97-97 98 98 0 0 0-97 97z m382-543a98 98 0 1 0 98 98 98 98 0 0 0-98-98z" horiz-adv-x="1000" /> + +<glyph glyph-name="port-in" unicode="" d="M1000 0v735l-42 43a60 60 0 0 1-42 18h-671a63 63 0 0 1-62-63l41-40v22a40 40 0 0 0 40 40h637a40 40 0 0 0 39-40v-636a40 40 0 0 0-39-40h-449l-60-60h587z m-1000 412v-231a23 23 0 0 1 23-23h192a23 23 0 0 0 23-22v-200c0-13 7-15 16-7l353 351a23 23 0 0 1 0 32l-353 351c-9 10-16 6-16-6v-200a23 23 0 0 0-22-23h-193a23 23 0 0 1-23-22z m63-52a11 11 0 0 0 11 11h216a11 11 0 0 1 12 12v133c0 7 3 8 8 4l218-217a11 11 0 0 0 0-15l-218-217c-5-4-8-3-8 4v135a11 11 0 0 1-12 12h-215a11 11 0 0 0-12 11v127z m722-201h-53v275h54v-276z" horiz-adv-x="1000" /> + +<glyph glyph-name="port-out" unicode="" d="M0 13v710l41 41a58 58 0 0 0 41 17h630a77 77 0 0 0 77-77v-102l-39 39v63a38 38 0 0 1-39 37h-615a38 38 0 0 1-38-37v-616a38 38 0 0 1 38-38h482v-58h-558z m653-69l341 339a22 22 0 0 1 0 31l-341 339c-9 9-16 6-16-6v-193a22 22 0 0 0-22-22h-187a22 22 0 0 1-22-22v-222a22 22 0 0 1 22-22h187a22 22 0 0 0 22-22v-193c0-13 7-16 16-7z m45 141v131a11 11 0 0 1-10 11h-208a11 11 0 0 0-11 11v122a11 11 0 0 0 11 11h208a11 11 0 0 1 10 11v130c0 6 4 7 8 3l212-209a11 11 0 0 0 0-15l-212-209c-4-3-8-3-8 3z m-467 347a127 127 0 0 1-118-134 127 127 0 0 1 118-133 127 127 0 0 1 119 133 127 127 0 0 1-119 134z m0-223a84 84 0 0 0-79 89 84 84 0 0 0 79 89 84 84 0 0 0 79-89 84 84 0 0 0-79-89z" horiz-adv-x="1000" /> + +<glyph glyph-name="connect" unicode="" d="M853 713a500 500 0 1 0-753-53 31 31 0 0 0 46 2l279-279a16 16 0 0 0 0-22l-93-94a8 8 0 0 1 3-13l332-74a8 8 0 0 1 9 9l-72 334a8 8 0 0 1-13 3l-94-93a16 16 0 0 0-22 0l-278 280a31 31 0 0 0 4 47 500 500 0 0 0 652-47z" horiz-adv-x="1000" /> + +<glyph glyph-name="connect-add" unicode="" d="M853 713a500 500 0 1 0-752-53 31 31 0 0 0 46 2l154-154a16 16 0 0 0 0-22l-94-94a8 8 0 0 1 4-13l333-73a8 8 0 0 1 9 10l-74 331a8 8 0 0 1-13 4l-94-94a16 16 0 0 0-22 0l-152 156a31 31 0 0 0 3 47 500 500 0 0 0 652-47z m-55-523a8 8 0 0 1 8 8v70a8 8 0 0 0 7 8h70a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-70a8 8 0 0 0-8 8v70a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-70a8 8 0 0 0-8-8h-69a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h71a8 8 0 0 0 7-8v-70a8 8 0 0 1 8-8h56z" horiz-adv-x="1000" /> + +<glyph glyph-name="threads" unicode="" d="M308 360a149 149 0 1 0-149 149 149 149 0 0 0 149-149z m10 341a159 159 0 1 1-159-158 159 159 0 0 1 159 158z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m248 149a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m-182-831a159 159 0 1 1-159-159 159 159 0 0 1 159 159z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m248 149a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m341 0a149 149 0 1 1 149-149 149 149 0 0 1-149 149z m159 192a159 159 0 1 1-159-159 159 159 0 0 1 159 159z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m66 341a159 159 0 1 1-159-158 159 159 0 0 1 159 158z m-66 0a94 94 0 1 0-94 94 94 94 0 0 0 94-94z m-434-192a149 149 0 1 1 149-149 149 149 0 0 1-149 149z" horiz-adv-x="1000" /> + +<glyph glyph-name="drop" unicode="" d="M507-28v104a8 8 0 0 0 8 8h104v-112h-112z m0-111a333 333 0 0 1 112 21v56h-104a8 8 0 0 1-8-8v-70z m237 236v112h-103a8 8 0 0 1-8-8v-103h111z m14-139a23 23 0 0 1 6 17v89h-111v-112h88a23 23 0 0 1 17 7z m-98-98a334 334 0 0 1 83 51h-83v-51z m174 238a332 332 0 0 1 22 111h-78v-111h56z m-28-126a333 333 0 0 1 50 83h-50v-83z m0 0a333 333 0 0 1 50 83h-50v-83z m21 258h-209a8 8 0 0 1-8-8v-117h-117a8 8 0 0 1-8-8v-209a342 342 0 0 0-341 343c0 162 127 318 214 432a1279 1279 0 0 1 125 195 4 4 0 0 0 7 0 1279 1279 0 0 1 125-195c85-114 212-270 212-432z m-489 326l-28 5a1143 1143 0 0 1-80-123 406 406 0 0 1-59-255 320 320 0 0 1 107-192 314 314 0 0 1 39-29 4 4 0 0 1 5 7 344 344 0 0 0-94 156 435 435 0 0 0 31 279 1210 1210 0 0 0 68 136z m72 138l-19-26c-20-28-41-55-62-82l24-3c18 29 36 58 53 86l14 25c3 7-6 6-10 0z" horiz-adv-x="1000" /> </font> </defs> </svg> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf index f04c96e..519f7cb 100755 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf differ http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff index 50f4389..eea3656 100755 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff differ http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 index 7c1b3d2..0138d2a 100755 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 differ http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi-logo-about.svg ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi-logo-about.svg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi-logo-about.svg new file mode 100644 index 0000000..62a8c64 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi-logo-about.svg @@ -0,0 +1,17 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<svg xmlns="http://www.w3.org/2000/svg"; viewBox="1989 332.039 180.456 75.739"><defs><style>.a{fill:#728e9b;}.b{fill:#b9c6cd;}</style></defs><g transform="translate(1989 332.039)"><g transform="translate(1.299 0)"><g transform="translate(0 3.597)"><path class="a" d="M14.683,32.525v6.036h.192a13.416,13.416,0,0,1,5.461-5.6A16.158,16.158,0,0,1,28,31.183q6.323,0,9.724,3.449t3.4,11.209V84.068H27.9V48.524q0-4.024-1.341-5.6a5.361,5.361,0,0,0-4.312-1.581q-6.995,0-6.994,8.527v34.2H2.037V32.525Z" transform="translate(-2.037 -14.896)"/><rect class="a" width="13.222" height="11.305" transform="translate(47.972)"/><rect class="a" width="13.222" height="51.544" transform="translate(47.972 17.629)"/></g><g transform="translate(125.173)"><path class="a" d="M224.222,73.517A25.882,25.882,0,0,1,198.34,47.634c0-12.3,9.641-24.1,16.236-32.707A96.88,96.88,0,0,0,223.954.168a.3.3,0,0,1,.538,0,96.853,96.853,0,0,0,9.379,14.76c6.593,8.607,16.237,20.4,16.237,32.707H234.313a.608.608,0,0,0-.608.608v8.876h-8.874a.6 08.608,0,0,0-.608.608V73.517Z" transform="translate(-198.34 0)"/><path class="a" d="M249.991,100.636V92.185h-7.846a.608.608,0,0,0-.608.608v7.844Z" transform="translate(-213.993 -33.403)"/><path class="a" d="M241.538,115.337a25.24,25.24,0,0,0,8.453-1.625v-4.257h-7.846a.608.608,0,0,0-.608.608Z" transform="translate(-213.993 -39.661)"/><path class="a" d="M264.859,85.762V77.311h-7.844a.608.608,0,0,0-.608.608v7.843h8.451Z" transform="translate(-219.381 -28.013)"/><path class="a" d="M266.745,102.524l.01-.01a1.774,1.774,0,0,0,.508-1.254V94.581h-8.453v8.453h6.678A1.774,1.774,0,0,0,266.745,102.524Z" transform="translate(-220.251 -34.271)"/><path class="a" d="M259.711,116.6a25.274,25.274,0,0,0,6.249-3.841h-6.249Z" transform="translate(-220.578 -40.856)"/><path class="a" d="M277.934,85.762a25.17,25.17,0,0,0,1.627-8.451h-5.88v8.451Z" transform="translate(-225.639 -28.013)"/><path class="a" d="M276.979,101.731a25.244,25.244,0,0,0,3.839-6.25h-3.839Z" transform="translate(-226.835 -34.597)"/><path class="a" d="M276.979,101.731a25.244,25.244,0,0,0,3.839-6.25h-3.839Z" transform="translate(-226.835 -34.597)"/></g></g><g transform="translate(0 3.022)"><g transform="translate(0 1.629)"><path class="b" d="M4.626,7.57l2.382,9H5.117l-.416-1.9h-2.4l-.416,1.9H0l2.382-9Zm-.239,5.609-.87-4.046H3.492l-.87,4.046Z" transform="translate(0 -7.394)"/><path class="b" d="M15.808,7.57a2.617,2.617,0,0,1,1.166.233,2.125,2.125,0,0,1,.763.612,2.382,2.382,0,0,1,.416.863,3.914,3.914,0,0,1,.126.99,3.237,3.237,0,0,1-.208,1.21,2.19,2.19,0,0,1-.58.844,2.425,2.425,0,0,1-.9.492,3.964,3.964,0,0,1-1.173.163h-.971V16.57H12.631v-9Zm-.555,4.071a1.2,1.2,0,0,0,.876-.328,1.377,1.377,0,0,0,.334-1.021,1.6,1.6,0,0,0-.289-1.034,1.189,1.189,0,0,0-.97-.353h-.756v2.735Z" transform="translate(-4.577 -7.394)"/><path class="b" d="M25.9,7.57l2.382,9H26.389l-.416-1.9h-2.4l-.416,1.9H21.272l2.382-9Zm-.239,5.609-.87-4.046h-.025l-.87,4.046Z" transform="translate(-7.708 -7.394)"/><path class="b" d="M37.132,9.078a.872.872,0,0,0-.851 -.448.851.851,0,0,0-.561.183,1.212,1.212,0,0,0-.347.592,5.052,5.052,0,0,0-.177,1.071q-.051.662-.05,1.62a15.647,15.647,0,0,0,.069,1.652,3.643,3.643,0,0,0,.214.977.9.9,0,0,0,.365.466,1.053,1.053,0,0,0,.511.12,1.221,1.221,0,0,0,.448-.082.76.76,0,0,0,.359-.328,2.143,2.143,0,0,0,.24-.693,6.334,6.334,0,0,0,.089-1.178h1.815a8.1,8.1,0,0,1-.114,1.386,3.144,3.144,0,0,1-.422,1.147,2.1,2.1,0,0,1-.87.769,3.294,3.294,0,0,1-1.456.277,3.424,3.424,0,0,1-1.626-.328,2.21,2.21,0,0,1-.927-.946,4.163,4.163,0,0,1-.416-1.475,17.308,17.308,0,0,1-.094-1.891,17.362,17.362,0,0,1,.094-1.884,4.18,4.18,0,0,1,.416-1.481,2.324,2.324,0,0,1,.927-.964,3.272,3.272,0,0,1,1.626-.347,3.143,3.143,0,0,1,1.532.315,2.145,2.145,0,0,1,.839.8,2.776,2.776,0,0,1,.347,1.046,8.668,8.668,0,0,1,.07,1.052H37.366A3.279,3.279,0,0,0,37.132,9.078Z" transform="translate(-12.078 -7.294)"/><path class="b" d="M46.709,7.57v3.441h2.118V7.57h1.815v9H48.827v-4H46.709v4H44.894v-9Z" transform="translate(-16.267 -7.394)"/><path class="b" d="M61.567,9 .058H58.352v2.118h3.025v1.487H58.352v2.42h3.34V16.57H56.537v-9h5.029V9.058Z" transform="translate(-20.486 -7.394)"/></g><g transform="translate(68.91)"><path class="b" d="M108.068,31.949V22.943h6.706V17.1a15.765,15.765,0,0,1,.958-5.844,9.221,9.221,0,0,1,2.73-3.832,10.847,10.847,0,0,1,4.359-2.06,24.587,24.587,0,0,1,5.748-.622q3.543,0,7.089.287v9.389a7.3,7.3,0,0,0-1.341-.1h-1.246a6.212,6.212,0,0,0-3.928.958,3.9,3.9,0,0,0-1.15,3.161v4.5h7.665v9.007h-7.665V74.486H114.773V31.949Z" transform="translate(-108.068 -4.74)"/><rect class="b" width="13.221" height="11.305" transform="translate(35.451 0.575)"/><rect class="b" width="13.221" height="51.544" transform="translate(35.451 18.203)"/></g><g transform="translate(128.296 9.186)"><path class="b" d="M226.53,19.472c-.478.667-.948,1.339-1.428,2-1.516,2.092-3.113,4.123-4.676,6.18q.918.127,1.843.282c1.3-2.183,2.632-4.352,3.881-6.567.35-.62.693-1.246,1.039-1.87C227.463,19.008,226.827,19.057,226.53,19.472Z" transform="translate(-208.167 -19.146)" /><path class="b" d="M213.392,37.147c.23-.4.468-.8.7-1.207-.7-.136-1.4-.262-2.1-.374l-.007,0a86.66,86.66,0,0,0-6.06,9.3c-3.254,5.9-5.511,12.495-4.474,19.3a24.215,24.215,0,0,0,8.069,14.569,23.849,23.849,0,0,0,2.93,2.165.311.311,0,0,0,.381-.487,25.957,25.957,0,0,1-7-11.805c-1.937-7.144-.327-14.465,2.431-21.165A91.737,91.737,0,0,1,213.392,37.147Z" transform="translate(-201.2 -25.096)"/></g></g></g></svg> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi_about.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi_about.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi_about.png deleted file mode 100755 index 0fb90ca..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi_about.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css index edf66f3..b75f2fc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css @@ -19,41 +19,52 @@ */ .combo { - border: 1px solid #aaa; - font: bold 10px/18px Verdana, Geneva, sans-serif; - color: #525252; - padding: 2px 4px; + color: #262626; + font-family: Roboto, sans-serif; + font-size: 13px; + padding:0 10px; + height: 30px; + line-height: 30px; + border-top: 1px solid #eaeef0; + border-bottom: 1px solid #eaeef0; } .combo-options { - padding: 2px 4px; background: #fefefe; - font: bold 10px/16px Verdana, Geneva, sans-serif; - color: #525252; + color: #262626; list-style: none; - border: 1px solid #aaa; - box-shadow: 2px 2px 2px #666; - -moz-box-shadow: 2px 2px 2px #666; - -webkit-box-shadow: 2px 2px 2px #666; + border: 1px solid #004849; + box-shadow:0 3px 6px rgba(0,0,0,0.3); z-index: 2000; + border-top: none; + font-size: 13px; +} + +.combo-options .fa { + color: #004849; +} + +.combo-open { + background: #fff !important; + border: 1px solid #004849 !important; + border-bottom: 1px solid #fff !important; + font-weight: bold; + color: #262626; + box-shadow:0 3px 6px rgba(0,0,0,0.3); } .combo-arrow { float: right; width: 10px; - height: 5px; - background-color: red; - margin-top: 7px; - background-image: url(menuArrow.png); - background-color: transparent; + margin-top: 8px; } .combo-text { float: left; - height: 18px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + width: 80%; } div.selected-disabled-option { @@ -61,19 +72,25 @@ div.selected-disabled-option { color: #828282; } +.combo-options ul > li { + height: 32px; + padding: 0px 10px; +} + .combo-option-text { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left; - height: 16px; + height: 32px; + font-weight: normal; + line-height: 32px; } .combo-glass-pane { position: absolute; - background-image: url(../../../images/spacer.png); - background-repeat: repeat; - background-color: transparent; + background: #E3E8EB; + opacity: 0.0; left: 0px; top: 0px; right: 0px; @@ -87,10 +104,6 @@ div.combo-nifi-tooltip { color: #454545; } -div.button-normal { - background: transparent url(../../../images/bgButton.png) repeat-x center center; -} - -div.button-over { - background: transparent url(../../../images/bgButtonOver.png) repeat-x center center; +div.combo-button-normal { + background-color: #eaeef0; } http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js index b775d48..036f17e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js @@ -35,21 +35,21 @@ * maxHeight: 300, * select: selectHandler * } - * + * * Options have a label (specified as the text property that is rendered * to users) and a value which is not. Additionally, options can be marked * as disabled. A disabled option cannot be selected by a user but may be * programmatically selected (supporting the restoration of options that have - * become invalid). It is up to the developer to ensure that the selected + * become invalid). It is up to the developer to ensure that the selected * option is not disabled. - * - * The optionClass option supports specifying a class to apply to the + * + * The optionClass option supports specifying a class to apply to the * option element. */ /** * jQuery plugin for a NiFi style combo box. - * + * * @param {type} $ * @returns {undefined} */ @@ -100,7 +100,7 @@ // ensure we found the selected option if (isDefinedAndNotNull(selectedOption)) { - comboText.removeClass('selected-disabled-option').attr('title', selectedOption.text).text(selectedOption.text).data('text', selectedOption.text).width(combo.outerWidth() - 25); + comboText.removeClass('selected-disabled-option').attr('title', selectedOption.text).text(selectedOption.text).data('text', selectedOption.text); // if the selected option is disabled show it if (selectedOption.disabled === true) { @@ -119,17 +119,17 @@ }; var methods = { - + /** * Initializes the combo box. - * + * * @argument {object} options The options for the combo box */ init: function (options) { return this.each(function () { // ensure the options have been properly specified if (isDefinedAndNotNull(options) && - isDefinedAndNotNull(options.options)) { + isDefinedAndNotNull(options.options)) { // get the combo var combo = $(this); @@ -141,11 +141,13 @@ $('<div class="combo-text"></div>').appendTo(combo); // add hover effect and handle a combo click - combo.addClass('button-normal pointer combo').hover(function () { - combo.removeClass('button-normal').addClass('button-over'); + combo.addClass('combo-button-normal pointer combo').hover(function () { + combo.removeClass('button-normal').addClass('combo-button-over'); }, function () { - combo.removeClass('button-over').addClass('button-normal'); + combo.removeClass('button-over').addClass('combo-button-normal'); }).click(function (event) { + //add active styles + $(this).addClass('combo-open'); // determine the position of the element in question var position = combo.offset(); @@ -154,8 +156,8 @@ var comboOptions = $('<div></div>').addClass('combo-options').css({ 'position': 'absolute', 'left': position.left + 'px', - 'top': (position.top + combo.outerHeight() + 1) + 'px', - 'width': (combo.outerWidth() - 10) + 'px', + 'top': (position.top + combo.outerHeight() - 1) + 'px', + 'width': (combo.outerWidth() - 2) + 'px', 'overflow-y': 'auto' }); @@ -187,36 +189,29 @@ optionElement.addClass('unset'); } else { optionElement.click(function () { + //remove active styles + $('.combo').removeClass('combo-open'); + // select the option selectOption(combo, option.text, option.value); // click the glass pane which will hide the options $('.combo-glass-pane').click(); }).hover(function () { - $(this).addClass('pointer').find('.combo-option-text').css('text-decoration', 'underline'); + $(this).addClass('pointer').css('background', '#eaeef0'); }, function () { - $(this).removeClass('pointer').find('.combo-option-text').css('text-decoration', 'none'); + $(this).removeClass('pointer').css('background', '#ffffff'); }); } if (!isBlank(option.description)) { - $('<img style="float: left; margin-left: 5px; margin-top: 3px;" src="images/iconInfo.png"></img>').appendTo(optionElement).qtip({ + $('<div style="float: right; line-height: 32px;" class="fa fa-question-circle"></div>').appendTo(optionElement).qtip($.extend({}, nf.Common.config.tooltipConfig, { content: option.description, - style: { - classes: 'combo-nifi-tooltip' - }, - show: { - solo: true, - effect: false - }, - hide: { - effect: false - }, position: { at: 'top right', my: 'bottom left' } - }); + })); } actualHeight += 16; @@ -225,9 +220,9 @@ // set the width of each option text optionList.find('span.combo-option-text').each(function () { var comboOptionText = $(this); - var offset = 10; - if (comboOptionText.parent().children('img').length > 0) { - offset = 25; + var offset = 22; + if (comboOptionText.parent().children('div').length > 0) { + offset = 34; } if (maxHeight > 0 && actualHeight > maxHeight) { offset += 20; @@ -239,18 +234,20 @@ var comboGlassPane = $('<div class="combo-glass-pane"></div>').one('click', function () { if (comboOptions.length !== 0) { // clean up tooltips - comboOptions.find('img').each(function () { + comboOptions.find('.fa').each(function () { var tip = $(this); if (tip.data('qtip')) { var api = tip.qtip('api'); api.destroy(true); } }); - // remove the options comboOptions.remove(); + + //remove active styles + $('.combo').removeClass('combo-open'); } - + // remove the glass pane $(this).remove(); }); @@ -263,7 +260,7 @@ }); // add the drop down arrow - $('<div class="combo-arrow"></div>').appendTo(combo); + $('<div class="combo-arrow fa fa-chevron-down"></div>').appendTo(combo); // set the selection if (isDefinedAndNotNull(options.selectedOption)) { @@ -274,7 +271,7 @@ } }); }, - + /** * Returns the selected option of the first matching element. */ @@ -288,10 +285,10 @@ return value; }, - + /** * Sets the selected option. - * + * * @argument {object} option The option to select */ setSelectedOption: function (option) { http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css index f834275..6b6fe17 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css @@ -19,94 +19,66 @@ */ .dialog { - background-image: url(../../../images/panelBg.jpg); - background-repeat: repeat-x; - background-color: #eee; + background-color: #ffffff; + box-shadow: 0 5px 8px rgba(0,0,0,0.30); + overflow: hidden; } -.show-border { - border: 3px solid #365C6A; - box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9); +.small-dialog { + max-height: 32%; + max-width: 23%; + min-height: 250px; + min-width: 320px; } -.overlay { - border: 1px solid #eee; +.medium-dialog { + max-height: 55%; + max-width: 34%; + min-height: 420px; + min-width: 470px; } -.dialog-header { - width: 100%; - height: 50px; -} - -.dialog-header-text { - position: relative; - top: 20px; - left: 10px; - font-size: 10pt; - font-weight: bold; - color: #264c58; +.large-dialog { + max-height: 72%; + max-width: 55%; + min-height: 560px; + min-width: 760px; } -.dialog-content { - padding: 0 10px; -} - -.dialog-buttons { +.modal-glass { position: absolute; - bottom: 10px; - right: 8px; -} - -div.button { - height: 22px; - /* width: 65px;*/ - border-top: 1px solid #d1d1d1; - border-right: 1px solid #a7a7a7; - border-bottom: 1px solid #828282; - border-left: 1px solid #a7a7a7; - color: #000; - margin: 0 2px; - cursor: pointer; - font-weight: bold; - float: right; - padding: 0 10px; - line-height: 22px; + left: 0px; + top: 0px; + right: 0px; + bottom: 0px; + opacity: 0.65; + background-color: #728E9B; } -div.button-normal { - background: transparent url(../../../images/bgButton.png) repeat-x center center; +.dialog-header { + height: 56px; + background-color: #728E9B; + overflow: hidden; } -div.button-over { - background: transparent url(../../../images/bgButtonOver.png) repeat-x center center; +.dialog-header-text { + color: #fff; + font-size: 18px; + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: bold; + line-height: 56px; + padding-left: 20px; + text-overflow: ellipsis; } -/* - Background overlays. -*/ - -#faded-background { - position: absolute; - z-index: 1200; - background-color: #294c58; - left: 0px; - top: 0px; - right: 0px; - bottom: 0px; - display: none; - opacity: 0.65; - filter: alpha(opacity=65); +.dialog-content { + padding: 10px 20px 20px 20px; + overflow: auto; } -#glass-pane { +.dialog-buttons { position: absolute; - z-index: 1202; - background-image: url(../../../images/spacer.png); - background-repeat: repeat; - background-color: transparent; - left: 0px; - top: 0px; - right: 0px; - bottom: 0px; - display: none; -} + bottom: 0; + width: 100%; +} \ No newline at end of file
