Skip to content

Commit a25d978

Browse files
authored
Merge pull request #124 from BenJetson/develop
Deploy to production.
2 parents 1ad5279 + 06a245b commit a25d978

File tree

11 files changed

+379
-54
lines changed

11 files changed

+379
-54
lines changed

.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ indent_size = 2
3333
[{*.css,*.scss}]
3434
indent_style = space
3535
indent_size = 2
36+
37+
[*.js]
38+
block_comment_start = /*
39+
block_comment_end = */
40+
block_comment = *

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ _site
55
_sass/vendor
66
runtime.txt
77
css/main.scss
8+
*.gen.md

404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
title: 404
44
---
55

6-
<div class="bg-gradient-danger notfound-container">
6+
<div class="bg-danger bg-gradient notfound-container">
77
<div class="container pb-3">
88
<div class="py-4 text-light">
99
<h1 class="mb-1">404</h1>

Gemfile.lock

+10-6
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,24 @@ GEM
2727
ffi (>= 1.15.0)
2828
eventmachine (1.2.7)
2929
execjs (2.8.1)
30-
faraday (1.4.1)
30+
faraday (1.4.2)
31+
faraday-em_http (~> 1.0)
32+
faraday-em_synchrony (~> 1.0)
3133
faraday-excon (~> 1.1)
3234
faraday-net_http (~> 1.0)
3335
faraday-net_http_persistent (~> 1.1)
3436
multipart-post (>= 1.2, < 3)
3537
ruby2_keywords (>= 0.0.4)
38+
faraday-em_http (1.0.0)
39+
faraday-em_synchrony (1.0.0)
3640
faraday-excon (1.1.0)
3741
faraday-net_http (1.0.1)
3842
faraday-net_http_persistent (1.1.0)
39-
ffi (1.15.0)
43+
ffi (1.15.1)
4044
forwardable-extended (2.6.0)
4145
gemoji (3.0.1)
42-
github-pages (214)
43-
github-pages-health-check (= 1.17.0)
46+
github-pages (215)
47+
github-pages-health-check (= 1.17.2)
4448
jekyll (= 3.9.0)
4549
jekyll-avatar (= 0.7.0)
4650
jekyll-coffeescript (= 1.1.1)
@@ -83,7 +87,7 @@ GEM
8387
nokogiri (>= 1.10.4, < 2.0)
8488
rouge (= 3.26.0)
8589
terminal-table (~> 1.4)
86-
github-pages-health-check (1.17.0)
90+
github-pages-health-check (1.17.2)
8791
addressable (~> 2.3)
8892
dnsruby (~> 1.60)
8993
octokit (~> 4.0)
@@ -222,7 +226,7 @@ GEM
222226
minitest (5.14.4)
223227
multi_json (1.15.0)
224228
multipart-post (2.1.1)
225-
nokogiri (1.11.4)
229+
nokogiri (1.11.5)
226230
mini_portile2 (~> 2.5.0)
227231
racc (~> 1.4)
228232
octokit (4.21.0)

_includes/footer.html

+20-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,26 @@ <h5>Follow me!</h5>
2424
</div>
2525
<div class="col-sm-12 col-md-3 d-print-none">
2626
<h5>Pageviews</h5>
27-
<div id="counter"></div>
27+
<div id="counter">
28+
<div class="digits placeholder">
29+
<div class="digit" aria-hidden="true">
30+
<span class="current">.</span>
31+
</div>
32+
<div class="digit" aria-hidden="true">
33+
<span class="current">.</span>
34+
</div>
35+
<div class="digit" aria-hidden="true">
36+
<span class="current">.</span>
37+
</div>
38+
<div class="digit" aria-hidden="true">
39+
<span class="current">.</span>
40+
</div>
41+
<div class="digit" aria-hidden="true">
42+
<span class="current">.</span>
43+
</div>
44+
</div>
45+
<p class="visually-hidden">Pageview count is still loading.</p>
46+
</div>
2847
</div>
2948
</div>
3049
<div class="row pt-4 pb-3">

_includes/scripts.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<script async defer src="https://www.google.com/recaptcha/api.js"></script>
2020
{% endif %}
2121
<script>
22-
window.counter = {
22+
window.counterInfo = {
2323
namespace: "{{site.counter.namespace}}",
2424
key: "{{site.counter.key}}",
25-
value: null,
2625
};
2726
</script>
2827
<script async defer src="{{site.url}}/js/counts.js"></script>

_sass/custom/styles/_footer.scss

+87-13
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,104 @@ footer {
2222
}
2323

2424
#counter {
25-
margin: 1em 0;
25+
font-family: $font-family-monospace;
26+
font-size: 28px;
27+
line-height: 1;
2628

27-
span.digit {
28-
background-color: $black;
29-
font-family: monospace;
30-
font-size: 28px;
31-
font-style: italic;
29+
text-align: left;
30+
31+
margin: 1rem 0;
32+
33+
div.digits {
34+
display: flex;
35+
flex-direction: row;
36+
}
37+
38+
div.digit {
39+
$digit-numeral-height: 1em;
40+
$digit-vertical-padding: 0.5rem;
41+
$digit-border-size: 2px;
3242

33-
border: 2px solid $gray-700;
43+
background-color: $black;
44+
border: $digit-border-size solid $gray-800;
3445
border-radius: 7px;
3546

3647
position: relative;
3748

38-
padding: 0.25em;
39-
padding-right: 0.35em;
40-
margin-right: 1px;
49+
padding: $digit-vertical-padding 0.4rem;
50+
51+
margin-right: 1px; // to separate the digits.
52+
53+
// prettier-ignore
54+
height: calc(
55+
#{$digit-numeral-height} +
56+
(#{$digit-vertical-padding} * 2) +
57+
(#{$digit-border-size} * 2)
58+
);
59+
width: calc(
60+
5px + 1em
61+
); // approximately the width of one monospace character.
62+
63+
$flip-opacity: 0.3;
64+
$flip-speed: 0.05s;
65+
$flip-distance: 10px;
66+
67+
span.current {
68+
animation: none;
69+
}
70+
71+
span.previous {
72+
animation: slideAway ($flip-speed / 2);
73+
}
74+
75+
span.next {
76+
animation: slideInto ($flip-speed / 2);
77+
}
78+
79+
span.previous,
80+
span.next {
81+
position: absolute;
82+
}
83+
84+
&.mutating span {
85+
opacity: $flip-opacity;
86+
}
87+
88+
@keyframes slideAway {
89+
0% {
90+
opacity: $flip-opacity;
91+
bottom: 0;
92+
}
93+
94+
100% {
95+
opacity: 0;
96+
bottom: $flip-distance;
97+
}
98+
}
99+
100+
@keyframes slideInto {
101+
0% {
102+
opacity: 0;
103+
top: $flip-distance;
104+
}
105+
106+
100% {
107+
opacity: $flip-opacity;
108+
top: 0;
109+
}
110+
}
41111
}
42112

43-
span.digit::before {
44-
content: "";
113+
// This renders the little border line in the center of the digit.
114+
div.digit::before {
115+
content: ""; // must be present for this to render.
116+
45117
position: absolute;
46-
z-index: 0;
47118
bottom: 50%;
48119
left: 0;
120+
121+
z-index: 0;
122+
49123
border-bottom: 2px solid rgba($gray-600, 50%);
50124
width: 100%;
51125
}

_sass/custom/styles/_notfound.scss

+2
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@
1313

1414
.notfound-container h1 {
1515
font-size: 30vmin;
16+
font-family: $font-family-monospace;
17+
font-weight: bolder;
1618
}

_sass/custom/styles/_preview.scss

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// _preview.scss
3+
//
4+
// Styles that fix that stupid Deploy Preview box that Netlify injects
5+
// without user consent or opt-in.
6+
//
7+
8+
div[data-netlify-deploy-id] {
9+
display: none !important;
10+
visibility: hidden !important;
11+
12+
position: absolute !important;
13+
top: 0 !important;
14+
left: 0 !important;
15+
16+
height: 0 !important;
17+
width: 0 !important;
18+
19+
overflow: hidden !important;
20+
}

_sass/custom/styles/styles.scss

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
@import "layout";
1515
@import "notfound";
1616
@import "octicons";
17+
@import "preview";
1718
@import "projects";
1819
@import "usercontent";
1920
@import "utilities";

0 commit comments

Comments
 (0)