Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel

services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -46,23 +46,27 @@ define [
 		$scope.startNewComment = () ->
 			# $scope.commentState.adding = true
 			$scope.$broadcast "comment:select_line"
-			$scope.$broadcast "review-panel:layout"
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
 		
 		$scope.submitNewComment = (content) ->
 			console.log(content)
 			# $scope.commentState.adding = false
 			$scope.$broadcast "comment:add", content
 			# $scope.commentState.content = ""
-			$scope.$broadcast "review-panel:layout"
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
 		
 		$scope.cancelNewComment = (entry) ->
 			# $scope.commentState.adding = false
 			# $scope.commentState.content = ""
-			$scope.$broadcast "review-panel:layout"
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
 		
 		$scope.startReply = (entry) ->
 			entry.replying = true
-			$scope.$broadcast "review-panel:layout"
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
 
 		# $scope.handleCommentReplyKeyPress = (ev, entry) ->
 		# 	if ev.keyCode == 13 and !ev.shiftKey and !ev.ctrlKey and !ev.metaKey

services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee

@@ -4,18 +4,16 @@ define [
 	App.directive "reviewPanelSorted", ($timeout) ->
 		return  {
 			link: (scope, element, attrs) ->
-				TOOLBAR_HEIGHT = 28
-				BOX_PADDING = 12
-				INDICATOR_PADDING = 4
-				
 				previous_focused_entry_index = 0
 				
 				layout = () ->
 					sl_console.log "LAYOUT"
 					if scope.ui.reviewPanelOpen
-						PADDING = BOX_PADDING
+						PADDING = 8
+						TOOLBAR_HEIGHT = 38
 					else
-						PADDING = INDICATOR_PADDING
+						PADDING = 4
+						TOOLBAR_HEIGHT = 4
 					
 					entries = []
 					for el in element.find(".rp-entry-wrapper")

services/web/public/stylesheets/app/editor/review-panel.less

@@ -386,6 +386,7 @@
 	text-align: center;
 	background-color: @rp-bg-dim-blue;
 	border-top: solid 1px @rp-border-grey;
+	z-index: 2;
 }
 	.rp-nav-item {
 		color: lighten(@rp-type-blue, 25%);