Include font awesome

This commit is contained in:
Oliver Davies 2015-09-12 17:57:33 +01:00
parent f03c78f989
commit b177f528be
3 changed files with 42 additions and 1 deletions

View file

@ -3,6 +3,7 @@
"components/bootstrap": "~2.3.1",
"components/highlightjs": "~7.3.0",
"components/jquery": "~1.9.1",
"components/font-awesome": "@stable",
"thomaspark/bootswatch": "@dev",
"tsphethean/sculpin-related-posts-bundle": "~0.1.0"
},

View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "bfddc03ede664e6abc3827244340aba6",
"hash": "a1dfc1795b5e431b88df331c013308b2",
"packages": [
{
"name": "components/bootstrap",
@ -61,6 +61,43 @@
],
"time": "2013-07-18 20:01:48"
},
{
"name": "components/font-awesome",
"version": "4.4.0",
"source": {
"type": "git",
"url": "https://github.com/components/font-awesome.git",
"reference": "7dffacc72e566e5db6272244effc06f64fe9f185"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/components/font-awesome/zipball/7dffacc72e566e5db6272244effc06f64fe9f185",
"reference": "7dffacc72e566e5db6272244effc06f64fe9f185",
"shasum": ""
},
"type": "component",
"extra": {
"branch-alias": {
"dev-master": "4.4.x-dev"
},
"component": {
"styles": [
"css/font-awesome.css"
],
"files": [
"css/font-awesome.min.css",
"fonts/*"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT",
"OFL-1.1"
],
"description": "The iconic font designed for use with Twitter Bootstrap.",
"time": "2015-07-30 02:38:45"
},
{
"name": "components/highlightjs",
"version": "7.3.0",
@ -385,6 +422,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"components/font-awesome": 0,
"thomaspark/bootswatch": 20
},
"prefer-stable": false,

View file

@ -17,9 +17,11 @@
<meta lang="{{ site.html_lang }}" charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}">
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css">
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
<link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
{% for size in site.apple_touch_icon_sizes %}
<link rel="apple-touch-icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">