diff --git a/css/lib/font-awesome.min.css b/css/lib/font-awesome.min.css index f123f78..23dd6f7 100644 --- a/css/lib/font-awesome.min.css +++ b/css/lib/font-awesome.min.css @@ -1,5 +1,5 @@ /*! - * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ @font-face { @@ -2548,3 +2548,83 @@ .fa-fonticons:before { content: "\f280" } + +.fa-reddit-alien:before { + content: "\f281" +} + +.fa-edge:before { + content: "\f282" +} + +.fa-credit-card-alt:before { + content: "\f283" +} + +.fa-codiepie:before { + content: "\f284" +} + +.fa-modx:before { + content: "\f285" +} + +.fa-fort-awesome:before { + content: "\f286" +} + +.fa-usb:before { + content: "\f287" +} + +.fa-product-hunt:before { + content: "\f288" +} + +.fa-mixcloud:before { + content: "\f289" +} + +.fa-scribd:before { + content: "\f28a" +} + +.fa-pause-circle:before { + content: "\f28b" +} + +.fa-pause-circle-o:before { + content: "\f28c" +} + +.fa-stop-circle:before { + content: "\f28d" +} + +.fa-stop-circle-o:before { + content: "\f28e" +} + +.fa-shopping-bag:before { + content: "\f290" +} + +.fa-shopping-basket:before { + content: "\f291" +} + +.fa-hashtag:before { + content: "\f292" +} + +.fa-bluetooth:before { + content: "\f293" +} + +.fa-bluetooth-b:before { + content: "\f294" +} + +.fa-percent:before { + content: "\f295" +} diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf index 681bdd4..3ed7f8b 100644 Binary files a/fonts/FontAwesome.otf and b/fonts/FontAwesome.otf differ diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot index a30335d..9b6afae 100644 Binary files a/fonts/fontawesome-webfont.eot and b/fonts/fontawesome-webfont.eot differ diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg index 6fd19ab..d05688e 100644 --- a/fonts/fontawesome-webfont.svg +++ b/fonts/fontawesome-webfont.svg @@ -1,6 +1,6 @@ - + @@ -219,8 +219,8 @@ - - + + @@ -362,7 +362,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -600,11 +600,11 @@ - - + + - + @@ -621,20 +621,35 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf index d7994e1..26dea79 100644 Binary files a/fonts/fontawesome-webfont.ttf and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff index 6fd4ede..dc35ce3 100644 Binary files a/fonts/fontawesome-webfont.woff and b/fonts/fontawesome-webfont.woff differ diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2 index 5560193..500e517 100644 Binary files a/fonts/fontawesome-webfont.woff2 and b/fonts/fontawesome-webfont.woff2 differ diff --git a/js/lib/font-awesome-iconpicker.min.js b/js/lib/font-awesome-iconpicker.min.js index 084d161..b7bc899 100644 --- a/js/lib/font-awesome-iconpicker.min.js +++ b/js/lib/font-awesome-iconpicker.min.js @@ -1075,6 +1075,26 @@ "vimeo", "black-tie", "fonticons", + "reddit-alien", + "edge", + "credit-card-alt", + "codiepie", + "modx", + "fort-awesome", + "usb", + "product-hunt", + "mixcloud", + "scribd", + "pause-circle", + "pause-circle-o", + "stop-circle", + "stop-circle-o", + "shopping-bag", + "shopping-basket", + "hashtag", + "bluetooth", + "bluetooth-b", + "percent" ] c.defaultOptions.icons.sort(); diff --git a/readme.md b/readme.md index 5e905a6..0e6113a 100644 --- a/readme.md +++ b/readme.md @@ -52,4 +52,4 @@ The controller extension should make sure you've got access to the icons so you Got you covered, checkout [color-swabs](https://github.com/peavers/silverstripe-color-swabs)! ## Libraries used/modified -* Font Awesome Icon Picker +* Font Awesome Icon Picker 4.5