Merge pull request just-the-docs#122 from pmarsceill/v0.2.4-release

pmarsceill · web-flow · commit 9a076b48acbe · 2019-04-30T18:17:36.000-07:00
v0.2.4 release branch
diff --git 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
diff --git 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>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 
-<html lang="en-us">
+<html lang="{{ site.lang | default: "en-US" }}">
 {% include head.html %}
 <body>
 
diff --git a/_sass/layout.scss b/_sass/layout.scss
@@ -120,7 +120,8 @@
   }
 }
 
-// stylelint-disable selector-no-type
+// stylelint-disable selector-max-type
+
 body {
   position: relative;
   padding-bottom: $sp-10;
@@ -130,7 +131,8 @@ body {
     padding-bottom: 0;
   }
 }
-// stylelint-enable selector-no-type
+
+// stylelint-enable selector-max-type
 
 .site-footer {
   position: absolute;
diff --git 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";
diff --git 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)
 }
 
 
diff --git 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 %})
diff --git 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"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-// stylelint-disable selector-no-type`
	`123`	`+// stylelint-disable selector-max-type`
	`124`	`+`
`124`	`125`	`body {`
`125`	`126`	`position: relative;`
`126`	`127`	`padding-bottom: $sp-10;`
`@@ -130,7 +131,8 @@ body {`
`130`	`131`	`padding-bottom: 0;`
`131`	`132`	`}`
`132`	`133`	`}`
`133`		`-// stylelint-enable selector-no-type`
	`134`	`+`
	`135`	`+// stylelint-enable selector-max-type`
`134`	`136`
`135`	`137`	`.site-footer {`
`136`	`138`	`position: absolute;`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ function initSearch() {`
`153`	`153`	`function pageFocus() {`
`154`	`154`	`var mainContent = document.querySelector('.js-main-content');`
`155`	`155`	`mainContent.focus();`
`156`		`- console.log(mainContent)`
`157`	`156`	`}`
`158`	`157`
`159`	`158`