Merge branch 'master' into SAN-6094

* master: (88 commits)
  5.19.16
  Fix on-prem falg
  5.19.15
  SAN-6074 Making logic more clear
  SAN-6074 Code review changes and fixes unit tests.
  SAN-6074 Reroute to pause if no billing.
  SAN-6074 Work so far.
  use fancy select
  alphabetize attributes
  set default tab...but better
  fix textoverflow
  update feature flag
  add k8 table
  add comments
  5.19.14
  SAN-6072 Missed comma
  5.19.13
  setup kubernetes view
  remove apostrophe
  add env validation
  ...

Author: damienrunnable

Gruntfile.js

@@ -293,7 +293,9 @@ module.exports = function(grunt) {
               commitHash: require('./client/config/json/commit.json').commitHash,
               commitTime: require('./client/config/json/commit.json').commitTime,
               apiHost: require('./client/config/json/api.json').host,
-              mixpanelProxyUrl: require('./client/config/json/api.json').mixpanelProxyUrl
+              mixpanelProxyUrl: require('./client/config/json/api.json').mixpanelProxyUrl,
+              disableMixpanel: require('./client/config/json/api.json').disableMixpanel,
+              disableAnalytics: require('./client/config/json/api.json').disableAnalytics
             };
             locals.rollbarEnv = locals.env;
             if (locals.apiHost.indexOf('runnable-beta.com') > -1) {
@@ -446,6 +448,8 @@ module.exports = function(grunt) {
         configObj.stripeToken = process.env.STRIPE_TOKEN || 'pk_test_sHr5tQaPtgwiE2cpW6dQkzi8';
         configObj.siftApiKey = process.env.SIFT_API_KEY || 'eea9746dff';
         configObj.githubUrl = process.env.GITHUB_URL || 'https://api.github.com';
+        configObj.disableMixpanel = process.env.DISABLE_MIXPANEL || false;
+        configObj.disableAnalytics = process.env.DISABLE_ANALYTICS || false;
 
         if (configObj.host.charAt(configObj.host.length - 1) === '/') {
           configObj.host = configObj.host.substr(0, configObj.host.length - 1);

client/assets/styles/scss/components/buttons/buttons.scss

@@ -24,7 +24,8 @@
     transition: none;
   }
 
-  &[disabled] {
+  &[disabled],
+  &.disabled {
     cursor: not-allowed;
     opacity: .5;
   }
@@ -53,6 +54,11 @@
     &:last-child {
       margin-left: 5px;
     }
+
+    &:only-child {
+      margin-left: auto;
+      margin-right: auto;
+    }
   }
 
   // fancy select
@@ -352,7 +358,7 @@
     border-color: $purple-darkest;
     color: $white;
 
-    &:not([disabled]) {
+    &:not([disabled]):not(.disabled) {
 
       &:hover,
       &.hover {

client/assets/styles/scss/components/icons.scss

@@ -166,7 +166,9 @@
   &.failed {
     background: transparent;
     border: 0;
+    height: 11px;
     overflow: visible;
+    width: 11px;
 
     &::before {
       background-position: center;
@@ -180,7 +182,7 @@
     }
   }
 
-  &.complete {
+  &.completed {
     background-color: transparent;
     border: 1px solid $gray-light;
   }

…/scss/deprecated/demo-personal-only.scss …/styles/scss/deprecated/service-cta.scssclient/assets/styles/scss/deprecated/demo-personal-only.scss renamed to client/assets/styles/scss/deprecated/service-cta.scss client/assets/styles/scss/deprecated/demo-personal-only.scss renamed to client/assets/styles/scss/deprecated/service-cta.scss

@@ -1,12 +1,14 @@
 //- ************************
 //- deprecated file, delete with $root.featureFlags.demoPersonalOnly
-.service-cta .demo-progress {
-  width: calc(100% + 30px);
-}
+.service-cta {
+
+  &:not(.deprecated) {
+    margin-top: -4px;
+  }
 
-.popover-demo.service-cta {
-  margin-bottom: 9px;
-  margin-top: 5px;
+  &.deprecated {
+    margin-top: 4px;
+  }
 }
 //- end deprecated file
 //- ************************

client/assets/styles/scss/forms/forms-inputs.scss

@@ -80,7 +80,7 @@ input {
 
   // placeholder
   &::placeholder {
-    color: $gray-light;
+    color: $gray;
   }
 }
 

client/assets/styles/scss/forms/forms-table-vars.scss

@@ -0,0 +1,76 @@
+.table-vars {
+  width: 100%;
+
+  .tr {
+
+    &:first-child {
+      background: $gray-lightest;
+      height: $lg;
+      padding: 0;
+
+      .cell {
+        height: 100%;
+      }
+
+      .input {
+        font-size: 13px;
+        height: 30px;
+        line-height: 30px - ($input-border * 2);
+        width: 100%;
+      }
+    }
+
+    &:last-child:not(.empty) {
+      padding-bottom: 0;
+    }
+
+    &.empty {
+      padding-bottom: $md;
+
+      .svg {
+        filter: grayscale(1);
+        height: $xl;
+        opacity: .5;
+      }
+
+      .small {
+        color: $gray;
+        max-width: 240px;
+        text-indent: 0;
+      }
+    }
+
+    + .tr {
+      text-indent: 9px;
+    }
+  }
+
+  .cell {
+
+    &:first-child {
+      border-right: 1px solid $gray-lighter;
+    }
+
+    .icons-alert {
+      color: $orange;
+      height: 12px;
+      pointer-events: auto;
+      width: 12px;
+    }
+  }
+
+  .cell-action {
+    flex: 0 0 66px;
+    padding: 0 6px 0 0;
+
+    > .btn {
+      height: 30px;
+      line-height: 30px - ($input-border * 2);
+    }
+  }
+
+  .icons-add {
+    height: 100%;
+    max-width: 15px;
+  }
+}

client/assets/styles/scss/forms/forms-table.scss

@@ -310,7 +310,7 @@
   .icons-alert,
   .icons-close,
   .icons-link {
-    height: 38px;
+    height: 36px;
     pointer-events: auto;
     width: 18px;
   }

client/assets/styles/scss/index.scss

@@ -107,13 +107,15 @@
 @import "forms/forms-github";
 @import "forms/forms-payment";
 @import "forms/forms-plan";
+@import "forms/forms-table-vars";
 @import "forms/forms-trial";
 @import "forms/forms-whitelist";
 
 // views
 @import "views/views";
 @import "views/views-dockerfile-setup";
 @import "views/views-file-tree";
+@import "views/views-kubernetes-setup";
 @import "views/views-new-service";
 @import "views/views-panel";
 @import "views/views-prompt";
@@ -213,6 +215,7 @@
 @import "deprecated/connections";
 @import "deprecated/deleted-commit";
 @import "deprecated/demo-org-select";
+@import "deprecated/service-cta";
 @import "deprecated/instance-sidebar";
 @import "deprecated/popover-container-menu";
 

client/assets/styles/scss/layout/instance.scss

@@ -6,6 +6,12 @@
   overflow: hidden;
   position: relative;
 
+  // debug view
+  &.instance-body {
+    height: auto;
+    max-width: 100vw;
+  }
+
   > .spinner-wrapper {
     background: $ace-bg;
 

client/assets/styles/scss/layout/instances-list.scss

@@ -35,10 +35,8 @@
 
   .failed,
   .passed {
-    height: 11px;
     margin-left: -1px;
     margin-right: $xxs - 1px; // normal .icons-status margin, -1px to accomodate larger size
-    width: 11px;
   }
 }
 
@@ -222,6 +220,16 @@
 
   &.orange {
     color: $white;
+    font-size: 11px;
+    height: $input-xxs;
+    line-height: $input-xxs - $input-border * 2;
+    padding: 0 3px;
+
+    .iconnables {
+      height: $xs;
+      margin-right: 3px;
+      width: $xs;
+    }
   }
 
   .iconnables {