diff options
author | Treer <treer.git@the-bordello.com> | 2016-04-30 21:36:19 +1000 |
---|---|---|
committer | Treer <treer.git@the-bordello.com> | 2016-04-30 21:36:19 +1000 |
commit | 45654ffc5cc4532c2189c88d46a0374038b53c9f (patch) | |
tree | fc1c9949dcabd360c120d318c9fe3181d47c8f42 /library/font_awesome/src/_layouts/base.html | |
parent | 931a4fafe316b23bacf92ac1ff35f9b8467415dd (diff) | |
download | volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.tar.gz volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.tar.bz2 volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.zip |
update font-awesome library to 4.6.1
Perhaps this should be done as a submodule instead?
Diffstat (limited to 'library/font_awesome/src/_layouts/base.html')
-rw-r--r-- | library/font_awesome/src/_layouts/base.html | 80 |
1 files changed, 43 insertions, 37 deletions
diff --git a/library/font_awesome/src/_layouts/base.html b/library/font_awesome/src/_layouts/base.html index 76de7cb41..546120a1c 100644 --- a/library/font_awesome/src/_layouts/base.html +++ b/library/font_awesome/src/_layouts/base.html @@ -1,64 +1,70 @@ <!DOCTYPE html> -<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]--> -<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]--> -<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]--> -<!--[if (gte IE 9)|!(IE)]><!--> -<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]--> +<html lang="en"> <head> <!-- Basic Page Needs ================================================== --> <meta charset="utf-8" /> - <title>{% if page.title %}{{ page.title }}{% endif %}</title> - <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + <meta name="description" content="Font Awesome, the iconic font and CSS framework"> <meta name="author" content="Dave Gandy"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">--> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico"> - <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> + <title>{% if page.title %}{{ page.title }}{% endif %}</title> <!-- CSS - ================================================== --> - + ================================================== --> <link rel="stylesheet" href="{{ page.relative_path }}assets/css/site.css"> <link rel="stylesheet" href="{{ page.relative_path }}assets/css/pygments.css"> <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome.css"> - <!--[if IE 7]> - <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome-ie7.css"> + + <!--[if lt IE 9]> + <script src="{{ page.relative_path }}assets/js/html5shiv.js"></script> + <script src="{{ page.relative_path }}assets/js/respond.min.js"></script> <![endif]--> - <!-- Le fav and touch icons --> - <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico"> - <script type="text/javascript" src="//use.typekit.net/wnc7ioh.js"></script> - <script type="text/javascript">try{Typekit.load();}catch(e){}</script> + <script src="https://use.fonticons.com/ffe176a3.js"></script> - <script type="text/javascript"> + <script> var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-30136587-1']); _gaq.push(['_trackPageview']); (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + var ga = document.createElement('script'); + ga.src = 'https://www.google-analytics.com/ga.js'; + var s = document.scripts[0]; + s.parentNode.insertBefore(ga, s); })(); </script> </head> -<body data-spy="scroll" data-target=".navbar"> -<div class="wrapper"> <!-- necessary for sticky footer. wrap all content except footer --> - {% include navbar.html %} +<body class="font-awesome {{ page.view_class }}"> + <script> + (function(){ + var bsa = document.createElement('script'); + bsa.src = 'https://s3.buysellads.com/ac/bsa.js'; + var s = document.scripts[0]; + s.parentNode.insertBefore(bsa, s); + })(); + </script> + <div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer --> + {% include navbar.html %} - {{ content }} - <div class="push"><!-- necessary for sticky footer --></div> -</div> -{% include footer.html %} + {{ content }} -<script src="http://platform.twitter.com/widgets.js"></script> -<script src="{{ page.relative_path }}assets/js/jquery-1.7.1.min.js"></script> -<script src="{{ page.relative_path }}assets/js/ZeroClipboard-1.1.7.min.js"></script> -<script src="{{ page.relative_path }}assets/js/bootstrap-2.3.1.min.js"></script> -<script src="{{ page.relative_path }}assets/js/site.js"></script> + </div> + {% include footer.html %} -</body> + <script src="https://platform.twitter.com/widgets.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/{{ site.jquery.version }}/jquery.min.js"></script> + <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/{{ site.jquery_validate.version }}/jquery.validate.min.js"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js"></script> + <script src="https://cdn.jsdelivr.net/algoliasearch/3.13.1/algoliasearch.jquery.min.js" integrity="sha256-2MTQjOt4Q02v+W/QjgCO5yv+si9RAo/o/RGR5alVYzY=" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/algoliasearch.helper/2.9.1/algoliasearch.helper.min.js" integrity="sha256-MhjLBzVVNkMEKnIE2ueYNb7QSj+oiSv4x89dlui09hg=" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/underscorejs/1.8.3/underscore-min.js" integrity="sha256-obZACiHd7gkOk9iIL/pimWMTJ4W/pBsKu+oZnSeBIek=" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/backbonejs/1.2.2/backbone-min.js" integrity="sha256-p6bkfFqmxtebrKOS+wyGi+Qf3d111eWUQP67keyXJ6Q=" crossorigin="anonymous"></script> + <script src="https://cdn.jsdelivr.net/jsdelivr-rum/1.5/jsdelivr-rum.min.js" integrity="sha256-HlY2rbkgbiHhtilMXmQ86rjL/EIxGDtdg9GU9/T2ZxE=" crossorigin="anonymous"></script> + <script src="{{ page.relative_path }}assets/js/site.js"></script> + <script src="{{ page.relative_path }}assets/js/search.js"></script> + </body> </html> |