From 5d414e9a1b0a840e6395a02175fd509e2272f225 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 16 Nov 2016 15:57:51 +0000
Subject: [PATCH 1/3] Tweak paddings in review panel

---
 .../review-panel/directives/reviewPanelSorted.coffee   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee b/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee
index b51f0e6238..828579d0bc 100644
--- a/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee
+++ b/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")

From beab95a871eb78f24ae0fd9ee78784d8964a1f3f Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 16 Nov 2016 16:03:06 +0000
Subject: [PATCH 2/3] Reflow review panel layout when adding a comment

---
 .../controllers/ReviewPanelController.coffee        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index 89764aab19..c33e4f514c 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -45,23 +45,26 @@ 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 = () ->
 			$scope.commentState.adding = false
 			$scope.$broadcast "comment:add", $scope.commentState.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

From a4b9bcb37e5f320151ec1e3cab4ef6914f8614b7 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 16 Nov 2016 16:07:07 +0000
Subject: [PATCH 3/3] Don't let focused change overlap nav panel

---
 services/web/public/stylesheets/app/editor/review-panel.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 1000e052ad..6c467a1e5e 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/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%);