Update docs build process

Daemonite · Jan 18, 2018 · 0bdd15d · 0bdd15d
1 parent 35b1e2a
commit 0bdd15d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 60 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,29 +7,35 @@
 # permalinks
   permalink:        pretty
 
+# plugins
+  plugins:
+                    - jekyll-redirect-from
+                    - jekyll-sitemap
+                    - jekyll-toc
+
 # server
   baseurl:          "/material" # workaround for our GitHub Pages hosting
   destination:      "gh-pages/material" # workaround for our GitHub Pages hosting
   encoding:         "UTF-8"
   exclude:          
+                    - .babelrc.js
+                    - .eslintignore
                     - .git
                     - .gitignore
-                    - .sass-cache
+                    - .sass-cache/
                     - assets/
                     - bower.json
+                    - build/
+                    - docs-assets/
                     - Gemfile
                     - Gemfile.lock
                     - gh-pages/
-                    - Gruntfile.js
                     - lint-vars.sh
                     - node_modules/
-                    - npm-shrinkwrap.json
                     - package.json
+                    - package-lock.json
+                    - README.md
   host:             0.0.0.0
-  plugins:
-                    - jekyll-redirect-from
-                    - jekyll-sitemap
-                    - jekyll-toc
   port:             9999
   source:           "."
   url:              "http://daemonite.github.io/material"
@@ -41,18 +47,22 @@
 
 # vars
   cdn:
+    bs_css:         "https://getbootstrap.com/dist/css/bootstrap.min.css"
+    bs_css_docs:    "https://getbootstrap.com/assets/css/docs.min.css"
+    bs_js:          "https://getbootstrap.com/dist/js/bootstrap.min.js"
+    bs_js_docs:     "https://getbootstrap.com/assets/js/docs.min.js"
     jquery:         "https://code.jquery.com/jquery-3.2.1.slim.min.js"
     jquery_hash:    "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
     md_font:        "https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i"
     md_icon:        "https://fonts.googleapis.com/icon?family=Material+Icons"
-    popper:         "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.6/umd/popper.min.js"
-    popper_hash:    "sha384-W1IgCZfiFCplncoIxD5rld+uzdB6FlcG2vm4qjrCP5Z7uUt7vnwbztJXeqXgd26w"
+    popper:         "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
+    popper_hash:    "sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
   current_version:  "4.0.0-beta"
   docs_version:     "4.0"
   download:
     source:         "https://github.com/Daemonite/material/archive/v4.0.0-beta.zip"
     dist:           "https://github.com/Daemonite/material/releases/download/v4.0.0-beta/material-4.0.0-beta-dist.zip"
   id:
-    navbar:         "doc_navbar"
-    navdrawer:      "doc_navdrawer"
+    navbar:         "doc-navbar"
+    navdrawer:      "doc-navdrawer"
   repo:             "https://github.com/Daemonite/material"
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,12 +1,11 @@
 <!-- JavaScript -->
 <script src="{{ site.cdn.jquery }}"></script>
 <script src="{{ site.cdn.popper }}"></script>
-
-<script src="{{ site.baseurl }}/bs/bootstrap.min.js"></script>
+<script src="{{ site.cdn.bs_js }}"></script>
 
 <!-- Add Material JavaScript on top of Bootstrap JavaScript -->
 <script src="{{ site.baseurl }}/js/material.min.js"></script>
 
 <!-- Additional JavaScript for documentation site -->
-<script src="{{ site.baseurl }}/bs/docs.min.js"></script>
-<script src="{{ site.baseurl }}/js/project.min.js"></script>
+<script src="{{ site.cdn.bs_js_docs }}"></script>
+<script src="{{ site.baseurl }}/docs/js/docs.min.js"></script>
diff --git a/_includes/header.html b/_includes/header.html
@@ -11,8 +11,8 @@
 <link href="{{ site.baseurl }}/css/material.min.css" rel="stylesheet">
 
 <!-- Additional CSS for documentation site -->
-<link href="{{ site.baseurl }}/bs/docs.min.css" rel="stylesheet">
-<link href="{{ site.baseurl }}/css/docs.min.css" rel="stylesheet">
+<link href="{{ site.cdn.bs_css_docs }}" rel="stylesheet">
+<link href="{{ site.baseurl }}/docs/css/docs.min.css" rel="stylesheet">
 
 <!-- Favicons -->
 <meta content="#9c27b0" name="theme-color">

diff --git a/bs/bootstrap.min.js b/bs/bootstrap.min.js
diff --git a/bs/docs.min.css b/bs/docs.min.css