forked from mozilla/gecko-dev
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge mozilla-central to autoland. a=merge on a CLOSED TREE
Showing
117 changed files
with
4,610 additions
and
3,266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
This is the PDF.js project output, https://github.com/mozilla/pdf.js | ||
|
||
Current extension version is: 2.0.491 | ||
Current extension version is: 2.0.506 | ||
|
||
Taken from upstream commit: 2dc4af52 | ||
Taken from upstream commit: b7a3a5e7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+218 Bytes
...extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollHorizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+228 Bytes
...r/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollVertical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+297 Bytes
...er/extensions/pdfjs/content/web/images/secondaryToolbarButton-scrollWrapped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+347 Bytes
browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadEven.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+179 Bytes
browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadNone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+344 Bytes
browser/extensions/pdfjs/content/web/images/secondaryToolbarButton-spreadOdd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -290,6 +290,46 @@ | |
border: none; | ||
} | ||
|
||
.pdfViewer.scrollHorizontal, .pdfViewer.scrollWrapped, .spread { | ||
margin-left: 3.5px; | ||
margin-right: 3.5px; | ||
text-align: center; | ||
} | ||
|
||
.pdfViewer.scrollHorizontal, .spread { | ||
white-space: nowrap; | ||
} | ||
|
||
.pdfViewer.removePageBorders, | ||
.pdfViewer.scrollHorizontal .spread, | ||
.pdfViewer.scrollWrapped .spread { | ||
margin-left: 0; | ||
margin-right: 0; | ||
} | ||
|
||
.spread .page, | ||
.pdfViewer.scrollHorizontal .page, | ||
.pdfViewer.scrollWrapped .page, | ||
.pdfViewer.scrollHorizontal .spread, | ||
.pdfViewer.scrollWrapped .spread { | ||
display: inline-block; | ||
vertical-align: middle; | ||
} | ||
|
||
.spread .page, | ||
.pdfViewer.scrollHorizontal .page, | ||
.pdfViewer.scrollWrapped .page { | ||
margin-left: -3.5px; | ||
margin-right: -3.5px; | ||
} | ||
|
||
.pdfViewer.removePageBorders .spread .page, | ||
.pdfViewer.removePageBorders.scrollHorizontal .page, | ||
.pdfViewer.removePageBorders.scrollWrapped .page { | ||
margin-left: 5px; | ||
margin-right: 5px; | ||
} | ||
|
||
.pdfViewer .page canvas { | ||
margin: 0; | ||
display: block; | ||
|
@@ -309,6 +349,22 @@ | |
background: url('images/loading-icon.gif') center no-repeat; | ||
} | ||
|
||
.pdfPresentationMode .pdfViewer { | ||
margin-left: 0; | ||
margin-right: 0; | ||
} | ||
|
||
.pdfPresentationMode .pdfViewer .page, | ||
.pdfPresentationMode .pdfViewer .spread { | ||
display: block; | ||
} | ||
|
||
.pdfPresentationMode .pdfViewer .page, | ||
.pdfPresentationMode .pdfViewer.removePageBorders .page { | ||
margin-left: auto; | ||
margin-right: auto; | ||
} | ||
|
||
.pdfPresentationMode:-moz-full-screen .pdfViewer .page { | ||
margin-bottom: 100%; | ||
border: 0; | ||
|
@@ -1279,6 +1335,30 @@ html[dir="rtl"] .secondaryToolbarButton > span { | |
content: url(images/secondaryToolbarButton-handTool.png); | ||
} | ||
|
||
.secondaryToolbarButton.scrollVertical::before { | ||
content: url(images/secondaryToolbarButton-scrollVertical.png); | ||
} | ||
|
||
.secondaryToolbarButton.scrollHorizontal::before { | ||
content: url(images/secondaryToolbarButton-scrollHorizontal.png); | ||
} | ||
|
||
.secondaryToolbarButton.scrollWrapped::before { | ||
content: url(images/secondaryToolbarButton-scrollWrapped.png); | ||
} | ||
|
||
.secondaryToolbarButton.spreadNone::before { | ||
content: url(images/secondaryToolbarButton-spreadNone.png); | ||
} | ||
|
||
.secondaryToolbarButton.spreadOdd::before { | ||
content: url(images/secondaryToolbarButton-spreadOdd.png); | ||
} | ||
|
||
.secondaryToolbarButton.spreadEven::before { | ||
content: url(images/secondaryToolbarButton-spreadEven.png); | ||
} | ||
|
||
.secondaryToolbarButton.documentProperties::before { | ||
content: url(images/secondaryToolbarButton-documentProperties.png); | ||
} | ||
|
@@ -1996,6 +2076,30 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { | |
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.scrollVertical::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.scrollHorizontal::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.scrollWrapped::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.spreadNone::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.spreadOdd::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.spreadEven::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
||
.secondaryToolbarButton.documentProperties::before { | ||
content: url(images/[email protected]); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.