Skip to content

Commit

Permalink
Merge pull request #23 from priyabrat1801/master
Browse files Browse the repository at this point in the history
add new vis icons for reset & delta
  • Loading branch information
skistz authored Jul 10, 2018
2 parents fb25997 + cd11105 commit 38d1abb
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 18 deletions.
5 changes: 5 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v2.1.11
=======
* add px-vis:reset
* add px-vis:delta

v2.1.10
==================
* add px-nav:product-switcher
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.1.10",
"version": "2.1.11",
"description": "Polymer component to allow easy use of Predix icons",
"main": "px-icon-set.html",
"ignore": [
Expand Down
18 changes: 2 additions & 16 deletions icons/optimized-vis/_optimized-vis.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="add-brush"><path stroke-linejoin="round" d="M16.5 14v7m3.5-3.5h-7M10.5 21V0"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M9 17.5H4.5v-14h12V12"/></g>
<g id="all-points-in-area"><circle cx="10.5" cy="10.5" r="10" stroke-linejoin="round"/><path stroke-linejoin="round" d="M10.5 5v4M9 10.5H5m11 0h-4M10.5 12v4"/></g>
<g id="bring-to-front"><path stroke-miterlimit="10" d="M15.5 15v.5"/><path stroke-miterlimit="10" stroke-dasharray="0.9 0.9" d="M15.5 16.4v3.15"/><path stroke-miterlimit="10" d="M15.5 20v.5H15"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M14 20.5H2.5"/><path stroke-miterlimit="10" d="M2 20.5h-.5V20"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M1.5 19V7.5"/><path stroke-miterlimit="10" d="M1.5 7v-.5H2"/><path stroke-miterlimit="10" stroke-dasharray="0.9 0.9" d="M2.9 6.5h3.15"/><path stroke-miterlimit="10" d="M6.5 6.5H7m-.5-5h14v14h-14z"/></g>
Expand All @@ -22,6 +6,7 @@
<g id="closest-point-series"><path stroke-miterlimit="10" d="M0 21.5h22M.5 22V0"/><circle cx="6.34" cy="14.01" r="2.66"/><circle cx="6.34" cy="8.01" r="2.66"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M6.5 0v21"/><path d="M16.34 4.35a2.65 2.65 0 0 1 .62.08A2.65 2.65 0 0 0 17 4a2.66 2.66 0 1 0-3.28 2.58 2.66 2.66 0 0 1 2.62-2.23z" stroke-miterlimit="10"/><circle cx="12.34" cy="13.01" r="2.66" stroke-miterlimit="10"/><circle cx="18.34" cy="17.01" r="2.66" stroke-miterlimit="10"/><circle cx="16.34" cy="7.01" r="2.66" stroke-miterlimit="10"/></g>
<g id="comment"><path d="M10 17.66l-3.37-4.28H.5V.5h19v12.88h-6.13L10 17.66zM3.87 4.18h12.26M3.87 6.63h8.58M3.87 9.08h4.9"/></g>
<g id="crosshair"><path stroke-linejoin="round" d="M10.5 0v8M8 10.5H0m21 0h-8M10.5 13v8"/></g>
<g id="delta"><path stroke-miterlimit="10" d="M13.44 20.67H1.5L11 1.63l9.5 19.04h-4.22L11 9.38"/></g>
<g id="draw-stripe"><path stroke-linejoin="round" d="M16.5 14v7m3.5-3.5h-7M1.56 15.91L6.5 9.5l7 4 6.52-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M17 19.5H6.5v-18h10V12"/></g>
<g id="expand-radius"><circle cx="11" cy="11" r="6.5" stroke-linejoin="round"/><path stroke-linejoin="round" d="M4 .5H.5V4M.5.5l4 4M18 .5h3.5V4m0-3.5l-4 4M4 21.5H.5V18m0 3.5l4-4m13.5 4h3.5V18m0 3.5l-4-4"/></g>
<g id="full-screen"><rect x=".5" y=".5" width="21" height="21" rx="2" ry="2" stroke-linejoin="round"/><path stroke-linejoin="round" d="M4 18L18 4m-8-.5h8.5V12M12 18.5H3.5V10"/></g>
Expand All @@ -33,6 +18,7 @@
<g id="refresh"><path stroke-linejoin="round" d="M15 6.5h5.5V1m1 10a10.49 10.49 0 1 1-1-4.49"/></g>
<g id="remove-brush"><path stroke-linejoin="round" d="M10.5 21V0M20 17.5h-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M11 17.5H4.5v-14h12V14"/></g>
<g id="remove-stripe"><path stroke-linejoin="round" d="M1.56 15.91L6.5 9.5l7 4 6.52-7m-.02 11h-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M17 19.5H6.5v-18h10V16"/></g>
<g id="reset"><path d="M1.46 6.55c3.75-8.11 15.74-7.94 19.22.3C24.07 14.87 16.33 23.49 8 21A10.61 10.61 0 0 1 .51 11" stroke-miterlimit="10"/><path stroke-miterlimit="10" d="M6.88 6.44h-5.5V.94"/></g>
<g id="reset-zoom"><path stroke-linejoin="round" d="M13 .5h8.5V9M9 21.5H.5V13m21 0v8.5H13M.5 9V.5H9"/></g>
<g id="resize"><path d="M.5 0v22m.4-.5h15.3m.8-2.3l2.1 2.1 2.1-2.1m-7.57-3.35l-3.6 3.6-3.6-3.6m3.6-4.5v8m-3.6-14.6l3.6-3.6 3.6 3.6m-3.6 4.4v-8"/></g>
<g id="show-tooltip"><circle cx="10.52" cy="10.5" r="10" stroke-linejoin="round"/><circle cx="10.52" cy="6.93" r=".5" stroke-linejoin="round"/><path stroke-linejoin="round" d="M10.52 9.79v5.71"/></g>
Expand Down
6 changes: 6 additions & 0 deletions icons/optimized-vis/delta_22x22.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/optimized-vis/reset_22x22.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-vis/delta_22x22.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-vis/reset_22x22.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-icon-set",
"version": "2.1.10",
"version": "2.1.11",
"description": "Base icon styles for Predix UI",
"private": false,
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions px-icon-set-vis.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<g id="closest-point-series"><path stroke-miterlimit="10" d="M0 21.5h22M.5 22V0"/><circle cx="6.34" cy="14.01" r="2.66"/><circle cx="6.34" cy="8.01" r="2.66"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M6.5 0v21"/><path d="M16.34 4.35a2.65 2.65 0 0 1 .62.08A2.65 2.65 0 0 0 17 4a2.66 2.66 0 1 0-3.28 2.58 2.66 2.66 0 0 1 2.62-2.23z" stroke-miterlimit="10"/><circle cx="12.34" cy="13.01" r="2.66" stroke-miterlimit="10"/><circle cx="18.34" cy="17.01" r="2.66" stroke-miterlimit="10"/><circle cx="16.34" cy="7.01" r="2.66" stroke-miterlimit="10"/></g>
<g id="comment"><path d="M10 17.66l-3.37-4.28H.5V.5h19v12.88h-6.13L10 17.66zM3.87 4.18h12.26M3.87 6.63h8.58M3.87 9.08h4.9"/></g>
<g id="crosshair"><path stroke-linejoin="round" d="M10.5 0v8M8 10.5H0m21 0h-8M10.5 13v8"/></g>
<g id="delta"><path stroke-miterlimit="10" d="M13.44 20.67H1.5L11 1.63l9.5 19.04h-4.22L11 9.38"/></g>
<g id="draw-stripe"><path stroke-linejoin="round" d="M16.5 14v7m3.5-3.5h-7M1.56 15.91L6.5 9.5l7 4 6.52-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M17 19.5H6.5v-18h10V12"/></g>
<g id="expand-radius"><circle cx="11" cy="11" r="6.5" stroke-linejoin="round"/><path stroke-linejoin="round" d="M4 .5H.5V4M.5.5l4 4M18 .5h3.5V4m0-3.5l-4 4M4 21.5H.5V18m0 3.5l4-4m13.5 4h3.5V18m0 3.5l-4-4"/></g>
<g id="full-screen"><rect x=".5" y=".5" width="21" height="21" rx="2" ry="2" stroke-linejoin="round"/><path stroke-linejoin="round" d="M4 18L18 4m-8-.5h8.5V12M12 18.5H3.5V10"/></g>
Expand All @@ -37,6 +38,7 @@
<g id="refresh"><path stroke-linejoin="round" d="M15 6.5h5.5V1m1 10a10.49 10.49 0 1 1-1-4.49"/></g>
<g id="remove-brush"><path stroke-linejoin="round" d="M10.5 21V0M20 17.5h-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M11 17.5H4.5v-14h12V14"/></g>
<g id="remove-stripe"><path stroke-linejoin="round" d="M1.56 15.91L6.5 9.5l7 4 6.52-7m-.02 11h-7"/><path stroke-miterlimit="10" stroke-dasharray="1 1" d="M17 19.5H6.5v-18h10V16"/></g>
<g id="reset"><path d="M1.46 6.55c3.75-8.11 15.74-7.94 19.22.3C24.07 14.87 16.33 23.49 8 21A10.61 10.61 0 0 1 .51 11" stroke-miterlimit="10"/><path stroke-miterlimit="10" d="M6.88 6.44h-5.5V.94"/></g>
<g id="reset-zoom"><path stroke-linejoin="round" d="M13 .5h8.5V9M9 21.5H.5V13m21 0v8.5H13M.5 9V.5H9"/></g>
<g id="resize"><path d="M.5 0v22m.4-.5h15.3m.8-2.3l2.1 2.1 2.1-2.1m-7.57-3.35l-3.6 3.6-3.6-3.6m3.6-4.5v8m-3.6-14.6l3.6-3.6 3.6 3.6m-3.6 4.4v-8"/></g>
<g id="show-tooltip"><circle cx="10.52" cy="10.5" r="10" stroke-linejoin="round"/><circle cx="10.52" cy="6.93" r=".5" stroke-linejoin="round"/><path stroke-linejoin="round" d="M10.52 9.79v5.71"/></g>
Expand Down

0 comments on commit 38d1abb

Please sign in to comment.