Merge upstream.

web/viewer.css

@@ -420,6 +420,16 @@ body {
   -moz-transition-timing-function: ease;
 }
 
+.toolbarField.pageNumber {
+  width: 40px;
+}
+
+.toolbarField.pageNumber::-webkit-inner-spin-button,
+.toolbarField.pageNumber::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
 .toolbarField:hover {
   background-color: hsla(0,0%,100%,.11);
   border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.43) hsla(0,0%,0%,.45);

web/viewer.html

@@ -49,7 +49,6 @@
         <div id="sidebarContent">
           <div id="thumbnailView">
           </div>
-
           <div id="outlineView" class="hidden">
           </div>
         </div>
@@ -68,7 +67,8 @@
                   <div class="splitToolbarButtonSeparator"></div>
                   <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next"></button>
                 </div>
-                <input type="number" id="pageNumber" class="toolbarField" onchange="PDFView.page = this.value;" value="1" size="4" min="1">
+                <div class="toolbarLabel">Page: </div>
+                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1">
                 </input>
                 <span id="numPages" class="toolbarLabel"></span>
               </div>

web/viewer.js

@@ -498,7 +498,7 @@ var PDFView = {
     var pagesCount = pdfDocument.numPages;
     var id = pdfDocument.fingerprint;
     var storedHash = null;
-    document.getElementById('numPages').textContent = '/ ' + pagesCount;
+    document.getElementById('numPages').textContent = 'of ' + pagesCount;
     document.getElementById('pageNumber').max = pagesCount;
     PDFView.documentFingerprint = id;
     var store = PDFView.store = new Settings(id);