From 9d81cf20f900af988fe84d8d458b9acb0742bffa Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 12:11:05 +0100
Subject: [PATCH 1/7] Add new unsupported class to control visibility while
 rich text is open

---
 .../web/app/views/project/editor/editor.pug   |  1 +
 .../stylesheets/app/editor/review-panel.less  | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug
index c24d967da7..28eafab60e 100644
--- a/services/web/app/views/project/editor/editor.pug
+++ b/services/web/app/views/project/editor/editor.pug
@@ -15,6 +15,7 @@ div.full-size(
 	.ui-layout-center(
 		ng-controller="ReviewPanelController",
 		ng-class="{\
+			'rp-unsupported': editor.showRichText,\
 			'rp-state-current-file': (reviewPanel.subView === SubViews.CUR_FILE),\
 			'rp-state-current-file-expanded': (reviewPanel.subView === SubViews.CUR_FILE && ui.reviewPanelOpen),\
 			'rp-state-current-file-mini': (reviewPanel.subView === SubViews.CUR_FILE && !ui.reviewPanelOpen),\
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 1ed723c3b4..87fc3e73cf 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -139,6 +139,10 @@
 		padding: 0 5px;
 	}
 
+	.rp-unsupported & {
+		display: none;
+	}
+
 	position: relative;
 	border-bottom: 1px solid @rp-border-grey;
 	background-color: @rp-bg-dim-blue;
@@ -217,6 +221,10 @@
 	.rp-size-mini & {
 		display: block;
 	}
+
+	.rp-unsupported & {
+		display: none;
+	}
 	
 	.rp-state-current-file & {
 		position: absolute;
@@ -714,6 +722,10 @@
 		display: flex;
 	}
 
+	.rp-unsupported & {
+		display: none;
+	}
+
 	.rp-state-current-file & {
 		position: absolute;
 		bottom: 0;
@@ -1003,7 +1015,8 @@
 	.rp-size-mini & {
 		right: @review-off-width;
 	}
-	.rp-size-expanded & {
+	.rp-size-expanded &,
+	.rp-unsupported & {
 		display: none;
 	}
 }
@@ -1053,6 +1066,10 @@
 		display: block;
 	}
 
+	.rp-unsupported & {
+		display: none;
+	}
+
 	.rp-size-expanded & {
 		&::after {
 			content: "\f105";

From 00c089448ee816f66fd19c1c3f9dc814134247e3 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 12:11:31 +0100
Subject: [PATCH 2/7] Add review panel unsupported message

---
 services/web/app/views/project/editor/review-panel.pug   | 3 +++
 .../web/public/stylesheets/app/editor/review-panel.less  | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index 168947c16a..a7663c6e98 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -235,6 +235,9 @@
 			i.fa.fa-list
 			span.rp-nav-label #{translate("overview")}
 
+	.rp-unsupported-msg
+		p UNSUPPORTED
+
 
 script(type='text/ng-template', id='changeEntryTemplate')
 	div
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 87fc3e73cf..6ba235f061 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -846,6 +846,15 @@
 		}
 	}
 
+.rp-unsupported-msg {
+	display: none;
+	.rp-unsupported & {
+		display: flex;
+		flex-direction: column;
+		width: @review-panel-width;
+	}
+}
+
 .ace-editor-wrapper {
 	.track-changes-marker-callout {
 		border-radius: 0;

From 538aba323af87a596335e23c17891ab1fdaaaa27 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 14:08:11 +0100
Subject: [PATCH 3/7] Add first pass at unsupported message and style

---
 .../app/views/project/editor/review-panel.pug |  6 +++--
 .../stylesheets/app/editor/review-panel.less  | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index a7663c6e98..97cbcabf69 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -235,8 +235,10 @@
 			i.fa.fa-list
 			span.rp-nav-label #{translate("overview")}
 
-	.rp-unsupported-msg
-		p UNSUPPORTED
+	.rp-unsupported-msg-wrapper
+		.rp-unsupported-msg
+			i.fa.fa-5x.fa-exclamation-triangle
+			p Track Changes is unsupported in Rich Text mode
 
 
 script(type='text/ng-template', id='changeEntryTemplate')
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 6ba235f061..958d0298f0 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -846,12 +846,28 @@
 		}
 	}
 
-.rp-unsupported-msg {
+.rp-unsupported-msg-wrapper {
 	display: none;
-	.rp-unsupported & {
+	.rp-size-expanded.rp-unsupported & {
+		display: block;
+	}
+
+	height: 100%;
+
+	.rp-unsupported-msg {
 		display: flex;
+		width: @review-panel-width - 40px;
+		height: 100%;
 		flex-direction: column;
-		width: @review-panel-width;
+		justify-content: center;
+		align-items: center;
+		margin: 0 auto;
+		text-align: center;
+
+		p {
+			font-size: 1.3em;
+			margin-top: 13px;
+		}
 	}
 }
 

From b4dd04737108f357f6089ba15f7a1b1a8ca6d5ab Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 14:08:43 +0100
Subject: [PATCH 4/7] Fix unnecessary right marging being applied to review
 panel when rich text is open

---
 .../web/public/coffee/ide/editor/directives/aceEditor.coffee    | 1 +
 .../ide/review-panel/controllers/ReviewPanelController.coffee   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
index 33fac29f32..a78df6a10a 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
@@ -521,6 +521,7 @@ define [
 						detachFromAce(scope.sharejsDoc)
 						session = editor.getSession()
 						session?.destroy()
+						scope.eventsBridge.emit "aceScrollbarVisibilityChanged", false, 0
 
 				scope.$emit "#{scope.name}:inited", editor
 
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 430c5cd246..2eabee764c 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -164,7 +164,7 @@ define [
 			updateScrollbar()
 
 		updateScrollbar = () ->
-			if scrollbar.isVisible and $scope.reviewPanel.subView == $scope.SubViews.CUR_FILE
+			if scrollbar.isVisible and $scope.reviewPanel.subView == $scope.SubViews.CUR_FILE and !$scope.editor.showRichText
 				$reviewPanelEl.css "right", "#{ scrollbar.scrollbarWidth }px"
 			else
 				$reviewPanelEl.css "right", "0"

From b1a47ddae4334399717712002024b65d373ef127 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 14:50:55 +0100
Subject: [PATCH 5/7] Improve copy

---
 services/web/app/views/project/editor/review-panel.pug       | 4 +++-
 services/web/public/stylesheets/app/editor/review-panel.less | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index 97cbcabf69..c170701c79 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -238,7 +238,9 @@
 	.rp-unsupported-msg-wrapper
 		.rp-unsupported-msg
 			i.fa.fa-5x.fa-exclamation-triangle
-			p Track Changes is unsupported in Rich Text mode
+			p.rp-unsupported-msg-title Sorry, Track Changes is not supported in Rich Text mode (yet).
+			p We didn't want to delay your ability to use Rich Text mode so we've launched without support for it for now.
+			p We're working hard to include Track Changes as soon as possible.
 
 
 script(type='text/ng-template', id='changeEntryTemplate')
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 958d0298f0..800a25618f 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -864,7 +864,7 @@
 		margin: 0 auto;
 		text-align: center;
 
-		p {
+		.rp-unsupported-msg-title {
 			font-size: 1.3em;
 			margin-top: 13px;
 		}

From 3806d2bda74e102ea2613f9d7b00fa688a78c78a Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 14:52:09 +0100
Subject: [PATCH 6/7] Add right margin to toolbar if review panel open

This fixes bug where the toolbar would be measured incorrectly if the
review panel was open
---
 .../web/public/stylesheets/app/editor/review-panel.less     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 800a25618f..05b45afc59 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -793,6 +793,12 @@
 	}
 }
 
+.toolbar-editor {
+	.rp-size-expanded & {
+		margin-right: @review-panel-width;
+	}
+}
+
 .rp-toggle {
 	display: inline-block;
 	vertical-align: middle;

From dc56ffb8a65f3a2f1a9bdc39199d219c2c29ea06 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 11 Jul 2018 15:22:20 +0100
Subject: [PATCH 7/7] Improve copy

---
 services/web/app/views/project/editor/review-panel.pug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index c170701c79..5c10a8ed4d 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -239,7 +239,7 @@
 		.rp-unsupported-msg
 			i.fa.fa-5x.fa-exclamation-triangle
 			p.rp-unsupported-msg-title Sorry, Track Changes is not supported in Rich Text mode (yet).
-			p We didn't want to delay your ability to use Rich Text mode so we've launched without support for it for now.
+			p We didn't want to delay your ability to use Rich Text mode so we've launched without support for Track Changes.
 			p We're working hard to include Track Changes as soon as possible.