diff --git a/assets/images/docs-2.png b/assets/images/docs-2.png index ac9ca5e8..d096eaa2 100644 Binary files a/assets/images/docs-2.png and b/assets/images/docs-2.png differ diff --git a/assets/images/docs-2@2x.png b/assets/images/docs-2@2x.png index d376d2e1..961063eb 100644 Binary files a/assets/images/docs-2@2x.png and b/assets/images/docs-2@2x.png differ diff --git a/assets/javascripts/news.json b/assets/javascripts/news.json index e0111413..dc2321d3 100644 --- a/assets/javascripts/news.json +++ b/assets/javascripts/news.json @@ -1,7 +1,7 @@ [ [ "2018-07-08", - "New documentation: Leaflet" + "New documentations: Leaflet, Terraform" ], [ "2018-03-26", "DevDocs is joining the freeCodeCamp community. Read the announcement here." diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index ea59df98..539fec67 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -645,6 +645,11 @@ credits = [ '2018 The TensorFlow Authors', 'CC BY', 'https://creativecommons.org/licenses/by/3.0/' + ], [ + 'Terraform', + '2018 HashiCorp', + 'MPL', + 'https://raw.githubusercontent.com/hashicorp/terraform-website/master/LICENSE.md' ], [ 'Twig', '2009-2017 The Twig Team', diff --git a/assets/stylesheets/application-dark.css.scss b/assets/stylesheets/application-dark.css.scss index 05ff7e9e..4500f90f 100644 --- a/assets/stylesheets/application-dark.css.scss +++ b/assets/stylesheets/application-dark.css.scss @@ -96,6 +96,7 @@ 'pages/support_tables', 'pages/tcl_tk', 'pages/tensorflow', + 'pages/terraform', 'pages/underscore', 'pages/vue', 'pages/webpack', diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss index d74581be..906f0cc7 100644 --- a/assets/stylesheets/global/_icons.scss +++ b/assets/stylesheets/global/_icons.scss @@ -171,3 +171,4 @@ ._icon-jekyll:before { background-position: -1rem -3rem; @extend %doc-icon-2; } ._icon-babel:before { background-position: -2rem -3rem; @extend %doc-icon-2; } ._icon-leaflet:before { background-position: -3rem -3rem; @extend %doc-icon-2; } +._icon-terraform:before { background-position: -4rem -3rem; @extend %doc-icon-2; } diff --git a/lib/docs/filters/terraform/clean_html.rb b/lib/docs/filters/terraform/clean_html.rb index efe69c7f..7d662293 100644 --- a/lib/docs/filters/terraform/clean_html.rb +++ b/lib/docs/filters/terraform/clean_html.rb @@ -19,6 +19,11 @@ module Docs node['data-language'] = 'ruby' end node.content = node.content + node.remove_attribute('class') + end + + css('.highlight').each do |node| + node.before(node.children).remove end doc diff --git a/lib/docs/scrapers/terraform.rb b/lib/docs/scrapers/terraform.rb index 8364fd7d..ab12775d 100644 --- a/lib/docs/scrapers/terraform.rb +++ b/lib/docs/scrapers/terraform.rb @@ -4,7 +4,6 @@ module Docs self.type = 'terraform' self.release = '0.11.7' self.base_url = 'https://www.terraform.io/docs/' - # self.dir = '/mnt/c/Users/Doug/Code/terraform-docs/www.terraform.io/docs' self.root_path = 'index.html' self.links = { home: 'https://www.terraform.io/', @@ -16,7 +15,7 @@ module Docs options[:skip_patterns] = [/enterprise/, /enterprise-legacy/] options[:attribution] = <<-HTML - Copyright © 2018 HashiCorp
+ © 2018 HashiCorp
Licensed under the MPL 2.0 License. HTML end diff --git a/public/icons/docs-2.pxm b/public/icons/docs-2.pxm index aa38c85b..7549a0ab 100644 Binary files a/public/icons/docs-2.pxm and b/public/icons/docs-2.pxm differ diff --git a/public/icons/docs-2@2x.pxm b/public/icons/docs-2@2x.pxm index eae36db9..ea8fee7c 100644 Binary files a/public/icons/docs-2@2x.pxm and b/public/icons/docs-2@2x.pxm differ diff --git a/public/icons/docs/terraform/16.png b/public/icons/docs/terraform/16.png index a474f146..71f60110 100644 Binary files a/public/icons/docs/terraform/16.png and b/public/icons/docs/terraform/16.png differ diff --git a/public/icons/docs/terraform/16@2x.png b/public/icons/docs/terraform/16@2x.png index 576c5402..42e046bf 100644 Binary files a/public/icons/docs/terraform/16@2x.png and b/public/icons/docs/terraform/16@2x.png differ