Skip to content

Commit 17db0e3

Browse files
authored
Merge pull request #10 from jsdnhk/framed
fixed Firefox display issue
2 parents c6b9925 + f85d2cc commit 17db0e3

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

PROJECTS_USED.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ title: "Projects Used"
1414

1515
- [Jekyll](https://jekyllrb.com/): Lightweight but strong blog-aware static web framework published by GitHub
1616
- [Google Analytics](https://developers.google.com/analytics): Web analytics service by Google
17+
- [Disqus](https://disqus.com/): American worldwide blog comment hosting service for websites
1718
- [JQuery](https://jquery.com/): Agile and feature-rich JavaScript library
1819
- [Underscore.js](https://underscorejs.org/): Enhancement of JavaScript by helper functions
1920

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ github_url: "https://github.com/"
1717
github_username: "jsdnhk"
1818
repository: "jsdnhk/jsdnhk.github.io"
1919
timezone: "Asia/Hong_Kong"
20-
analytics_account: "UA-3769691-28"
20+
google_analytics_account: "UA-141729733-1"
2121
disqus_shortname: jsdnhk
2222

2323
# not use default theme

_includes/bg_video.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
return;
5252
}
5353
// toggle
54-
if (!isPlaying()) return false;
54+
if (!isPlaying()) return;
5555
var isBlogMode = $(divPageContainer).css(cssBgColor).search(alphaBlog) != -1;
5656
var alphaToggle = isBlogMode ? alphaView : alphaBlog;
5757
var rgbaPageContainer = $(divPageContainer).css(cssBgColor).replace(regexRGBA, alphaToggle);
@@ -88,7 +88,7 @@
8888
$(selectBG).find('option').each(function(index, element) {
8989
if (index == targetIndex) {
9090
$(selectBG).val(element.value).trigger("change");
91-
return false;
91+
return false; // break the foreach loop
9292
}
9393
});
9494
}

_includes/google_analytics.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
<!-- Global site tag (gtag.js) - Google Analytics -->
2+
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_account }}"></script>
13
<script>
2-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
4-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
5-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
4+
window.dataLayer = window.dataLayer || [];
5+
function gtag(){dataLayer.push(arguments);}
6+
gtag('js', new Date());
67

7-
ga('create', '{{ site.analytics_account }}', 'auto');
8-
ga('send', 'pageview');
8+
gtag('config', '{{ site.google_analytics_account }}');
99
</script>
10+

_includes/metadata.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!-- Metadata -->
22
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
3-
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
3+
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">-->
4+
<meta name="viewport" content="width=device-width">
45
<meta name="description" content="{{ site.description }}">
56
<meta name="keywords" content="{{ site.keyword }}">
67
<meta name="author" content="{{ site.github_username }}@GitHub" />

_sass/hyde.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ html {
8888
// margin: 1.5rem auto;
8989
font-family: $fonts_header;
9090
font-size: 3.25rem;
91-
text-align: -moz-center;
91+
text-align: left;
9292

9393
img {
9494
border-radius: 1.5rem;

_sass/plus.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ div.select-video-bg {
6565
width: 100%;
6666
border: 12px;
6767
font-size: 18px;
68+
border-radius: 0.25em;
6869
box-shadow: 0 5px 25px rgba(0, 0, 0, 0.2);
6970
-webkit-appearance: button;
7071
appearance: button;
@@ -73,7 +74,9 @@ div.select-video-bg {
7374
option {
7475
font-family: $fonts_text;
7576
padding: 30px;
76-
background-color: rgba(255, 255, 255, 0.8);
77+
// reverted color set
78+
color: $background;
79+
background-color: $foreground;;
7780
}
7881
}
7982

pages/blog/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: page
33
title: Blog
44
title_image: "apps/basket.png"
55
title_display: true
6-
footer_quote: "\"Learn and often review and practice,and is this not very happy?\"---Confucius"
6+
footer_quote: "\"Learn and often review and practice, and is this not very happy?\"---Confucius"
77
permalink: /blog/
88
---
99

0 commit comments

Comments
 (0)