Skip to content

Commit 08d4254

Browse files
authored
Merge pull request #134 from stedman/master
Prime avatar cache, add opengraph/twitter meta tags
2 parents 27a8452 + 930af7b commit 08d4254

File tree

90 files changed

+34
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+34
-20
lines changed

_layouts/base.liquid

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<title>{%- if title != site.title -%}{{ title }} • {%- endif -%}{{ site.title }}</title>
6+
<link rel="apple-touch-icon" type="image/png" href="{{ '/assets/icon/favicon-ios.png' | url }}" sizes="180x180">
7+
<link rel="icon" type="image/png" href="{{ '/assets/icon/favicon-android.png' | url }}" sizes="192x192">
8+
<link rel="icon" type="image/png" href="{{ '/assets/icon/favicon.png' | url }}" sizes="32x32">
9+
{%- capture pageTitle -%}
10+
{% if title != site.title %}{{ title }} • {% endif %}{{ site.title }}
11+
{%- endcapture %}
712
{%- if meta.description -%}
813
{%- assign desc = meta.description -%}
914
{%- else -%}
1015
{%- assign desc = layoutContent | regexReplace: '<h1 class="title flex-item">.*</h1>', '' | strip_html | regexReplace: '\s{2,}', ' ' | truncate: 160 -%}
1116
{%- endif %}
12-
<meta name="description" content="{{ desc }}">
1317
<link rel=canonical href="{{ site.url }}{{ page.url | url }}">
18+
<meta name="description" content="{{ desc }}">
19+
<meta property="og:url" content="{{ site.url }}{{ page.url | url }}">
20+
<meta property="og:title" content="{{ pageTitle }}">
21+
<meta property="og:description" content="{{ desc }}">
22+
<meta name="twitter:card" content="summary">
23+
<meta name="twitter:creator" content="@{{ site.author.twitter }}">
24+
<title>{{ pageTitle }}</title>
1425
<link rel=alternate type=application/atom+xml href="{{ site.url }}{{ '/feed.xml' | url }}" title="{{ site.title }} Atom feed" />
15-
<link rel="apple-touch-icon" type="image/png" href="{{ '/assets/icon/favicon-ios.png' | url }}" sizes="180x180">
16-
<link rel="icon" type="image/png" href="{{ '/assets/icon/favicon-android.png' | url }}" sizes="192x192">
17-
<link rel="icon" type="image/png" href="{{ '/assets/icon/favicon.png' | url }}" sizes="32x32">
1826
<link rel="stylesheet" href="{{ '/assets/css/main.css' | url }}">
1927
<script type="module" src="https://unpkg.com/ionicons@5.0.0/dist/ionicons/ionicons.esm.js"></script>
2028
<script nomodule="" src="https://unpkg.com/ionicons@5.0.0/dist/ionicons/ionicons.js"></script>
@@ -59,7 +67,7 @@
5967
<div class="container">
6068
{{ content | safe }}
6169

62-
<p class="content has-text-right-desktop" style="font-size: 14px; margin-bottom: -2rem;">
70+
<p class="edit-page content has-text-right-desktop">
6371
<a href="{{ site.repo }}/blob/master/{{ page.inputPath }}">Edit this page</a>
6472
</p>
6573
</div>

_sass/_main.scss

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ $footer-background-color: $white-ter;
107107
}
108108
}
109109

110-
/*
111-
* BUSINESS CARD ADJUSTMENTS
112-
*/
113-
110+
// BUSINESS CARD ADJUSTMENTS
114111
.card,
115112
.footer {
116113
// Add rounded edges to Bulma .image class inside a .card.
@@ -121,7 +118,7 @@ $footer-background-color: $white-ter;
121118
}
122119

123120
/*
124-
* BULMA +
121+
* BULMA EXTENDED/INSPIRED
125122
*/
126123

127124
@media screen and (min-width: $desktop) {
@@ -176,15 +173,6 @@ $footer-background-color: $white-ter;
176173
margin-bottom: 0 !important;
177174
}
178175

179-
.logo {
180-
transform: scale(0.9) translateY(0.25em);
181-
}
182-
183-
.sponsor-logo {
184-
max-width: 17vw;
185-
min-width: 10em;
186-
}
187-
188176
/*
189177
* bricks for emeritus cards
190178
*/
@@ -240,6 +228,24 @@ $footer-background-color: $white-ter;
240228
}
241229
}
242230

231+
/*
232+
* misc
233+
*/
234+
235+
.logo {
236+
transform: scale(0.9) translateY(0.25em);
237+
}
238+
239+
.sponsor-logo {
240+
max-width: 17vw;
241+
min-width: 10em;
242+
}
243+
244+
.edit-page {
245+
font-size: 0.875rem;
246+
margin-bottom: -2rem;
247+
}
248+
243249
/*
244250
* THE REST
245251
*/

assets/avatar/1066050b.jpeg

1.74 KB

assets/avatar/10f806b2-96.jpeg

2.55 KB

assets/avatar/140681dd-96.jpeg

3.15 KB

assets/avatar/14355a41-96.jpeg

2.28 KB

assets/avatar/147b5b5d-96.jpeg

2.48 KB

assets/avatar/1858f8f8-96.jpeg

2.02 KB

assets/avatar/197b867-96.jpeg

2.65 KB

assets/avatar/1b1b0455-96.jpeg

2.65 KB

0 commit comments

Comments
 (0)