Merge branch 'v0.2.4-release' into dependabot/npm_and_yarn/stylelint-config-primer-6.0.0

95b76010 · Patrick Marsceill · GitHub · 0ec44bd4 · ca0af179 · 95b76010
Unverified Commit 95b76010 authored 5 years ago by Patrick Marsceill Committed by GitHub 5 years ago
--- a/_config.yml
+++ b/_config.yml
@@ -35,3 +35,6 @@ color_scheme: nil
 # Google Analytics Tracking (optional)
 # e.g, UA-1234567-89
 ga_tracking: UA-2709176-10
+
+plugins:
+  - jekyll-seo-tag
\ No newline at end of file
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -23,4 +23,6 @@
  <script type="text/javascript" src="{{ "/assets/js/just-the-docs.js" | absolute_url }}"></script>

  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+{% seo %}
 </head>
--- a/_layouts/default.html
+++ b/_layouts/default.html
 <!DOCTYPE html>

-<html lang="en-us">
+<html lang="{{ site.lang | default: "en-US" }}">
 {% include head.html %}
 <body>


--- a/assets/css/just-the-docs.scss
+++ b/assets/css/just-the-docs.scss
@@ -16,6 +16,12 @@
 // Support
 @import "./support/support";

+//
+// Import custom overrides
+//
+
+@import "./custom/custom";
+
 //
 // Import custom color scheme scss
 //
@@ -36,8 +42,3 @@
 @import "./tables";
 @import "./code";
 @import "./utilities/utilities";
-
-//
-// Import custom overrides
-//
-@import "./custom/custom";
--- a/assets/js/just-the-docs.js
+++ b/assets/js/just-the-docs.js
@@ -153,7 +153,6 @@ function initSearch() {
 function pageFocus() {
  var mainContent = document.querySelector('.js-main-content');
  mainContent.focus();
-  console.log(mainContent)
 }



--- a/index.md
+++ b/index.md
@@ -58,6 +58,8 @@ $ bundle exec jekyll serve
 ```
 4. Point your web browser to [http://localhost:4000](http://localhost:4000)

+If you're hosting your site on GitHub Pages, [set up GitHub Pages and Jekyll locally](https://help.github.com/en/articles/setting-up-your-github-pages-site-locally-with-jekyll) so that you can more easily work in your development environment.
+
 ### Configure Just the Docs

 - [See configuration options]({{ site.baseurl }}{% link docs/configuration.md %})

--- a/just-the-docs.gemspec
+++ b/just-the-docs.gemspec
@@ -2,7 +2,7 @@

 Gem::Specification.new do |spec|
  spec.name          = "just-the-docs"
-  spec.version       = "0.2.3"
+  spec.version       = "0.2.4"
  spec.authors       = ["Patrick Marsceill"]
  spec.email         = ["patrick.marsceill@gmail.com"]

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
  spec.executables   << 'just-the-docs'

  spec.add_runtime_dependency "jekyll", "~> 3.8.5"
+  spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.0"
  spec.add_runtime_dependency "rake", "~> 12.3.1"

  spec.add_development_dependency "bundler", "~> 2.0.1"

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
 {
  "name": "just-the-docs",
-  "version": "0.2.3",
+  "version": "0.2.4",
  "description": "A modern Jekyll theme for documentation",
  "repository": "pmarsceill/just-the-docs",
  "license": "MIT",
  "bugs": "https://github.com/pmarsceill/just-the-docs/issues",
  "devDependencies": {
-    "stylelint": "^9.10.1",
+    "stylelint": "^10.0.1",
    "stylelint-config-primer": "^6.0.0"
  },
  "dependencies": {},