Skip to content

Commit

Permalink
Update vendors
Browse files Browse the repository at this point in the history
Update font-awesome to 4.2 and use the named vendors.
  • Loading branch information
barryvdh committed Nov 23, 2014
1 parent 995da25 commit 9b76117
Show file tree
Hide file tree
Showing 3 changed files with 574 additions and 1,087 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"php": ">=5.3.0",
"laravel/framework": "4.*|5.0.*",
"symfony/finder": "~2.3",
"maximebf/debugbar": "1.10.*"
"maximebf/debugbar": "~1.10.1"
},
"autoload": {
"psr-4": {
Expand Down
5 changes: 0 additions & 5 deletions src/JavascriptRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ class JavascriptRenderer extends BaseJavascriptRenderer
/** @var \Illuminate\Routing\UrlGenerator */
protected $url;

protected $cssVendors = array(
// 'vendor/font-awesome/css/font-awesome.min.css', // Removed until font is embedded
'highlightjs' => 'vendor/highlightjs/styles/github.css'
);

public function __construct(DebugBar $debugBar, $baseUrl = null, $basePath = null)
{
parent::__construct($debugBar, $baseUrl, $basePath);
Expand Down
1,654 changes: 573 additions & 1,081 deletions src/Resources/vendor/font-awesome/style.css

Large diffs are not rendered by default.

0 comments on commit 9b76117

Please sign in to comment.