Merge pull request #92 from codeandcoffeelb/#88/disable-ga-and-jekyll-fixes

karimamer · web-flow · commit 19577aa6d47f · 2017-11-04T23:34:48.000-07:00
Removed Google Analytics and Hardcoded baseurl
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -7,11 +7,10 @@
 
 <title>{{site.name }}{% if page.title %} -{{page.title }}{% endif %}</title>
 <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
- <link rel="shortcut icon" href="{{site.baseurl }}assets/images/favicon.ico">
- <link rel="stylesheet" href="{{site.baseurl }}assets/css/style.css">
- <link rel="alternate" type="application/rss+xml" title="My Blog" href="{{site.baseurl }}rss.xml">
- <link rel="stylesheet" href="{{site.baseurl }}assets/css/highlight.css">
- <link rel="stylesheet" href="{{site.baseurl }}assets/css/main.css">
+ <link rel="shortcut icon" href="/assets/images/favicon.ico">
+ <link rel="stylesheet" href="/assets/css/style.css">
+ <link rel="stylesheet" href="/assets/css/highlight.css">
+ <link rel="stylesheet" href="/assets/css/main.css">
 </head>
 
 <body>
@@ -30,19 +29,9 @@
 </section>
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
- <script src="{{site.baseurl }}assets/js/main.js"></script>
- <script src="{{site.baseurl }}assets/js/highlight.js"></script>
+ <script src="/assets/js/main.js"></script>
+ <script src="/assets/js/highlight.js"></script>
 <script>hljs.initHighlightingOnLoad();</script>
-
-<!-- <script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
- ga('create', '{{site.google_analytics }}', 'auto');
- ga('send', 'pageview');
- </script> -->
 </body>
 </html>
 

-Original file line number
+Diff line change
 <title>{{site.name }}{% if page.title %} -{{page.title }}{% endif %}</title>
 <linkhref='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
 -<linkrel="shortcut icon" href="{{site.baseurl }}assets/images/favicon.ico">
 -<linkrel="stylesheet" href="{{site.baseurl }}assets/css/style.css">
 -<linkrel="alternate" type="application/rss+xml" title="My Blog" href="{{site.baseurl }}rss.xml">
 -<linkrel="stylesheet" href="{{site.baseurl }}assets/css/highlight.css">
 -<linkrel="stylesheet" href="{{site.baseurl }}assets/css/main.css">
 +<linkrel="shortcut icon" href="/assets/images/favicon.ico">
 +<linkrel="stylesheet" href="/assets/css/style.css">
 +<linkrel="stylesheet" href="/assets/css/highlight.css">
 +<linkrel="stylesheet" href="/assets/css/main.css">
 </head>
 <body>
 </section>
 <scriptsrc="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 -<scriptsrc="{{site.baseurl }}assets/js/main.js"></script>
 -<scriptsrc="{{site.baseurl }}assets/js/highlight.js"></script>
 +<scriptsrc="/assets/js/main.js"></script>
 +<scriptsrc="/assets/js/highlight.js"></script>
 <script>hljs.initHighlightingOnLoad();</script>
+-
 -<!-- <script>
 - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 - })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+-
 - ga('create', '{{site.google_analytics }}', 'auto');
 - ga('send', 'pageview');
 - </script> -->
 </body>
 </html>