diff --git a/src/css/my-dashboard.css b/src/css/my-dashboard.css index 92ff7a32..27445d88 100644 --- a/src/css/my-dashboard.css +++ b/src/css/my-dashboard.css @@ -111,6 +111,11 @@ background-position: 50% 50%; color: #fff; } +@media only screen and (min-width: 768px) { + .member-profile-header { + padding: 15px 0; + } +} .member-profile { } diff --git a/src/js/app/challenge-details/index.html b/src/js/app/challenge-details/index.html index caac7087..037d008b 100644 --- a/src/js/app/challenge-details/index.html +++ b/src/js/app/challenge-details/index.html @@ -269,7 +269,7 @@

Reliability Rating and Bonus

Submission Date
- +
Result
@@ -290,7 +290,7 @@

Reliability Rating and Bonus

- + diff --git a/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html b/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html index 426ef2d9..d8016cd2 100644 --- a/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html +++ b/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html @@ -291,6 +291,12 @@

$

{{CD.challenge.submissionEndDate | formatDate:2}}

+

+ + + {{CD.challenge.currentPhaseEndDate | formatDate:2}} + +

diff --git a/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html b/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html index f2da4587..f5ec4129 100644 --- a/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html +++ b/src/js/app/challenge-details/partials/ng-page-challenge-result.tpl.html @@ -119,7 +119,7 @@

Round 2 (Final)

-
+
1st
diff --git a/src/js/app/challenges/services/challengeService.js b/src/js/app/challenges/services/challengeService.js index 2ad55ab4..d12b11ae 100644 --- a/src/js/app/challenges/services/challengeService.js +++ b/src/js/app/challenges/services/challengeService.js @@ -186,6 +186,7 @@ // Add My Challenges Filter and Improve Filters challenge -- different api endpoint return UserChallengesService.getUserChallenges(listType === 'user-past' ? 'past' : 'active', params); } else { + params.review = 'COMMUNITY,INTERNAL'; return Restangular.one('challenges').getList(listType, params); } } diff --git a/src/js/app/my-dashboard/head.html b/src/js/app/my-dashboard/head.html index 426e6286..5efb9eae 100644 --- a/src/js/app/my-dashboard/head.html +++ b/src/js/app/my-dashboard/head.html @@ -1,3 +1,3 @@ - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/js/app/my-dashboard/index.html b/src/js/app/my-dashboard/index.html index 1e55ec31..dd467559 100644 --- a/src/js/app/my-dashboard/index.html +++ b/src/js/app/my-dashboard/index.html @@ -1,6 +1,6 @@ @@header -
+
-
+
@@ -41,21 +41,21 @@
- -
+
-
+
-
+
-