Bug 1338092 - [Mortar] Remove de-scoped UI components for PDF viewer. f=lchang, r=evelyn

MozReview-Commit-ID: 7SpoAEssLF9

--HG--
extra : rebase_source : af1209e2ec6711dcc27906da98529e44babcf151
This commit is contained in:
Rex Lee 2017-02-09 19:05:19 +08:00
Родитель 397f7a4910
Коммит 7befa4db25
3 изменённых файлов: 5 добавлений и 298 удалений

Просмотреть файл

@ -32,8 +32,6 @@ zoom_in_label=Zoom In
zoom.title=Zoom zoom.title=Zoom
presentation_mode.title=Switch to Presentation Mode presentation_mode.title=Switch to Presentation Mode
presentation_mode_label=Presentation Mode presentation_mode_label=Presentation Mode
open_file.title=Open File
open_file_label=Open
print.title=Print print.title=Print
print_label=Print print_label=Print
download.title=Download download.title=Download
@ -57,37 +55,6 @@ page_rotate_ccw.title=Rotate Counterclockwise
page_rotate_ccw.label=Rotate Counterclockwise page_rotate_ccw.label=Rotate Counterclockwise
page_rotate_ccw_label=Rotate Counterclockwise page_rotate_ccw_label=Rotate Counterclockwise
hand_tool_enable.title=Enable hand tool
hand_tool_enable_label=Enable hand tool
hand_tool_disable.title=Disable hand tool
hand_tool_disable_label=Disable hand tool
# Document properties dialog box
document_properties.title=Document Properties…
document_properties_label=Document Properties…
document_properties_file_name=File name:
document_properties_file_size=File size:
# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
# will be replaced by the PDF file size in kilobytes, respectively in bytes.
document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
# LOCALIZATION NOTE (document_properties_mb): "{{size_mb}}" and "{{size_b}}"
# will be replaced by the PDF file size in megabytes, respectively in bytes.
document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
document_properties_title=Title:
document_properties_author=Author:
document_properties_subject=Subject:
document_properties_keywords=Keywords:
document_properties_creation_date=Creation Date:
document_properties_modification_date=Modification Date:
# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
# will be replaced by the creation/modification date, and time, of the PDF file.
document_properties_date_string={{date}}, {{time}}
document_properties_creator=Creator:
document_properties_producer=PDF Producer:
document_properties_version=PDF Version:
document_properties_page_count=Page Count:
document_properties_close=Close
# Tooltips and alt text for side panel toolbar buttons # Tooltips and alt text for side panel toolbar buttons
# (the _label strings are alt text for the buttons, the .title strings are # (the _label strings are alt text for the buttons, the .title strings are
# tooltips) # tooltips)
@ -95,21 +62,9 @@ toggle_sidebar.title=Toggle Sidebar
toggle_sidebar_label=Toggle Sidebar toggle_sidebar_label=Toggle Sidebar
outline.title=Show Document Outline outline.title=Show Document Outline
outline_label=Document Outline outline_label=Document Outline
attachments.title=Show Attachments
attachments_label=Attachments
thumbs.title=Show Thumbnails
thumbs_label=Thumbnails
findbar.title=Find in Document findbar.title=Find in Document
findbar_label=Find findbar_label=Find
# Thumbnails panel item (tooltip and alt text for images)
# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
# number.
thumb_page_title=Page {{page}}
# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
# number.
thumb_page_canvas=Thumbnail of Page {{page}}
# Find panel button title and messages # Find panel button title and messages
find_label=Find: find_label=Find:
find_previous.title=Find the previous occurrence of the phrase find_previous.title=Find the previous occurrence of the phrase

Просмотреть файл

@ -873,11 +873,6 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
content: url(images/toolbarButton-print.png); content: url(images/toolbarButton-print.png);
} }
.toolbarButton.openFile::before,
.secondaryToolbarButton.openFile::before {
content: url(images/toolbarButton-openFile.png);
}
.toolbarButton.download::before, .toolbarButton.download::before,
.secondaryToolbarButton.download::before { .secondaryToolbarButton.download::before {
content: url(images/toolbarButton-download.png); content: url(images/toolbarButton-download.png);
@ -903,11 +898,6 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
.secondaryToolbarButton.bookmark::before { .secondaryToolbarButton.bookmark::before {
content: url(images/toolbarButton-bookmark.png); content: url(images/toolbarButton-bookmark.png);
} }
#viewThumbnail.toolbarButton::before {
content: url(images/toolbarButton-viewThumbnail.png);
}
html[dir="ltr"] #viewOutline.toolbarButton::before { html[dir="ltr"] #viewOutline.toolbarButton::before {
content: url(images/toolbarButton-viewOutline.png); content: url(images/toolbarButton-viewOutline.png);
} }
@ -915,10 +905,6 @@ html[dir="rtl"] #viewOutline.toolbarButton::before {
content: url(images/toolbarButton-viewOutline-rtl.png); content: url(images/toolbarButton-viewOutline-rtl.png);
} }
#viewAttachments.toolbarButton::before {
content: url(images/toolbarButton-viewAttachments.png);
}
#viewFind.toolbarButton::before { #viewFind.toolbarButton::before {
content: url(images/toolbarButton-search.png); content: url(images/toolbarButton-search.png);
} }
@ -971,14 +957,6 @@ html[dir="rtl"] .secondaryToolbarButton > span {
content: url(images/secondaryToolbarButton-rotateCw.png); content: url(images/secondaryToolbarButton-rotateCw.png);
} }
.secondaryToolbarButton.handTool::before {
content: url(images/secondaryToolbarButton-handTool.png);
}
.secondaryToolbarButton.documentProperties::before {
content: url(images/secondaryToolbarButton-documentProperties.png);
}
.verticalToolbarSeparator { .verticalToolbarSeparator {
display: block; display: block;
padding: 8px 0; padding: 8px 0;
@ -1066,95 +1044,16 @@ html[dir='rtl'] .verticalToolbarSeparator {
cursor: default; cursor: default;
} }
#thumbnailView { #outlineView {
position: absolute;
width: 120px;
top: 0;
bottom: 0;
padding: 10px 40px 0;
overflow: auto;
}
.thumbnail {
float: left;
margin-bottom: 5px;
}
#thumbnailView > a:last-of-type > .thumbnail {
margin-bottom: 10px;
}
#thumbnailView > a:last-of-type > .thumbnail:not([data-loaded]) {
margin-bottom: 9px;
}
.thumbnail:not([data-loaded]) {
border: 1px dashed rgba(255, 255, 255, 0.5);
margin: -1px -1px 4px -1px;
}
.thumbnailImage {
border: 1px solid transparent;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.5), 0 2px 8px rgba(0, 0, 0, 0.3);
opacity: 0.8;
z-index: 99;
background-color: white;
background-clip: content-box;
}
.thumbnailSelectionRing {
border-radius: 2px;
padding: 7px;
}
a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
.thumbnail:hover > .thumbnailSelectionRing > .thumbnailImage {
opacity: .9;
}
a:focus > .thumbnail > .thumbnailSelectionRing,
.thumbnail:hover > .thumbnailSelectionRing {
background-color: hsla(0,0%,100%,.15);
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
0 0 1px hsla(0,0%,100%,.2) inset,
0 0 1px hsla(0,0%,0%,.2);
color: hsla(0,0%,100%,.9);
}
.thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
box-shadow: 0 0 0 1px hsla(0,0%,0%,.5);
opacity: 1;
}
.thumbnail.selected > .thumbnailSelectionRing {
background-color: hsla(0,0%,100%,.3);
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
0 0 1px hsla(0,0%,100%,.1) inset,
0 0 1px hsla(0,0%,0%,.2);
color: hsla(0,0%,100%,1);
}
#outlineView,
#attachmentsView {
position: absolute; position: absolute;
width: 192px; width: 192px;
top: 0; top: 0;
bottom: 0; bottom: 0;
padding: 4px 4px 0;
overflow: auto; overflow: auto;
-moz-user-select: none; -moz-user-select: none;
} }
#outlineView {
padding: 4px 4px 0;
}
#attachmentsView {
padding: 3px 4px 0;
}
html[dir='ltr'] .outlineWithDeepNesting > .outlineItem, html[dir='ltr'] .outlineWithDeepNesting > .outlineItem,
html[dir='ltr'] .outlineItem > .outlineItems { html[dir='ltr'] .outlineItem > .outlineItems {
margin-left: 20px; margin-left: 20px;
@ -1165,8 +1064,7 @@ html[dir='rtl'] .outlineItem > .outlineItems {
margin-right: 20px; margin-right: 20px;
} }
.outlineItem > a, .outlineItem > a {
.attachmentsItem > button {
text-decoration: none; text-decoration: none;
display: inline-block; display: inline-block;
min-width: 95%; min-width: 95%;
@ -1182,28 +1080,12 @@ html[dir='rtl'] .outlineItem > .outlineItems {
white-space: normal; white-space: normal;
} }
.attachmentsItem > button {
border: 0 none;
background: none;
cursor: pointer;
width: 100%;
}
html[dir='ltr'] .outlineItem > a { html[dir='ltr'] .outlineItem > a {
padding: 2px 0 5px 4px; padding: 2px 0 5px 4px;
} }
html[dir='ltr'] .attachmentsItem > button {
padding: 2px 0 3px 7px;
text-align: left;
}
html[dir='rtl'] .outlineItem > a { html[dir='rtl'] .outlineItem > a {
padding: 2px 4px 5px 0; padding: 2px 4px 5px 0;
} }
html[dir='rtl'] .attachmentsItem > button {
padding: 2px 7px 3px 0;
text-align: right;
}
.outlineItemToggler { .outlineItemToggler {
position: relative; position: relative;
@ -1241,8 +1123,7 @@ html[dir='rtl'] .outlineItemToggler::before {
.outlineItemToggler:hover, .outlineItemToggler:hover,
.outlineItemToggler:hover + a, .outlineItemToggler:hover + a,
.outlineItemToggler:hover ~ .outlineItems, .outlineItemToggler:hover ~ .outlineItems,
.outlineItem > a:hover, .outlineItem > a:hover {
.attachmentsItem > button:hover {
background-color: hsla(0,0%,100%,.02); background-color: hsla(0,0%,100%,.02);
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box; background-clip: padding-box;
@ -1387,44 +1268,10 @@ html[dir='rtl'] .outlineItemToggler::before {
width: 200px; width: 200px;
} }
#documentPropertiesOverlay > .dialog {
text-align: left;
}
#documentPropertiesOverlay .row > * {
min-width: 100px;
}
html[dir='ltr'] #documentPropertiesOverlay .row > * {
text-align: left;
}
html[dir='rtl'] #documentPropertiesOverlay .row > * {
text-align: right;
}
#documentPropertiesOverlay .row > span {
width: 125px;
word-wrap: break-word;
}
#documentPropertiesOverlay .row > p {
max-width: 225px;
word-wrap: break-word;
}
#documentPropertiesOverlay .buttonRow {
margin-top: 10px;
}
.clearBoth { .clearBoth {
clear: both; clear: both;
} }
.fileInput {
background: white;
color: black;
margin-top: 5px;
visibility: hidden;
position: fixed;
right: 0;
top: 0;
}
#PDFBug { #PDFBug {
background: none repeat scroll 0 0 white; background: none repeat scroll 0 0 white;
border: 1px solid #666666; border: 1px solid #666666;
@ -1599,11 +1446,6 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
content: url(images/toolbarButton-print@2x.png); content: url(images/toolbarButton-print@2x.png);
} }
.toolbarButton.openFile::before,
.secondaryToolbarButton.openFile::before {
content: url(images/toolbarButton-openFile@2x.png);
}
.toolbarButton.download::before, .toolbarButton.download::before,
.secondaryToolbarButton.download::before { .secondaryToolbarButton.download::before {
content: url(images/toolbarButton-download@2x.png); content: url(images/toolbarButton-download@2x.png);
@ -1614,10 +1456,6 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
content: url(images/toolbarButton-bookmark@2x.png); content: url(images/toolbarButton-bookmark@2x.png);
} }
#viewThumbnail.toolbarButton::before {
content: url(images/toolbarButton-viewThumbnail@2x.png);
}
html[dir="ltr"] #viewOutline.toolbarButton::before { html[dir="ltr"] #viewOutline.toolbarButton::before {
content: url(images/toolbarButton-viewOutline@2x.png); content: url(images/toolbarButton-viewOutline@2x.png);
} }
@ -1625,10 +1463,6 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
content: url(images/toolbarButton-viewOutline-rtl@2x.png); content: url(images/toolbarButton-viewOutline-rtl@2x.png);
} }
#viewAttachments.toolbarButton::before {
content: url(images/toolbarButton-viewAttachments@2x.png);
}
#viewFind.toolbarButton::before { #viewFind.toolbarButton::before {
content: url(images/toolbarButton-search@2x.png); content: url(images/toolbarButton-search@2x.png);
} }
@ -1649,14 +1483,6 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
content: url(images/secondaryToolbarButton-rotateCw@2x.png); content: url(images/secondaryToolbarButton-rotateCw@2x.png);
} }
.secondaryToolbarButton.handTool::before {
content: url(images/secondaryToolbarButton-handTool@2x.png);
}
.secondaryToolbarButton.documentProperties::before {
content: url(images/secondaryToolbarButton-documentProperties@2x.png);
}
.outlineItemToggler::before { .outlineItemToggler::before {
transform: scale(0.5); transform: scale(0.5);
top: -1px; top: -1px;

Просмотреть файл

@ -28,23 +28,13 @@
<div id="sidebarContainer"> <div id="sidebarContainer">
<div id="toolbarSidebar"> <div id="toolbarSidebar">
<div class="splitToolbarButton toggled"> <div class="splitToolbarButton toggled">
<button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
<span data-l10n-id="thumbs_label">Thumbnails</span>
</button>
<button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3" data-l10n-id="outline"> <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3" data-l10n-id="outline">
<span data-l10n-id="outline_label">Document Outline</span> <span data-l10n-id="outline_label">Document Outline</span>
</button> </button>
<button id="viewAttachments" class="toolbarButton group" title="Show Attachments" tabindex="4" data-l10n-id="attachments">
<span data-l10n-id="attachments_label">Attachments</span>
</button>
</div> </div>
</div> </div>
<div id="sidebarContent"> <div id="sidebarContent">
<div id="thumbnailView"> <div id="outlineView">
</div>
<div id="outlineView" class="hidden">
</div>
<div id="attachmentsView" class="hidden">
</div> </div>
</div> </div>
</div> <!-- sidebarContainer --> </div> <!-- sidebarContainer -->
@ -76,10 +66,6 @@
<span data-l10n-id="presentation_mode_label">Presentation Mode</span> <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
</button> </button>
<button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
<span data-l10n-id="open_file_label">Open</span>
</button>
<button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print"> <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
<span data-l10n-id="print_label">Print</span> <span data-l10n-id="print_label">Print</span>
</button> </button>
@ -110,17 +96,6 @@
<span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span> <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
</button> </button>
<div class="horizontalToolbarSeparator"></div>
<button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="60" data-l10n-id="hand_tool_enable">
<span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
</button>
<div class="horizontalToolbarSeparator"></div>
<button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="61" data-l10n-id="document_properties">
<span data-l10n-id="document_properties_label">Document Properties…</span>
</button>
</div> </div>
</div> <!-- secondaryToolbar --> </div> <!-- secondaryToolbar -->
@ -153,10 +128,6 @@
<span data-l10n-id="presentation_mode_label">Presentation Mode</span> <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
</button> </button>
<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
<span data-l10n-id="open_file_label">Open</span>
</button>
<button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print"> <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
<span data-l10n-id="print_label">Print</span> <span data-l10n-id="print_label">Print</span>
</button> </button>
@ -259,51 +230,6 @@
</div> </div>
</div> </div>
</div> </div>
<div id="documentPropertiesOverlay" class="container hidden">
<div class="dialog">
<div class="row">
<span data-l10n-id="document_properties_file_name">File name:</span> <p id="fileNameField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_file_size">File size:</span> <p id="fileSizeField">-</p>
</div>
<div class="separator"></div>
<div class="row">
<span data-l10n-id="document_properties_title">Title:</span> <p id="titleField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_author">Author:</span> <p id="authorField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_subject">Subject:</span> <p id="subjectField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_keywords">Keywords:</span> <p id="keywordsField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_creation_date">Creation Date:</span> <p id="creationDateField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_modification_date">Modification Date:</span> <p id="modificationDateField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_creator">Creator:</span> <p id="creatorField">-</p>
</div>
<div class="separator"></div>
<div class="row">
<span data-l10n-id="document_properties_producer">PDF Producer:</span> <p id="producerField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_version">PDF Version:</span> <p id="versionField">-</p>
</div>
<div class="row">
<span data-l10n-id="document_properties_page_count">Page Count:</span> <p id="pageCountField">-</p>
</div>
<div class="buttonRow">
<button id="documentPropertiesClose" class="overlayButton"><span data-l10n-id="document_properties_close">Close</span></button>
</div>
</div>
</div>
</div> <!-- overlayContainer --> </div> <!-- overlayContainer -->
</div> <!-- outerContainer --> </div> <!-- outerContainer -->