Merge remote-tracking branch 'mozilla/master' into print-visible

Conflicts:
	web/viewer.css

diff --cc web/viewer.css
index c8eb251b3e52fa9959de97b93e989aa94ef530fd,d0a7be9a02039fb3f7d3c41fcf6f60081e56a6e3..c7c8c7cf3d9a43b44e2a276ffd4aa78eb77d5e54
--- 1/web/viewer.css
--- 2/web/viewer.css
+++ b/web/viewer.css
@@@ -932,11 -937,20 +937,44 @@@ canvas 
    font-size: 10px;
  }
  
- @media all and (max-width: 770px) {
-   #scaleSelectContainer, #fileInput, #pageNumberLabel {
++@media print {
++  #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
 +    display: none;
 +  }
 +
++  #mainContainer, #viewerContainer, .page, .page canvas {
++    position: static;
++    padding: 0;
++    margin: 0;
++  }
++
++  .page {
++    float: left;
++    display: none;
++    box-shadow: none;
++    -moz-box-shadow: none;
++    -webkit-box-shadow: none;
++  }
++
++  .page[data-loaded] {
++    display: block;
++  }
++}
++
+ @media all and (max-width: 950px) {
+   html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+   html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
+     float: left;
+     left: 180px;
+   }
+   html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+   html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
+     float: right;
+     right: 180px;
+   }
+ }
+ 
+ @media all and (max-width: 770px) {
    #sidebarContainer {
      top: 33px;
      z-index: 100;