Merge pull request #892 from appirio-tech/dev

Promote dev to master - Predix

Author: ajefts

app/my-dashboard/my-dashboard.jade

@@ -5,6 +5,12 @@
 
   .challenges(id="challenges", ui-view="my-challenges")
 
+  .tco.tco17
+    .tc-banner-placeholder.predix
+      .subtitle Ready for the future? The Industrial Internet is here
+      .description Get hands-on with the Predix platform and the Industrial Internet 
+      a(href="http://predix.topcoder.com/").cta.tc-btn-white.tc-btn-radius Learn More
+
   //- .ttl
   //-   tc-banner(theme="black", banner-name="ttl")
   .tco.tco17

app/settings/email/email.controller.js

@@ -59,6 +59,13 @@ import angular from 'angular'
           desc: 'Our annual online and onsite tournament to celebrate and reward the community',
           enabled: false,
           dirty: false
+        },
+        {
+          id: 'TOPCODER_NL_PREDIX',
+          name: 'Predix Community Newsletter',
+          desc: 'Design and development on GE’s platform for the Industrial Internet of Things',
+          enabled: false,
+          dirty: false
         }
       ]
 

assets/css/directives/tc-banner.scss

@@ -178,3 +178,64 @@ $tco-color-dark: #ea690b;
   }
 }
 
+
+.tc-banner-placeholder.predix {
+  background-image: url(../../images/predix-home-hero.jpg);
+  background-size: 100%;
+  height: 352px;
+  background-position: center 100%;
+  background-repeat: no-repeat;
+  background-color: #222222;
+  z-index: 1;
+
+  padding-top: 50px;
+
+  .title {
+    margin-top: 10px;
+    @include sofia-pro-bold;
+    color: $white;
+  }
+
+  .subtitle {
+    margin-top: 50px;
+    width: 450px;
+    font-size: 20px;
+    @extend .title;
+    @include sofia-pro-regular;
+  }
+
+  .description {
+    margin-top: 20px;
+    margin-bottom: 5px;
+    color: $white;
+  }
+
+  .cta {
+    margin-top: 20px;
+  }
+
+  .tc-btn-white {
+    background-color: white;
+    color: #0096FF;
+    padding: 10px 20px;
+    margin-top: 10px;
+  }
+
+  .tc-btn-radius {
+    border-radius: 26px;
+  }
+}
+
+.tc-banner-placeholder.predix::before {
+    content: ' ';
+    background: url(../../images/predix-home-hero-title.png)
+    no-repeat center center;
+    width: 950px;
+    height: 67px;
+    position: relative;
+    top: 0;
+    left: 15%;
+    margin-left: -250px;
+}
+
+