diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 633c6ccdcb..5da0fe5eaf 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -256,10 +256,10 @@ script(type='text/ng-template', id='addCommentEntryTemplate') script(type='text/ng-template', id='resolvedCommentsDropdownTemplate') .resolved-comments - //- .resolved-comments-backdrop( - //- ng-class="{ 'resolved-comments-backdrop-visible' : state.isOpen }" - //- ng-click="state.isOpen = !state.isOpen" - //- ) + .resolved-comments-backdrop( + ng-class="{ 'resolved-comments-backdrop-visible' : state.isOpen }" + ng-click="state.isOpen = false" + ) a.resolved-comments-toggle( href ng-click="toggleOpenState();" 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 fb521ed9f8..cbdfd62ef3 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -251,8 +251,7 @@ define [ $timeout () -> $scope.$broadcast "review-panel:layout" - $scope.submitReply = (entry, entry_id) -> - $scope.unresolveComment(entry, entry_id) + $scope.submitReply = (entry, entry_id) -> thread_id = entry.thread_id content = entry.replyContent $http.post("/project/#{$scope.project_id}/thread/#{thread_id}/messages", {content, _csrf: window.csrfToken}) diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less index aa14e2c2d4..1092fc2eb2 100644 --- a/services/web/public/stylesheets/app/editor/review-panel.less +++ b/services/web/public/stylesheets/app/editor/review-panel.less @@ -93,6 +93,7 @@ border-left: solid 1px @rp-border-grey; font-size: @rp-base-font-size; color: @rp-type-blue; + z-index: 4; // 3 is Ace's gutter z-index value. } .review-panel-toolbar { @@ -112,7 +113,7 @@ border-bottom: 1px solid @rp-border-grey; background-color: @rp-bg-dim-blue; text-align: center; - z-index: 2; + z-index: 3; flex-basis: 32px; flex-shrink: 0; } @@ -687,19 +688,18 @@ } } -// .resolved-comments-backdrop { -// display: none; -// position: fixed; -// top: 0; -// right: 0; -// bottom: 0; -// left: 0; -// background-color: rgba(0, 0, 0, .5); +.resolved-comments-backdrop { + display: none; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; -// &-visible { -// display: block; -// } -// } + &-visible { + display: block; + } +} .resolved-comments-dropdown { display: none;