Skip to content

Commit

Permalink
* upgraded to font-awesome v4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
peavers committed Nov 12, 2016
1 parent 51c69c3 commit 6f71cd8
Show file tree
Hide file tree
Showing 9 changed files with 2,766 additions and 3,272 deletions.
2,617 changes: 2 additions & 2,615 deletions css/lib/font-awesome.min.css

Large diffs are not rendered by default.

Binary file modified fonts/FontAwesome.otf
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.eot
Binary file not shown.
3,320 changes: 2,668 additions & 652 deletions fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file modified fonts/fontawesome-webfont.woff2
Binary file not shown.
99 changes: 95 additions & 4 deletions js/lib/font-awesome-iconpicker.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@
"stumbleupon",
"delicious",
"digg",
"pied-piper",
"pied-piper-pp",
"pied-piper-alt",
"drupal",
"joomla",
Expand Down Expand Up @@ -888,6 +888,7 @@
"life-ring",
"circle-o-notch",
"ra",
"resistance",
"rebel",
"ge",
"empire",
Expand Down Expand Up @@ -1004,6 +1005,7 @@
"opencart",
"expeditedssl",
"battery-4",
"battery",
"battery-full",
"battery-3",
"battery-three-quarters",
Expand Down Expand Up @@ -1055,8 +1057,7 @@
"firefox",
"opera",
"internet-explorer",
"tv",
"television",
"tvtelevision",
"contao",
"500px",
"amazon",
Expand Down Expand Up @@ -1094,7 +1095,97 @@
"hashtag",
"bluetooth",
"bluetooth-b",
"percent"
"percent",
"gitlab",
"wpbeginner",
"wpforms",
"envira",
"universal-access",
"wheelchair-alt",
"question-circle-o",
"blind",
"audio-description",
"volume-control-phone",
"braille",
"assistive-listening-systems",
"asl-interpreting",
"american-sign-language-interpreting",
"deafness",
"hard-of-hearing",
"deaf",
"glide",
"glide-g",
"signing",
"sign-language",
"low-vision",
"viadeo",
"viadeo-square",
"snapchat",
"snapchat-ghost",
"snapchat-square",
"pied-piper",
"first-order",
"yoast",
"themeisle",
"google-plus-circle",
"google-plus-official",
"fa",
"font-awesome",
"handshake-o",
"envelope-open",
"envelope-open-o",
"linode",
"address-book",
"address-book-o",
"vcard",
"address-card",
"vcard-o",
"address-card-o",
"user-circle",
"user-circle-o",
"user-o",
"id-badge",
"drivers-license",
"id-card",
"drivers-license-o",
"id-card-o",
"quora",
"free-code-camp",
"telegram",
"thermometer-4",
"thermometer",
"thermometer-full",
"thermometer-3",
"thermometer-three-quarters",
"thermometer-2",
"thermometer-half",
"thermometer-1",
"thermometer-quarter",
"thermometer-0",
"thermometer-empty",
"shower",
"bathtub",
"s15",
"bath",
"podcast",
"window-maximize",
"window-minimize",
"window-restore",
"times-rectangle",
"window-close",
"times-rectangle-o",
"window-close-o",
"bandcamp",
"grav",
"etsy",
"imdb",
"ravelry",
"eercast",
"microchip",
"snowflake-o",
"superpowers",
"wpexplorer",
"meetup"
]

c.defaultOptions.icons.sort();
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 4.5
* Font Awesome 4.7

0 comments on commit 6f71cd8

Please sign in to comment.