Conflicts merged

Author: sushilshinde

app/my-dashboard/notifications/news.json

@@ -1,14 +1,16 @@
 [
   {
-    "header": "TCO17 Live Broadcast",
-    "details": "Watch now!",
-    "backgroundImage": "tco17-live-broadcast.jpg",
-    "redirectTo": "https://tco17.topcoder.com/videos",
-    "redirectText": "TCO17 Live Broadcast Schedule",
-    "live": true,
-    "liveExpand": true,
-    "height": 600,
-    "videoCode": "https://player.twitch.tv/?channel=topcoder_official",
+    "header": "TCO17",
+    "details": "Congratulations to our Champions!",
+    "backgroundImage": "tco-winners.jpg",
+    "redirectTo": "https://tco17.topcoder.com",
+    "redirectText": "Congratulations to our TCO17 Champions!",
+    "live": false,
+    "liveExpand": false,
+    "customTag": {
+      "text": "Announcement"
+    },
+    "videoCode": "",
     "videoHeight": 480
   }
 ]

app/skill-picker/skill-picker.controller.js

@@ -29,6 +29,7 @@ import _ from 'lodash'
     vm.isPageDirty = isPageDirty
     vm.isTracksDirty = isTracksDirty
     vm.isCommunitySelected = isCommunitySelected
+    vm.isPageStateDirty = false
     ///////
     activate()
 
@@ -43,20 +44,22 @@ import _ from 'lodash'
     /**
      * Verfies if the page state has been modified by the user in any way.
      */
-    function isPageDirty() {
+    function isPageDirty() {      
       return isTracksDirty() || isCommunitiesDirty()
     }
 
     /**
      * Verfies if the tracks section state has been modified by the user in any way.
      */
     function isTracksDirty() {
+      vm.isPageStateDirty = true
       return vm.tracks.DESIGN || vm.tracks.DEVELOP || vm.tracks.DATA_SCIENCE
     }
     /**
      * Verfies if the communities section state has been modified by the user in any way.
      */
     function isCommunitySelected() {
+      vm.isPageStateDirty = true
       var community = _.find(vm.communities, {status: true, display: true})
       return !!community
     }

app/skill-picker/skill-picker.jade

@@ -77,4 +77,4 @@
     type="button",
     tc-busy-button, tc-busy-when="vm.saving",
     ng-click="vm.submitSkills()",
-    ng-disabled="vm.disableDoneButton || !vm.isPageDirty()") Done
+    ng-disabled="vm.disableDoneButton || vm.isPageStateDirty") Done

assets/css/directives/notification.directive.scss

@@ -55,16 +55,12 @@
   }
   .expanded{
     background-color: $tc-black;
-    background-position: 0 0;
-    background-size: 50% 100%;
+    background-position: 0 20%;
+    background-size: cover;
     background-repeat: no-repeat;
     color: $tc-black;
     display: flex;
     position: relative;
-    @media screen and (max-width: 768px) {
-      background-size: 100% 50%;
-      flex-direction: column;
-    }
     .mask{
       position: absolute;
       top: 0;
@@ -94,8 +90,8 @@
     }
     .action{
       position: absolute;
-      bottom: 100px;
-      left: 150px;
+      bottom: 36px;
+      left: 36px;
       background-color: white;
       padding: 10px 20px;
       border-radius: 26px;