diff options
| author | Mark Otto <[email protected]> | 2013-08-05 00:03:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 00:03:24 -0700 |
| commit | 7f632ef5b4c1bb5fa17b78fa34e2f95d3a49ec43 (patch) | |
| tree | 68e8844201d255c52a79ba49ae3d9e4844c0c12a /_includes | |
| parent | a2823d0f5efa3bf8c831de65a13d240e295493e2 (diff) | |
| parent | 88652f745f8db8e8af6bea23bfd77b40dfc0d60a (diff) | |
| download | bootstrap-7f632ef5b4c1bb5fa17b78fa34e2f95d3a49ec43.tar.xz bootstrap-7f632ef5b4c1bb5fa17b78fa34e2f95d3a49ec43.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/ads.html | 2 | ||||
| -rw-r--r-- | _includes/footer.html | 3 | ||||
| -rw-r--r-- | _includes/header.html | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/_includes/ads.html b/_includes/ads.html index 495e7ba47..ba4775f5e 100644 --- a/_includes/ads.html +++ b/_includes/ads.html @@ -1 +1 @@ -<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
\ No newline at end of file +<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div> diff --git a/_includes/footer.html b/_includes/footer.html index 47a671b26..83ff87e26 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@ <script src="{{ page.base_url }}assets/js/jquery.js"></script> <script src="{{ page.base_url }}dist/js/bootstrap.js"></script> -<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> +<script src="http://platform.twitter.com/widgets.js"></script> <script src="{{ page.base_url }}assets/js/holder.js"></script> <script src="{{ page.base_url }}assets/js/application.js"></script> @@ -15,7 +15,6 @@ var _gauges = _gauges || []; (function() { var t = document.createElement('script'); - t.type = 'text/javascript'; t.async = true; t.id = 'gauges-tracker'; t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013'); diff --git a/_includes/header.html b/_includes/header.html index b5eff5f5e..827b1c2c9 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -31,12 +31,12 @@ <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png"> <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png"> -<script type="text/javascript"> +<script> var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-146052-10']); _gaq.push(['_trackPageview']); (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + var ga = document.createElement('script'); 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); })(); |