Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

services/web/app/views/project/editor/pdf.jade

@@ -27,6 +27,15 @@ div.full-size.pdf(ng-controller="PdfController")
 				}"
 			) {{ pdf.logEntries.errors.length + pdf.logEntries.warnings.length }}
 			
+		a(
+			ng-href="{{pdf.url}}"
+			target="_blank"
+			ng-if="pdf.url"
+			tooltip="Download PDF"
+			tooltip-placement="bottom"
+		)
+			i.fa.fa-download
+			
 		.toolbar-right
 			a(
 				href,

services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee

@@ -25,6 +25,7 @@ define [
 			@$scope.spellingMenu = {left: '0px', top: '0px'}
 
 			@editor.on "nativecontextmenu", (e) =>
+				e.domEvent.stopPropagation();
 				@closeContextMenu(e.domEvent)
 				@openContextMenu(e.domEvent)
 
@@ -74,6 +75,7 @@ define [
 					@$scope.spellingMenu.open = true
 					@$scope.spellingMenu.left = e.clientX + 'px'
 					@$scope.spellingMenu.top = e.clientY + 'px'
+				return false
 
 		closeContextMenu: (e) ->
 			@$scope.$apply () =>

services/web/public/coffee/ide/track-changes/directives/infiniteScroll.coffee

@@ -11,7 +11,7 @@ define [
 					if attrs.infiniteScrollUpwards?
 						atTopOfListView()
 					else
-						atBottomOfList()
+						atBottomOfListView()
 					
 				atTopOfListView = () ->
 					element.scrollTop() < 30

services/web/public/stylesheets/app/editor/toolbar.less

@@ -94,8 +94,10 @@
 	&.toolbar-tall {
 		height: 58px;
 		padding-top: 10px;
+		a.btn {
+			margin: 0 (@line-height-computed / 2);
+		}
 		a {
-			margin-left: (@line-height-computed / 2);
 			padding: 4px 10px 5px;
 		}
 	}