Merge branch 'dev' of github.com:appirio-tech/topcoder-app into dev

Author: Parth Shah

app/account/login/login.controller.js

@@ -32,6 +32,7 @@
         $log.warn(resp);
         switch (resp.status) {
           case "ACCOUNT_INACTIVE":
+            $state.go('registeredSuccessfully');
             // user should already be redirected
             break;
           case "UNKNOWN_ERROR":

app/account/login/login.jade

@@ -1,6 +1,7 @@
 .login-container
   header
-    img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
+    a.logo-link(href="/")
+      img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
   h1 LOG IN TO TOPCODER
 

app/account/register/register.jade

@@ -1,7 +1,8 @@
 .register-container
   header
+    a.logo-link(href="/")
       img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
-      .arrow
+    .arrow
   h1 Join the Topcoder technology community to earn, learn, and connect
 
   form(name="vm.registerForm", role="form", ng-submit="vm.registerForm.$valid && vm.register()", novalidate, autocomplete="off")

app/account/register/registered-successfully.jade

@@ -1,7 +1,8 @@
 .registered-successfully-container
 
   header
-    img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
+    a.logo-link(href="/")
+      img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
 
-  p.message Thanks. We've emailed you a reset link. Please check your inbox.
+  p.message Thanks for joining Topcoder.<br> We’ve sent you a confirmation link. Please check your email and click the link to activate your account. If you can't find the message, please email #[a(href="mailto:[email protected]") [email protected]].

app/account/reset-password/reset-password.jade

@@ -1,7 +1,8 @@
 .reset-password-container(ng-show="!vm.resetTokenSent && !vm.token")
 
   header
-    img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
+    a.logo-link(href="/")
+      img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
   h1(class="header") PASSWORD RESET
 

app/layout/header/header.controller.js

@@ -27,7 +27,7 @@
           { 'href': '/community/design/', 'text': 'DESIGN', 'icon': '/images/nav/scroll-design.svg' },
           { 'href': '/community/development/', 'text': 'DEVELOPMENT', 'icon': '/images/nav/scroll-develop.svg' },
           { 'href': '/community/data-science/', 'text': 'DATA SCIENCE', 'icon': '/images/nav/scroll-data.svg' },
-          { 'href': '/community/data-science/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/srms.svg' },
+          { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/srms.svg' },
       ],
       'community': [
           { 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/images/nav/users.svg' },

assets/css/account/account.scss

@@ -16,6 +16,7 @@
     background-color: #2E2E2E;
     display: flex;
     justify-content: center;
+    align-items: center;
     /* TODO remove workarounds of -ve margin */
     margin-top: -66px;
     margin-bottom: 30px;
@@ -25,6 +26,7 @@
       background-repeat: no-repeat;
       background-position: 0px -11px;
       width: 16px;
+      height: 10px;
       /* TODO remove workarounds of -ve margin */
       margin-left: -35px;
       margin-top: 61px;
@@ -218,4 +220,11 @@
   .register-container {
     margin: 66px auto;
   }
+
+  .registered-successfully-container {
+    margin: 66px auto;
+    p.message {
+      padding: 34px 30px 124px 30px;
+    }
+  }
 }