library-mirrors/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-11-20 11:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ad-proxy' into 4.7.0

Browse Source
This commit is contained in:
Dave Gandy 2016-10-11 13:11:08 -04:00
commit ccd56161b2
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -4,4 +4,5 @@ gem 'jekyll', '~> 1.0'
gem 'safe_yaml', '~> 1.0.4' gem 'safe_yaml', '~> 1.0.4'
gem 'sass', '~> 3.0' gem 'sass', '~> 3.0'
gem 'less', '~> 2.5.0' gem 'less', '~> 2.5.0'
gem 'libv8', '~> 3.16.14.0'
gem 'therubyracer' gem 'therubyracer'

6
Gemfile.lock
View File

@ -24,7 +24,7 @@ GEM
toml (~> 0.1.0) toml (~> 0.1.0)
less (2.5.1) less (2.5.1)
commonjs (~> 0.2.7) commonjs (~> 0.2.7)
libv8 (3.16.14.13) libv8 (3.16.14.15)
liquid (2.5.5) liquid (2.5.5)
listen (1.3.1) listen (1.3.1)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
@ -59,6 +59,10 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
jekyll (~> 1.0) jekyll (~> 1.0)
less (~> 2.5.0) less (~> 2.5.0)
libv8 (~> 3.16.14.0)
safe_yaml (~> 1.0.4) safe_yaml (~> 1.0.4)
sass (~> 3.0) sass (~> 3.0)
therubyracer therubyracer
BUNDLED WITH
1.13.2

2
src/_includes/footer.html
View File

@ -1,6 +1,6 @@
<footer id="footer" class="footer hidden-print"> <footer id="footer" class="footer hidden-print">
<div class="container text-center"> <div class="container text-center">
<div id="bsap_1298241" class="bsarocks bsap_b1146e3f9fa32a794fc6d2c7be47ece8"> <div id="inventory" class="bsarocks">
<a href="http://www.wpbeginner.com/?utm_source=fontawesome_footer&utm_medium=banner&utm_campaign=fontawesome" <a href="http://www.wpbeginner.com/?utm_source=fontawesome_footer&utm_medium=banner&utm_campaign=fontawesome"
title="Beginner's Guide to WordPress" target="_blank" rel="nofollow" title="Beginner's Guide to WordPress" target="_blank" rel="nofollow"
onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'wpbeginner.com']);"> onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'wpbeginner.com']);">

23
src/_layouts/base.html
View File

@ -39,22 +39,12 @@
</script> </script>
</head> </head>
<body class="font-awesome {{ page.view_class }}"> <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 --> <div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer -->
{% include navbar.html %} {% include navbar.html %}
{{ content }} {{ content }}
</div> </div>
{% include footer.html %} {% include footer.html %}
<script src="https://platform.twitter.com/widgets.js"></script> <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.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://ajax.aspnetcdn.com/ajax/jquery.validate/{{ site.jquery_validate.version }}/jquery.validate.min.js"></script>
@ -66,6 +56,19 @@
<script src="https://cdn.jsdelivr.net/jsdelivr-rum/1.5/jsdelivr-rum.min.js" integrity="sha256-HlY2rbkgbiHhtilMXmQ86rjL/EIxGDtdg9GU9/T2ZxE=" 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/site.js"></script>
<script src="{{ page.relative_path }}assets/js/search.js"></script> <script src="{{ page.relative_path }}assets/js/search.js"></script>
<script src="{{ page.relative_path }}assets/js/monetization.js" type="text/javascript"></script>
<script>
(function(){
// format, zoneKey, segment:value, options
_bsa.init('imageonly', 'CVADP2Y', 'placement:demo', {
target: '#inventory',
disable_css: true,
path: '//localhost:4000/api/inventory?zone=CVADP2Y'
});
})();
</script>
<!-- Facebook Pixel Code --> <!-- Facebook Pixel Code -->
<script> <script>
!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod? !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?

1
src/assets/js/monetization.js Normal file
View File

File diff suppressed because one or more lines are too long