From 9d1eb6e2da036d2dd3dfafd65395c69bdd5aa321 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Wed, 23 Dec 2015 16:45:54 -0600
Subject: [PATCH] Updating publish workflow

---
 CONTRIBUTING.md                   |  6 +++---
 Gruntfile.js                      | 12 ++++++++++--
 _config.yml                       |  2 +-
 docs/assets/js/src/application.js | 16 ++++++++--------
 scss/_variables.scss              |  2 +-
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 845e5949..b1a5ef09 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -243,14 +243,14 @@ This performs an initial build and watches both the core and docs sources for ch
 (assuming the above is done)
 
     ```bash
-    jekyll serve --baseurl ""
+    jekyll serve
     ```
 
 ## Releasing
 
 1. Make sure travis succeeds first
 1. Update the version in `package.json`, it's version is used in the documentation
-1. Build the distribution `grunt dist docs`
+1. Build the distribution `grunt prep-release`
 1. Commit
 1. Tag for bower - a valid tag starts with a `v` such as `v4.0.0`
-1. Push documentation with `jekyll clean && jekyll build && grunt publish`
+1. Push documentation with `grunt publish`
diff --git a/Gruntfile.js b/Gruntfile.js
index 7ccb871e..7b8881dd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -480,7 +480,8 @@ module.exports = function (grunt) {
       docs: {},
       github: {
         options: {
-          raw: 'github: true'
+          //raw: 'github: true'
+          raw: 'baseurl: "/bootstrap-material-design"'
         }
       }
     },
@@ -549,6 +550,13 @@ module.exports = function (grunt) {
       npmUpdate: {
         command: 'npm update'
       }
+      //,
+      //'jekyll-clean': {
+      //  command: 'jekyll clean'
+      //},
+      //'jekyll-build': {
+      //  command: 'jekyll build'
+      //}
     },
 
     buildcontrol: {
@@ -691,7 +699,7 @@ module.exports = function (grunt) {
   grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']);
 
   // Publish to GitHub
-  grunt.registerTask('publish', ['buildcontrol:pages']);
+  grunt.registerTask('publish', ['prep-release', 'buildcontrol:pages']);
 
   // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
   // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
diff --git a/_config.yml b/_config.yml
index b77e4424..d4c6b740 100644
--- a/_config.yml
+++ b/_config.yml
@@ -35,7 +35,7 @@ gems:
 # Site vars
 #url:    "http://fezvrasta.github.io"
 repo:   https://github.com/fezvrasta/bootstrap-material-design
-baseurl: "/bootstrap-material-design"
+#baseurl: "/bootstrap-material-design"
 url: "http://rosskevin.github.io"
 
 # other variables generated in
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js
index 501a7890..ebe7f036 100644
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/src/application.js
@@ -23,24 +23,24 @@ class Application {
     $('.bd-example-indeterminate [type="checkbox"]').prop('indeterminate', true)
 
     // Disable empty links in docs examples
-    $('.bd-example [href=#]').click(function (e) {
+    $('.bd-example [href=#]').click((e) => {
       e.preventDefault()
     })
 
     // Insert copy to clipboard button before .highlight
-    $('.highlight').each(function () {
-      var btnHtml = '<div class="bd-clipboard"><span class="btn-clipboard" title="Copy to clipboard">Copy</span></div>'
+    $('.highlight').each(() => {
+      let btnHtml = '<div class="bd-clipboard"><span class="btn-clipboard" title="Copy to clipboard">Copy</span></div>'
       $(this).before(btnHtml)
       $('.btn-clipboard').tooltip()
     })
 
-    var clipboard = new Clipboard('.btn-clipboard', {
-      target: function (trigger) {
+    let clipboard = new Clipboard('.btn-clipboard', {
+      target: (trigger) => {
         return trigger.parentNode.nextElementSibling
       }
     })
 
-    clipboard.on('success', function (e) {
+    clipboard.on('success', (e) => {
       $(e.trigger)
         .attr('title', 'Copied!')
         .tooltip('_fixTitle')
@@ -51,8 +51,8 @@ class Application {
       e.clearSelection()
     })
 
-    clipboard.on('error', function (e) {
-      var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'Press \u2318 to copy' : 'Press Ctrl-C to copy'
+    clipboard.on('error', (e) => {
+      let fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'Press \u2318 to copy' : 'Press Ctrl-C to copy'
 
       $(e.trigger)
         .attr('title', fallbackMsg)
diff --git a/scss/_variables.scss b/scss/_variables.scss
index c923158c..966b5ba2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -12,7 +12,6 @@ $mdb-font-weight-base: 400;
 $mdb-text-color-inverse: rgba($white, 0.84) !default;
 $mdb-text-color-inverse-light: rgba($white, 0.54) !default;
 $mdb-label-color: $gray-light !default;
-$mdb-label-color-focus: $brand-primary !default;
 $mdb-label-color-inner-focus: $gray !default; // e.g. radio label or text-muted not a control-label which is primary
 
 //---
@@ -38,6 +37,7 @@ $enable-flex: true;
 @import "../bower_components/bootstrap/scss/variables";
 
 
+$mdb-label-color-focus: $brand-primary !default;
 //---
 // verified in use with refactoring to v4