From 4f54fc5c07dd2c2053ccaca748b54262555cd711 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 17:50:25 -0400 Subject: [PATCH 1/8] add seo include --- _config.yml | 6 +++++- _includes/header.html | 5 +++-- _includes/seo.html | 31 +++++++++++++++++++++++++++++++ assets/css/application.scss | 2 +- index.html | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 _includes/seo.html diff --git a/_config.yml b/_config.yml index 167a0e1..77dfcc7 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ --- -title: ChooseALicense.com +title: Choose a License relative_permalinks: false markdown: kramdown url: "http://choosealicense.com" @@ -43,3 +43,7 @@ gems: sass: sass_dir: _sass style: :compressed + +twitter: + username: "@github" + account_id: "13334762" diff --git a/_includes/header.html b/_includes/header.html index 118b2c9..3960ebb 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,8 +3,7 @@ - {% if page.title %}{{ page.title | markdownify | strip_html | strip_newlines }} - {% endif %}{{ site.title}} - {% if page.description %}{% endif %} + @@ -13,6 +12,8 @@ + + {% include seo.html %}
diff --git a/_includes/seo.html b/_includes/seo.html new file mode 100644 index 0000000..3e80026 --- /dev/null +++ b/_includes/seo.html @@ -0,0 +1,31 @@ + {% if page.title %} + {% capture seo_title %}{{ page.title | markdownify | strip_html | strip_newlines }} - {{ site.title }}{% endcapture %} + {% else %} + {% assign seo_title = site.title %} + {% endif %} + + {% if page.description %} + {% assign seo_description = page.description | strip_html | strip_newlines %} + {% else %} + {% assign seo_description = site.tagline | strip_html | strip_newlines %} + {% endif %} + + + {{ seo_title }} + + + + + + + + + + + + + + + + + diff --git a/assets/css/application.scss b/assets/css/application.scss index efbce01..fc3f71e 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -72,7 +72,7 @@ strong { } .home h1 { - font-size: 63px; + font-size: 60px; } .home h2 { diff --git a/index.html b/index.html index fbef291..73443b1 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ layout: default class: home hide_breadcrumbs: true -title: Choosing an OSS license doesn’t need to be scary +title: Choosing an open source license doesn’t need to be scary description: A site to provide non-judgmental guidance on choosing a license for your open source project permalink: / --- From 34368e5c323b669bb1f38a0abd3dd89805d8ef7d Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 17:58:46 -0400 Subject: [PATCH 2/8] add fallback description --- _config.yml | 1 + _includes/seo.html | 2 +- index.html | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 77dfcc7..e459331 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,6 @@ --- title: Choose a License +description: A site to provide non-judgmental guidance on choosing a license for your open source project relative_permalinks: false markdown: kramdown url: "http://choosealicense.com" diff --git a/_includes/seo.html b/_includes/seo.html index 3e80026..2b942eb 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -7,7 +7,7 @@ {% if page.description %} {% assign seo_description = page.description | strip_html | strip_newlines %} {% else %} - {% assign seo_description = site.tagline | strip_html | strip_newlines %} + {% assign seo_description = site.description | strip_html | strip_newlines %} {% endif %} diff --git a/index.html b/index.html index 73443b1..e387f4e 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,6 @@ layout: default class: home hide_breadcrumbs: true title: Choosing an open source license doesn’t need to be scary -description: A site to provide non-judgmental guidance on choosing a license for your open source project permalink: / --- From 6b4b8546f07cef713cefd5a00af35a5a6fb9db7c Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 17:59:08 -0400 Subject: [PATCH 3/8] add desc to no-license --- no-license.md | 1 + 1 file changed, 1 insertion(+) diff --git a/no-license.md b/no-license.md index 298e7ae..8a3d865 100644 --- a/no-license.md +++ b/no-license.md @@ -2,6 +2,7 @@ layout: default permalink: no-license/ title: No License +description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law." --- You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law. From c5e3673ced93af86099e0299bdf473e930c385cb Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 18:00:26 -0400 Subject: [PATCH 4/8] add description to tos --- terms-of-service.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terms-of-service.md b/terms-of-service.md index e2d6036..ce6f323 100644 --- a/terms-of-service.md +++ b/terms-of-service.md @@ -2,7 +2,7 @@ title: Terms of Service layout: default permalink: /terms-of-service/ - +description: Terms governing your use of choosealicense.com --- ### 1. Introduction From 2caf7043fa9198eb8a9efa5d758fe423638710ad Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 18:10:21 -0400 Subject: [PATCH 5/8] add json-ld breadcrumbs --- _includes/breadcrumbs.html | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index ec8909f..f73e9bd 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -8,4 +8,32 @@ {% endif %} -{% endunless %} \ No newline at end of file + +{% endunless %} From d882e69ec14ad7b50af33b1bb7e5c7ea68418929 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 18:12:39 -0400 Subject: [PATCH 6/8] add microdata site name --- _includes/header.html | 2 +- _includes/seo.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 3960ebb..7737e9e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,6 +1,6 @@ - + diff --git a/_includes/seo.html b/_includes/seo.html index 2b942eb..6cd5f71 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -14,11 +14,12 @@ {{ seo_title }} + {{ site.title }} - + From a995dbd6501b27d624ea590828ba95438397df50 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 18:14:36 -0400 Subject: [PATCH 7/8] implement the :ok_hand: suggestions of @leeereilly --- _config.yml | 1 - _includes/seo.html | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index e459331..93c51c6 100644 --- a/_config.yml +++ b/_config.yml @@ -47,4 +47,3 @@ sass: twitter: username: "@github" - account_id: "13334762" diff --git a/_includes/seo.html b/_includes/seo.html index 6cd5f71..4c592e5 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -23,10 +23,8 @@ - - - - - - + + + + From 54ea122be1990133dd24a7a95b206d88ef2b8302 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 23 Oct 2015 18:17:01 -0400 Subject: [PATCH 8/8] evern shorter short description --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 93c51c6..4ecdc5f 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ --- title: Choose a License -description: A site to provide non-judgmental guidance on choosing a license for your open source project +description: Non-judgmental guidance on choosing a license for your open source project relative_permalinks: false markdown: kramdown url: "http://choosealicense.com"