Skip to content

Commit

Permalink
Merge pull request #29 from predixdesignsystem/key-icon-2
Browse files Browse the repository at this point in the history
adding key icon to fea and bumping versions
  • Loading branch information
sks authored Mar 19, 2019
2 parents e15af6d + fd0a7a1 commit af8c569
Show file tree
Hide file tree
Showing 8 changed files with 1,613 additions and 1,610 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v2.2.3
======
* Added px-fea:key

v2.2.2
======
* Stroke width can now be set from parent elements
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-icon-set",
"version": "2.2.2",
"version": "2.2.3",
"description": "Polymer component to allow easy use of Predix icons",
"main": "px-icon-set.html",
"ignore": [
Expand Down
17 changes: 1 addition & 16 deletions icons/optimized-fea/_optimized-fea.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
<!--
Copyright (c) 2018, General Electric
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<g id="administration"><path d="M21.65 25.48l3 2.36 1.57-1.57 1.58-1.58-2.36-3a11.21 11.21 0 0 0 1.26-2.99l3.8-.47v-4.46l-3.8-.47a11.21 11.21 0 0 0-1.23-2.95l2.36-3-1.57-1.59-1.58-1.58-3 2.36A11.21 11.21 0 0 0 18.7 5.3l-.47-3.8h-4.47l-.46 3.8a11.21 11.21 0 0 0-2.95 1.23l-3-2.36-1.59 1.57-1.58 1.58 2.36 3A11.21 11.21 0 0 0 5.3 13.3l-3.8.47v4.46l3.8.47a11.21 11.21 0 0 0 1.23 2.95l-2.36 3 1.57 1.57 1.58 1.58 3-2.36" transform="translate(-1 -1)" stroke-linejoin="round"/><path d="M22.08 16a6.1 6.1 0 0 0-3.74-5.61v6.08h-4.68v-6.08a6.07 6.07 0 0 0-.94 10.73v9.38h6.55v-9.39A6.08 6.08 0 0 0 22.08 16z" transform="translate(-1 -1)" stroke-linejoin="round"/></g>
<g id="alerts"><path d="M14.27.69a1.5 1.5 0 0 1 2 .58l13 22.94A1.53 1.53 0 0 1 28 26.5H2a1.53 1.53 0 0 1-1.3-2.29l13-22.94a1.5 1.5 0 0 1 .57-.58zM15 17.5h1.56l.78-7.07h-4.68l.78 7.07zm-1.4 5.34h2.81v-3.42H13.6z"/></g>
<g id="analysis"><path stroke-linejoin="round" d="M.5 0v27.49h27.43"/><path stroke-linejoin="round" d="M3.5 18.36l7-6.99 7 3 8-8"/><path stroke-linejoin="round" d="M25.5 11.6l-8 8-7-3-7 7h22v-12z"/></g>
Expand All @@ -31,6 +15,7 @@
<g id="dev-ops"><path stroke-linejoin="round" d="M18.27 16.39V5.8L9.39.5.5 5.8v10.59l8.89 5.3 8.88-5.3zm-.5-13.64L21.55.5l7.95 4.74v9.48l-3.74 2.24"/><path stroke-linejoin="round" d="M20.14 12.36l3.75 2.24v9.47l-7.95 4.75-7.96-4.75"/><path d="M12.67 18.79V15A4.24 4.24 0 0 0 12 7.56v4.24H8.76V7.56A4.24 4.24 0 0 0 8.1 15v3.74" transform="translate(-1 -1.04)" stroke-linejoin="round"/></g>
<g id="digital-twin"><path stroke-linejoin="round" d="M12.61 8.46v-2.9l3.37-1.97m1.98-1.18L21.16.5l3.2 1.91m1.99 1.18l3.2 1.91v3.72m0 2.56v3.73l-3.2 1.9m-1.99 1.18l-3.2 1.91-1.4-.83m-2.26 4.32V13.85L9 8.79.5 13.85v10.14L9 29.05l8.5-5.06z"/><circle cx="9" cy="18.92" r="2.81" stroke-linejoin="round"/></g>
<g id="home"><path stroke-linejoin="round" d="M5.5 16v14.5h21V16m-25-.79L16 2.1l14.5 13.11"/><path stroke-linejoin="round" d="M12.5 22.5h7v8h-7z"/></g>
<g id="key"><circle cx="7.6" cy="7.6" r="1.97"/><path d="M17.57 13.39a8.84 8.84 0 1 0-4.18 4.18l.36.35 3.36 3.37v2.8h2.75l1.44 1.44v2.77h2.78l3 3h4.21v-4.21L17.92 13.75zm11.51 15.69L15.64 15.64"/></g>
<g id="log"><g><path d="M23.2 3.4h5.3v27h-25v-27h6.3"/><path d="M11.4 1.5h10v4h-10zm1.6 11h10.3m-14.9 0h3v3h-3zm4.6 3h8.4m-8.4 5h10.3m-14.9 0h3v3h-3zm4.6 3h8.4"/></g></g>
<g id="microservice"><g><path stroke-linejoin="round" d="M28.257 23.187v-14.5l-12.16-7.25-12.16 7.25v14.5l12.16 7.25 12.16-7.25z"/><path stroke-linejoin="round" d="M19.947 19.177l3.17-3.37-3.38-3.17m-7.38-.06l-3.28 3.28 3.28 3.27m1.87 2.81l3.74-12.16"/></g></g>
<g id="orchestration"><g><path d="M30.375 27.562h-29s0-14.28 6.21-22.43 3.11 18.35 9.29 15.29 13.5-18.36 13.5 7.14z" stroke-linejoin="round"/><path d="M1.375 27.562c6.21-11.22 12.43-22.43 15.5-16.32s3.11 11.22 7.25 8.16 6.25 3.06 6.25 8.16" stroke-linejoin="round"/></g></g>
Expand Down
12 changes: 12 additions & 0 deletions icons/optimized-fea/key_32x32.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/src-fea/key_32x32.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit af8c569

Please sign in to comment.