merged

Gruntfile.js

@@ -52,7 +52,8 @@ module.exports = function (grunt) {
                         { match : 'SSO_KEY', replacement: process.env.SSO_KEY },
                         { match : 'STATIC_FILE_HOST', replacement: process.env.STATIC_FILE_HOST },
                         { match : 'GOOGLE_ANALYTICS_TRACKING_ID', replacement: process.env.GOOGLE_ANALYTICS_TRACKING_ID },
-                        { match : 'CONNECTION_TIMEOUT', replacement: process.env.CONNECTION_TIMEOUT }
+                        { match : 'CONNECTION_TIMEOUT', replacement: process.env.CONNECTION_TIMEOUT },
+                        { match : 'MEMBER_PHOTO_HOST', replacement: process.env.MEMBER_PHOTO_HOST }
                     ]
                 },
                 files : [

app/css/app.css

@@ -171,6 +171,10 @@ body a {cursor: pointer;}
     background-image: url(../img/wizard-icon.png);
     background-position: 0 0;
 }
+.navIcons .iconBug:before{
+    background-image: url(../img/dark/icon-bug.png) !important;
+    background-position: 0 0;
+}
 .navIcons .active .icon:after {
     content: '';
     display: block;
@@ -572,18 +576,18 @@ body a {cursor: pointer;}
 }
 .hero .loginBox footer .sponsorLogo {
     display: block;
-    padding-top: 37px;
-    padding-right: 321px;
+    padding-top: 58px;
+    padding-right: 346px;
     height: 0;
     width: 0;
     overflow: hidden;
-    margin-left: 172px;
+    margin-left: -13px;
 }
 .hero .loginBox footer>p:last-child {
     margin-top: 16px;
     font: 400 15px "Source Code Pro","Helvetica Neue",Helvetica,Arial,sans-serif; /*SourceCodePro Regular*/
     color: #828282;
-    padding-left: 224px;
+    padding-left: 169px;
     letter-spacing: -0.08em;
 }
 .hero .loginBox footer>p:last-child span {
@@ -777,8 +781,8 @@ body a {cursor: pointer;}
     position: absolute;
     bottom: 2px;
 }
-.codeArea .voteUp:before {left: 0; background-position: 0 -25px;}
-.codeArea .voteDown:before {left: 1px; background-position: -25px -25px;}
+.codeArea .voteUp:before {left: -1px; background-position: 0 -25px;}
+.codeArea .voteDown:before {left: -1px; background-position: -25px -25px;}
 .codeArea .shareLink{
     height: 205px;
     width: 186px;
@@ -964,8 +968,8 @@ footer .right>span:nth-child(2) {
     border-width: 0;
     padding: 14px 0 0;
     margin: 0;
-    height: 200px;
-    overflow-y: auto;
+    overflow: auto;
+    height: 190px;
 }
 .modal .modal-content .wizardBody {
     height: 536px;
@@ -1775,6 +1779,9 @@ footer .right>span:nth-child(2) {
     float: right;
     border: 0;
 }
+.panel-custom .mainContent .btnWidth {
+    width: 130px!important;
+}
 .panel-custom .mainContent .btntext {
     width: 94px;
     line-height: 27px;
@@ -2691,7 +2698,8 @@ footer .right>span:nth-child(2) {
 .panelOverview .overviewAndMessage .profile img {
     position: absolute;
     top: 5px;
-    left: 1px;
+    left: -10px;
+    width: 88px;
 }
 .panelOverview .overviewAndMessage .profile p {
     color: #fff;
@@ -3531,10 +3539,10 @@ footer .right>span:nth-child(2) {
     left: 122px;
 }
 .panelSummary .summaryWrapper .divOneDiv1:before {
-    left: 230px !important;
+    left: 215px !important;
 }
 .panelSummary .summaryWrapper .divTwoDiv1:before {
-    left: 310px !important;
+    left: 318px !important;
 }
 .panelSummary .summaryWrapper .divOneDiv:before {
     left: 122px;
@@ -3856,12 +3864,14 @@ footer .right>span:nth-child(2) {
 }
 .detailPage .challengerWrapper .tableDiv {
     max-height: 156px;
+    height: 156px;
 }
 .detailPage .challengeWrapper .tableDiv {
     max-height: 157px;
 }
 .detailPage .leaderboardWrapper .tableDiv {
     max-height: 495px;
+    min-height: 495px;
     width: 100%;
 }
 .detailPage section .tableDiv .innerWrapper,
@@ -4308,6 +4318,9 @@ footer .right>span:nth-child(2) {
     .codeArea .connectionStatus {
         text-align: left;
     }
+    .panel-custom .panel-heading .search-input {
+        width: 420px!important;
+    }
 }
 @media only screen and (max-width: 1082px) {
     .header .navbar-brand { padding-left:60px;}
@@ -4487,6 +4500,16 @@ footer .right>span:nth-child(2) {
     .codeArea .mainContent,
     .detailPage .mainContent {max-width: 766px;}
     .dashboard .mainContent .placeholder {overflow: hidden; }
+    .panel-custom .mainContent .btnWidth {
+        width: 130px!important;
+        margin-right: 20px;
+    }
+    .panelSummary .panel-body .summaryWrapper {
+        min-height: 80px;
+    }
+    .panel-custom .panel-heading .search-input {
+        width: 350px!important;
+    }
 }
 /* boostrap extra small devices */
 @media only screen and (max-width: 767px) {
@@ -4587,6 +4610,10 @@ footer .right>span:nth-child(2) {
     .detailPage .connectionStatus {
         text-align: left;
     }
+    .panelSummary .panel-body {
+        padding: 7px 14px 20px 30px;
+        min-height: 200px;
+    }
 }
 /* special sizes which widget will overflow */
 @media only screen and (max-width: 741px) {
@@ -4630,6 +4657,9 @@ footer .right>span:nth-child(2) {
     .codeArea .btnBack {
         margin-bottom: 5px;
     }
+    .panel-custom .panel-heading .search-input {
+        width: 250px!important;
+    }
 }
 @media only screen and (max-width: 598px) {
     .panelCodeEditor .panel-body .middlePart .actionIcons li+li {margin-left: 5px;}
@@ -4891,12 +4921,28 @@ footer .right>span:nth-child(2) {
 }
 .searched {background: yellow;}
 .coderHistoryTimeField {
-    width: 112px;
+    width: 130px;
     float: left;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.coderHistoryActionField {
+    width: 95px;
+    float: left;
+    white-space: nowrap;
+    overflow: hidden;
 }
 .coderHistoryHandleField {
-    width: 80px;
+    width: 140px;
+    float: left;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.coderHistoryScoreField {
+    width: 85px;
     float: left;
+    white-space: nowrap;
+    overflow: hidden;
 }
 .roomsDiv {
     text-align: center;
@@ -4929,7 +4975,7 @@ footer .right>span:nth-child(2) {
 }
 .panelSummary .panel-body .summaryWrapper,
 .panelSummary .summaryWrapper .sumDiv {
-    height: auto !important;
+    height: 20px !important;
 }
 *:focus {
     outline: none;
@@ -4956,4 +5002,29 @@ footer .right>span:nth-child(2) {
 .chat-highlight {
     color:black;
     background:yellow;
-}
+}
+.textAlign {
+    text-align: center;
+}
+.coder-history-height {
+    min-height: 400px;
+    height: 400px
+}
+.coder-history-li {
+    list-style: none;
+}
+.coder-history-textMargin {
+    margin-top: 50px!important;
+}
+.coder-history-span-red {
+    color: rgb(255, 0, 51)!important;
+}
+.coder-history-span-green {
+    color: #0f0!important;
+}
+.coder-history-span-italic {
+    font-style: italic!important;
+}
+.panel-custom .panel-heading .search-input {
+    width: 450px;
+}

app/css/dark/darkTheme.css

@@ -650,7 +650,7 @@ footer .right .sponsorLogo {
     color: #ddcc00;
 }
 .rating-blue,
-.rating-yellow:hover{
+.rating-blue:hover{
     color: #6666ff;
 }
 .rating-green,
@@ -858,4 +858,16 @@ footer .right .sponsorLogo {
 }
 @media only screen and (max-width: 421px) {
     .panelContestStat .breadcrumbHead {height: 63px; }
+}
+.coder-history-modal-header {
+    background-color:#1f444e!important;
+}
+.coder-history-span {
+    color: #ffffff;
+    border-color: #1f444e;
+    border-top-width: 1px;
+    border-top-style: solid;
+}
+.textColor {
+    color: #ffffff!important;
 }

app/css/light/lightTheme.css

@@ -926,5 +926,10 @@ footer .right .sponsorLogo {
     line-height: 24px;
 }
 .panel-custom .panel-body .textActive {
-    color: #0000ff;
+    color: grey;
+}
+.coder-history-span {
+    border-color: #b7c9d7;
+    border-top-width: 1px;
+    border-top-style: solid;
 }

app/css/orange/orangeTheme.css

@@ -605,7 +605,7 @@ footer .left>span {
     border-bottom: 1px solid #ffe6c7;
 }
 .panelContestStat .panel-body a {
-    color: #333;
+    color: #ff8a00;
 }
 .panelContestStat .panel-body a:hover {
     color: #ff8a00;
@@ -638,7 +638,8 @@ footer .left>span {
     border: 1px solid #e7e7e7;
     border-bottom-width: 0;
     height: 230px;
-    margin: 0;
+    margin-top: 4px;
+    margin-bottom: 3px;
 }
 .panelOverview>section:last-child .panel-body .contentWrapper {
     height: 229px;
@@ -1072,4 +1073,9 @@ footer .left>span {
 }
 .roomsDiv a:hover {
     color: #ff8a00;
+}
+.coder-history-span {
+    border-color: #ffe6c7;
+    border-top-width: 1px;
+    border-top-style: solid;
 }

app/js/app.js

@@ -469,4 +469,35 @@ main.run(['$rootScope', '$state', 'sessionHelper', 'socket', '$window', 'tcTimeS
         return $state.current.name;
     };
 
+    /**
+     * This function returns the css class of rating value.
+     *
+     * @param {number} rating the rating
+     * @returns {string} the CSS class to show different colors
+     */
+    $rootScope.getRatingClass = function (rating) {
+        if (rating >= 2200) {
+            return "rating-red";
+        }
+        if (rating >= 1500) {
+            return "rating-yellow";
+        }
+        if (rating >= 1200) {
+            return "rating-blue";
+        }
+        if (rating >= 900) {
+            return "rating-green";
+        }
+        if (rating >= 1) {
+            return "rating-grey";
+        }
+        if (rating === 0) {
+            return "rating-none";
+        }
+        if (rating < 0) {
+            return "rating-admin";
+        }
+        return "";
+    };
+
 }]);

app/js/config.def.js

@@ -9,5 +9,6 @@ module.exports = {
     ssoKey: '@@SSO_KEY',
     connectionTimeout: @@CONNECTION_TIMEOUT,
     googleAnalyticsTrackingId: '@@GOOGLE_ANALYTICS_TRACKING_ID',
-    staticFileHost: '@@STATIC_FILE_HOST'
+    staticFileHost: '@@STATIC_FILE_HOST',
+    memberPhotoHost: '@@MEMBER_PHOTO_HOST'
 };