diff --git a/infl-fonts/influicons.css b/infl-fonts/influicons.css index 36cff492..9659a56f 100644 --- a/infl-fonts/influicons.css +++ b/infl-fonts/influicons.css @@ -99,4 +99,5 @@ .ic.ic-disqus:before { content: "\E04B" } .ic.ic-circle-empty:before { content: "\E04C" } .ic.ic-cursor-click:before { content: "\E04D" } -.ic.ic-coins-old:before { content: "\E04E" } +.ic.ic-crop:before { content: "\E04E" } +.ic.ic-coins-old:before { content: "\E04F" } diff --git a/infl-fonts/influicons.eot b/infl-fonts/influicons.eot index 944a3144..4d7753a1 100644 Binary files a/infl-fonts/influicons.eot and b/infl-fonts/influicons.eot differ diff --git a/infl-fonts/influicons.html b/infl-fonts/influicons.html index 791cfd38..1aa153cc 100644 --- a/infl-fonts/influicons.html +++ b/infl-fonts/influicons.html @@ -395,6 +395,11 @@ <span class="ic ic-cursor-click">

+

+ + <span class="ic ic-crop"> +

+

<span class="ic ic-coins-old"> diff --git a/infl-fonts/influicons.svg b/infl-fonts/influicons.svg index 749302f9..ef4b83d6 100644 --- a/infl-fonts/influicons.svg +++ b/infl-fonts/influicons.svg @@ -238,8 +238,11 @@ - + diff --git a/infl-fonts/influicons.ttf b/infl-fonts/influicons.ttf index 0b084bd5..43422db8 100644 Binary files a/infl-fonts/influicons.ttf and b/infl-fonts/influicons.ttf differ diff --git a/infl-fonts/influicons.woff b/infl-fonts/influicons.woff index 435488b2..0fb4fb9a 100644 Binary files a/infl-fonts/influicons.woff and b/infl-fonts/influicons.woff differ diff --git a/infl-patternlab/source/css/style.css b/infl-patternlab/source/css/style.css index 0cc7b3ef..55231258 100755 --- a/infl-patternlab/source/css/style.css +++ b/infl-patternlab/source/css/style.css @@ -1032,10 +1032,14 @@ h6 { content: ""; } -.ic.ic-coins-old:before { +.ic.ic-crop:before { content: ""; } +.ic.ic-coins-old:before { + content: ""; +} + @font-face { font-family: 'Proxima Nova Light'; src: url("../fonts/ProximaNova-Light.eot"); @@ -3032,10 +3036,14 @@ textarea { content: ""; } -.ic.ic-coins-old:before { +.ic.ic-crop:before { content: ""; } +.ic.ic-coins-old:before { + content: ""; +} + .pt-tabs { width: 100%; } diff --git a/infl-patternlab/source/js/infl-components.js b/infl-patternlab/source/js/infl-components.js index 72af27c5..087027e4 100644 --- a/infl-patternlab/source/js/infl-components.js +++ b/infl-patternlab/source/js/infl-components.js @@ -4358,6 +4358,17 @@ var UploadFile = function(initializeFilepicker, uploadOptions){ window.filepicker.pick(optionsWithCompression, onSuccess, onError); } + function crop(onSuccess, ratio, image){ + var optionsWithCrop = uploadOptions(); + if(ratio){ + optionsWithCrop.cropRatio = ratio; + } + optionsWithCrop.services.push('CONVERT'); + optionsWithCrop.conversions = ['crop']; + + window.filepicker.processImage(image, optionsWithCrop, onSuccess); + } + function onError(FPError){ console.log(FPError); } @@ -4367,7 +4378,8 @@ var UploadFile = function(initializeFilepicker, uploadOptions){ upload : upload, uploadWithCrop : uploadWithCrop, covertToImage : covertToImage, - uploadAndCompress : uploadAndCompress + uploadAndCompress : uploadAndCompress, + crop : crop }; }; @@ -53923,6 +53935,8 @@ var icons = { "cursor-click": "cursor-click", + "crop": "crop", + "coins-old": "coins-old", diff --git a/infl-patternlab/source/js/patterns/atoms/influicons-list.js b/infl-patternlab/source/js/patterns/atoms/influicons-list.js index b495b395..de85e5b3 100644 --- a/infl-patternlab/source/js/patterns/atoms/influicons-list.js +++ b/infl-patternlab/source/js/patterns/atoms/influicons-list.js @@ -156,6 +156,8 @@ var icons = { "cursor-click": "cursor-click", + "crop": "crop", + "coins-old": "coins-old", diff --git a/infl-styles/_icon.scss b/infl-styles/_icon.scss index 75aed97d..d8eb973e 100644 --- a/infl-styles/_icon.scss +++ b/infl-styles/_icon.scss @@ -775,12 +775,22 @@ } -.ic.ic-coins-old:before { +.ic.ic-crop:before { content: "\E04E" } -@mixin ic-coins-old() { +@mixin ic-crop() { font-family: 'influicons'; content: "\E04E" } + +.ic.ic-coins-old:before { + content: "\E04F" +} + +@mixin ic-coins-old() { + font-family: 'influicons'; + content: "\E04F" +} +