Merge pull request #925 from appirio-tech/new-listings

reverted some commits that broke the build

Author: tladendo

app/directives/challenge-links/challenge-links.jade

@@ -1,10 +1,10 @@
 .challenge-links(ng-class="view + '-view'")
-  a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack", target="_self")
+  a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack")
     .icon.registrants-icon
     p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}}
     p(ng-switch-default) {{challenge.numRegistrants}}
 
-  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}", target="_self")
+  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}")
     .icon.submissions-icon
     p {{challenge.numSubmissions}}
 

app/my-challenges/my-challenges.controller.js

@@ -146,14 +146,6 @@ import _ from 'lodash'
       vm.getChallenges(currentOffset, false)
     }
 
-    window.onscroll = function() {
-      if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
-        if (vm.totalCount > vm.myChallenges.length) {
-          vm.loadMore()
-        }
-      }
-    }
-
     function _checkForParticipation() {
       return ChallengeService.checkChallengeParticipation(vm.handle, function(participated) {
         vm.neverParticipated = !participated

app/my-challenges/my-challenges.jade

@@ -1,6 +1,6 @@
 .my-challenges-container
   .my-challenges
-
+    
     .page-header
       page-state-header(handle="{{vm.handle}}", page-title="My Challenges", hide-money="true", show-back-link="true", default-state="dashboard")
 
@@ -26,7 +26,10 @@
 
         .hasChallenges(ng-show="vm.myChallenges.length", state="vm.loading")
 
-          .data(ng-class="vm.view + '-view'")
+          .data(ng-class="vm.view + '-view'")                      
             challenge-tile(
-              ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true",
+              ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true", 
               challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")
+
+          tc-section.load-more-section(state="vm.loading")
+              button.tc-btn(ng-show="vm.totalCount > vm.myChallenges.length", ng-click="vm.loadMore()") Load More

assets/css/community/members.scss

@@ -65,9 +65,6 @@
       color: #a3a3ae;
       font-size: 12px;
       font-weight: 400;
-      @media only screen and (max-width: 768px) {
-        font-size: 5vw;
-      }
     }
   }