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

Conflicts:
	web/viewer.css

web/viewer.css

@@ -501,6 +501,11 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
   content: url(images/toolbarButton-print.png);
 }
 
+.toolbarButton.openFile::before {
+  display: inline-block;
+  content: url(images/toolbarButton-openFile.png);
+}
+
 .toolbarButton.download::before {
   display: inline-block;
   content: url(images/toolbarButton-download.png);
@@ -932,50 +937,6 @@ canvas {
   font-size: 10px;
 }
 
-@media all and (max-width: 770px) {
-  #scaleSelectContainer, #fileInput, #pageNumberLabel {
-    display: none;
-  }
-
-  #sidebarContainer {
-    top: 33px;
-    z-index: 100;
-  }
-  #sidebarContent {
-    top: 33px;
-    background-color: hsla(0,0%,0%,.7);
-  }
-  #thumbnailView, #outlineView {
-    top: 66px;
-  }
-
-  html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
-    left: 0px;
-  }
-  html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
-    right: 0px;
-  }
-
-  #pageNumber {
-    width: 30px;
-  }
-}
-
-@media all and (max-width: 500px) {
-  #viewBookmark {
-    display: none;
-  }
-
-  html[dir='ltr'] .outerCenter {
-    float: left;
-    left: 180px;
-  }
-  html[dir='rtl'] .outerCenter {
-    float: right;
-    right: 180px;
-  }
-}
-
 @media print {
   #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
     display: none;
@@ -999,3 +960,52 @@ canvas {
     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;
+  }
+  #sidebarContent {
+    top: 32px;
+    background-color: hsla(0,0%,0%,.7);
+  }
+  #thumbnailView, #outlineView {
+    top: 66px;
+  }
+
+  html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+    left: 0px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+    right: 0px;
+  }
+
+  html[dir='ltr'] .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] .outerCenter {
+    float: right;
+    right: 180px;
+  }
+}
+
+@media all and (max-width: 600px) {
+  #toolbarViewerRight {
+    display: none;
+  }
+}

web/viewer.html

@@ -87,14 +87,10 @@
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
               <div id="toolbarViewerRight">
-                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="10" />
-
-                <!--
                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" />
-                <button id="openFile" class="toolbarButton print" title="Open File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
+                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
                    <span data-l10n-id="open_file_label">Open</span>
                 </button>
-                -->
 
                 <!--
                 <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">

web/viewer.js

@@ -1366,7 +1366,7 @@ window.addEventListener('load', function webViewerLoad(evt) {
 
   if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
       !window.FileList || !window.Blob) {
-    document.getElementById('fileInput').setAttribute('hidden', 'true');
+    document.getElementById('openFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }