Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issues for bug fix 3. #357

Merged
merged 1 commit into from Aug 3, 2014
Merged

fix issues for bug fix 3. #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/css/app.css
View file
Open in desktop
Expand Up @@ -1066,7 +1066,7 @@ footer .right>span:nth-child(2) {
left: 355px;
}
.roomsPanel:after {
left: 495px;
left: 350px;
}
.panel-custom .schedulePanel span {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion app/js/controllers/chatAreaCtrl.js
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ var helper = require('../helper');
*
* @type {*[]}
*/
var chatAreaCtrl = ['$scope', '$rootScope', 'socket', function ($scope, $rootScope, socket) {
var chatAreaCtrl = ['$scope', '$rootScope', 'socket', '$timeout', function ($scope, $rootScope, socket, $timeout) {
var roundData,
rebuildAllScrollbar = function () {
$scope.$broadcast('rebuild:methods');
Expand Down
4 changes: 2 additions & 2 deletions app/partials/user.contest.detail.html
View file
Open in desktop
Expand Up @@ -328,9 +328,9 @@ <h3><span data-ng-show="viewOn=='room'">Room</span><span data-ng-hide="viewOn=='
--><span class="name {{getRatingClass(coder.userRating)}}"><span data-rating-indicator="{{coder.userRating}}" data-username="{{coder.userName}}" class="ratingIcon"></span></span><!--
--></a>
</td>
<td class="col2" data-ng-click="showCoderInfo(coder.userName, coder.userType);"><!-- avoid blank
<td class="col2"><!-- avoid blank
--><!-- avoid blank
--><span class="name {{getRatingClass(coder.userRating)}} {{getLeaderRoomClass(coder.roomPlace)}}">{{coder.userName}}</span>
--><span data-ng-click="showCoderInfo(coder.userName, coder.userType);" class="name {{getRatingClass(coder.userRating)}} {{getLeaderRoomClass(coder.roomPlace)}}">{{coder.userName}}</span>
<a class="rating" data-ng-click="getCoderHistory(coder.userName)">History</a>
</td>
<td data-ng-repeat="component in coder.components track by $index" class="colProblem">
Expand Down