Skip to content

Commit

Permalink
Merge pull request FortAwesome#6104 from mathiasbynens/patch-2
Browse files Browse the repository at this point in the history 
Use HTTPS where possible
  • Loading branch information
@tagliala
tagliala committed Mar 30, 2015
2 parents 135c3ef + a13c9f0 commit f1a296d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/_includes/ads/fusion.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=fontawesome" id="_fusionads_js"></script>
<script src="https://cdn.fusionads.net/fusion.js?zoneid=1332&amp;serve=C6SDP2Y&amp;placement=fontawesome" id="_fusionads_js"></script>
4 changes: 2 additions & 2 deletions src/_includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div>
<i class="fa fa-flag"></i> Font Awesome {{ site.fontawesome.version }}
<span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
Created by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
Created by <a href="https://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
</div>
<div>
Font Awesome licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
Expand All @@ -19,7 +19,7 @@
Documentation licensed under <a href="{{ site.fontawesome.license.documentation.url }}">{{ site.fontawesome.license.documentation.version }}</a>
</div>
<div>
Thanks to <a href="http://maxcdn.com"><i class="fa fa-maxcdn"></i> MaxCDN</a> for providing the excellent <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN for Font Awesome</a>
Thanks to <a href="http://maxcdn.com/"><i class="fa fa-maxcdn"></i> MaxCDN</a> for providing the excellent <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN for Font Awesome</a>
</div>
<div class="project">
<a href="{{ site.fontawesome.github.url }}">GitHub Project</a> &middot;
Expand Down
39 changes: 20 additions & 19 deletions src/_layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Basic Page Needs
================================================== -->
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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 http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -23,29 +23,29 @@
<script src="{{ page.relative_path }}assets/js/respond.min.js"></script>
<![endif]-->

<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.typekit.net/wnc7ioh.js"></script>
<script>try{Typekit.load();}catch(e){}</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>
<script type="text/javascript">
<script>
(function(){
var bsa = document.createElement('script');
bsa.type = 'text/javascript';
bsa.async = true;
bsa.src = 'http://s3.buysellads.com/ac/bsa.js';
(document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(bsa);
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 -->
Expand All @@ -56,19 +56,20 @@
</div>
{% include footer.html %}

<script src="http://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="//netdna.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js"></script>
<script src="{{ page.relative_path}}assets/js/tabcomplete.min.js"></script>
<script src="{{ page.relative_path }}assets/js/site.js"></script>
<script type="text/javascript">
<script>
(function() {
window._pa = window._pa || {};
var pa = document.createElement('script'); pa.type = 'text/javascript'; pa.async = true;
pa.src = ('https:' == document.location.protocol ? 'https:' : 'http:') + "//tag.perfectaudience.com/serve/54bfdab8751a087f190000f8.js";
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(pa, s);
var pa = document.createElement('script');
pa.src = 'https://tag.perfectaudience.com/serve/54bfdab8751a087f190000f8.js';
var s = document.scripts[0];
s.parentNode.insertBefore(pa, s);
})();
</script>
<script src="//load.sumome.com/" data-sumo-site-id="24237ee44267a89bbc339f27e22e961bf78a1ada5785f8173d40c094e994c8a6" async="async"></script>
<script src="https://load.sumome.com/" data-sumo-site-id="24237ee44267a89bbc339f27e22e961bf78a1ada5785f8173d40c094e994c8a6" async></script>
</body>
</html>

0 comments on commit f1a296d

Please sign in to comment.