From 52521b4ea47b61de9bbad43a26d9cd432b638da5 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 29 Oct 2018 15:58:21 -0400 Subject: [PATCH 01/76] reorder index --- _includes/navigation-buttons.html | 4 ++-- index.md | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/navigation-buttons.html b/_includes/navigation-buttons.html index 32d77b6..f2435fc 100644 --- a/_includes/navigation-buttons.html +++ b/_includes/navigation-buttons.html @@ -1,6 +1,6 @@
- +
←
Previous
{{ include.previous-title }}
@@ -12,6 +12,6 @@
Next
{{ include.next-title }}
- +
→
diff --git a/index.md b/index.md index cc21d78..d201047 100644 --- a/index.md +++ b/index.md @@ -16,14 +16,14 @@ title: Tuple's Pair Programming Guide ### Articles -- [Your First Pairing Session](/pair-programming-guide/your-first-pairing-session) - [The Case For Pair Programming](/pair-programming-guide/the-case-for-pair-programming) -- [Scientific Research Into Pairing](/pair-programming-guide/scientific-research-into-pair-programming) -- [Lesser-Known Benefits of Pairing](/pair-programming-guide/lesser-known-benefits-of-pair-programming) -- [Great External Resources](/pair-programming-guide/links) -- [How To Pair With A Junior Dev](/pair-programming-guide/how-to-pair-with-a-junior-developer) +- [Your First Pairing Session](/pair-programming-guide/your-first-pairing-session) - [Styles of Pairing](/pair-programming-guide/styles) - [Pairing Antipatterns](/pair-programming-guide/antipatterns) +- [Lesser-Known Benefits of Pairing](/pair-programming-guide/lesser-known-benefits-of-pair-programming) +- [How To Pair With A Junior Dev](/pair-programming-guide/how-to-pair-with-a-junior-developer) +- [Scientific Research Into Pairing](/pair-programming-guide/scientific-research-into-pair-programming) +- [Great External Resources](/pair-programming-guide/links) ### Videos From c1d47bf15ba077ed4784c714a2bebe7aeda56a90 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 29 Oct 2018 15:59:56 -0400 Subject: [PATCH 02/76] req --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 85696cc..dd1a4c2 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -58,7 +58,7 @@
+ placeholder="This guide would be more awesome if..." name="feedback-text" required> Date: Mon, 29 Oct 2018 16:15:11 -0400 Subject: [PATCH 04/76] copy --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index dd1a4c2..e119166 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -58,7 +58,7 @@
+ placeholder="This guide would be better if..." name="feedback-text" required> Date: Mon, 29 Oct 2018 16:20:14 -0400 Subject: [PATCH 06/76] wrap --- _includes/nav.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index e119166..8641389 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -58,7 +58,8 @@
+ placeholder="This guide would be better if..." + name="feedback-text" required> - + font-bold text-xs shadow" type="submit" value="Send feedback">
diff --git a/_includes/navigation-buttons.html b/_includes/navigation-buttons.html index f2435fc..4320cc9 100644 --- a/_includes/navigation-buttons.html +++ b/_includes/navigation-buttons.html @@ -1,5 +1,5 @@
- +
←
Previous
@@ -7,7 +7,7 @@
- +
Next
{{ include.next-title }}
diff --git a/_includes/subscribe-box.html b/_includes/subscribe-box.html index beb2d46..5c41790 100644 --- a/_includes/subscribe-box.html +++ b/_includes/subscribe-box.html @@ -1,9 +1,9 @@
-
+
Hear about new articles From d8a4751a5277e9d72e31c3389eaad074b106811c Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:00:41 -0500 Subject: [PATCH 08/76] try redirect for css --- _redirects | 1 + 1 file changed, 1 insertion(+) create mode 100644 _redirects diff --git a/_redirects b/_redirects new file mode 100644 index 0000000..b47d7b6 --- /dev/null +++ b/_redirects @@ -0,0 +1 @@ +/pair-programming-guide/css/pairing-guide-compiled.css /css/pairing-guide-compiled.css 200 From cd3904f612d2ae34f2503eb04deca594cc7e1a31 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:02:17 -0500 Subject: [PATCH 09/76] nah --- _redirects | 1 - 1 file changed, 1 deletion(-) delete mode 100644 _redirects diff --git a/_redirects b/_redirects deleted file mode 100644 index b47d7b6..0000000 --- a/_redirects +++ /dev/null @@ -1 +0,0 @@ -/pair-programming-guide/css/pairing-guide-compiled.css /css/pairing-guide-compiled.css 200 From 4c9d2ff85192d7917280dbec3378893543395016 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:20:36 -0500 Subject: [PATCH 10/76] try to fix --- _redirects | 1 + 1 file changed, 1 insertion(+) create mode 100644 _redirects diff --git a/_redirects b/_redirects new file mode 100644 index 0000000..a484550 --- /dev/null +++ b/_redirects @@ -0,0 +1 @@ +/pair-programming-guide/* https://pair-programming-guide.netlify.com/:splat 200 From 3bd8e7ec4a00e354c3691a928e0b3c4c292c348b Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:28:25 -0500 Subject: [PATCH 11/76] try local --- _redirects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_redirects b/_redirects index a484550..9220dd4 100644 --- a/_redirects +++ b/_redirects @@ -1 +1 @@ -/pair-programming-guide/* https://pair-programming-guide.netlify.com/:splat 200 +/pair-programming-guide/* /:splat 200 From 792f7fe06162753a424ccbf1c286d7a0b399293b Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:34:14 -0500 Subject: [PATCH 12/76] include redirects in published site so netlify can see it --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index aa08e33..b6b1adc 100644 --- a/_config.yml +++ b/_config.yml @@ -29,7 +29,7 @@ theme: minima plugins: - jekyll-feed -include: ['_pages'] +include: ['_pages', '_redirects'] # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. From 9d36e7028e9da40eae92e180e581eac17e5d3ab6 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Mon, 5 Nov 2018 10:37:31 -0500 Subject: [PATCH 13/76] comment --- _redirects | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_redirects b/_redirects index 9220dd4..17022ff 100644 --- a/_redirects +++ b/_redirects @@ -1 +1,6 @@ +# Why we need this: +# 1. Jekyll is rewriting requests to strip out the baseurl in dev, which is /pair-programming-guide +# 2. Jekyll actually doesn't serve our app in prod, so we have redirects in the *landing* instance replicate this stripping/rewriting +# 3. Accessing the guide instance directly requires the redirect below to match the landing instance behavior + /pair-programming-guide/* /:splat 200 From b121cbf26b966e6b17c241f0a2b5bbad0bce1a66 Mon Sep 17 00:00:00 2001 From: Ben Orenstein Date: Tue, 6 Nov 2018 13:38:58 -0500 Subject: [PATCH 14/76] store useful data --- _includes/subscribe-box.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/_includes/subscribe-box.html b/_includes/subscribe-box.html index 5c41790..69d970d 100644 --- a/_includes/subscribe-box.html +++ b/_includes/subscribe-box.html @@ -9,6 +9,12 @@ aria-label="Email address entry" name="fields[email]" autocomplete="email"> + + + + + +
diff --git a/_includes/subscribe-box.html b/_includes/subscribe-box.html index 69d970d..f7c33a9 100644 --- a/_includes/subscribe-box.html +++ b/_includes/subscribe-box.html @@ -16,8 +16,8 @@