Merge remote-tracking branch 'upstream/new-ui' into new-ui
This commit is contained in:
commit
a23eda3f4b
@ -213,12 +213,20 @@ body {
|
||||
}
|
||||
|
||||
.dropdownToolbarButton {
|
||||
min-width: 124px;
|
||||
min-width: 100px;
|
||||
max-width: 100px;
|
||||
overflow: hidden;
|
||||
background: url(images/toolbarButton-menuArrows.png) no-repeat 95%;
|
||||
}
|
||||
.dropdownToolbarButton::after {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
content: url(images/toolbarButton-menuArrows.png);
|
||||
|
||||
.dropdownToolbarButton select {
|
||||
min-width: 120px;
|
||||
font-size: 12px;
|
||||
color: hsl(0,0%,95%);
|
||||
margin:0;
|
||||
padding:0;
|
||||
border:none;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.splitToolbarButton:first-child,
|
||||
@ -589,3 +597,35 @@ canvas {
|
||||
border-bottom: 1px solid #000000;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
#errorWrapper {
|
||||
background: none repeat scroll 0 0 #FF5555;
|
||||
color: white;
|
||||
left: 0;
|
||||
position: fixed;
|
||||
right: 0;
|
||||
top: 30px;
|
||||
z-index: 1000;
|
||||
padding: 3px;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
#errorMessageLeft {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#errorMessageRight {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#errorMoreInfo {
|
||||
background-color: #FFFFFF;
|
||||
color: black;
|
||||
padding: 3px;
|
||||
margin: 3px;
|
||||
width: 98%;
|
||||
}
|
||||
|
||||
.clearBoth {
|
||||
clear: both;
|
||||
}
|
||||
|
@ -65,7 +65,21 @@
|
||||
<div class="splitToolbarButtonSeparator"></div>
|
||||
<div class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();"></div>
|
||||
</div>
|
||||
<div class="dropdownToolbarButton">Auto</div>
|
||||
<div class="dropdownToolbarButton">
|
||||
<select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">
|
||||
<option id="customScaleOption" value="custom"></option>
|
||||
<option value="0.5">50%</option>
|
||||
<option value="0.75">75%</option>
|
||||
<option value="1">100%</option>
|
||||
<option value="1.25">125%</option>
|
||||
<option value="1.5">150%</option>
|
||||
<option value="2">200%</option>
|
||||
<option id="pageWidthOption" value="page-width">Page Width</option>
|
||||
<option id="pageFitOption" value="page-fit">Page Fit</option>
|
||||
<option id="pageAutoOption" value="auto" selected="selected">Auto</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="toolbarButtonFlexibleSpacer"></div>
|
||||
<div class="toolbarButton print" title="Print"></div>
|
||||
<div class="toolbarButton download" title="Download"></div>
|
||||
@ -94,6 +108,25 @@
|
||||
|
||||
</div> <!-- outerContainer -->
|
||||
|
||||
<div id="errorWrapper" hidden='true'>
|
||||
<div id="errorMessageLeft">
|
||||
<span id="errorMessage"></span>
|
||||
<button id="errorShowMore" onclick="" oncontextmenu="return false;">
|
||||
More Information
|
||||
</button>
|
||||
<button id="errorShowLess" onclick="" oncontextmenu="return false;" hidden='true'>
|
||||
Less Information
|
||||
</button>
|
||||
</div>
|
||||
<div id="errorMessageRight">
|
||||
<button id="errorClose" oncontextmenu="return false;">
|
||||
Close
|
||||
</button>
|
||||
</div>
|
||||
<div class="clearBoth"></div>
|
||||
<textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -131,7 +164,7 @@
|
||||
-->
|
||||
<div class="separator"></div>
|
||||
|
||||
<select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">
|
||||
<!-- <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">
|
||||
<option id="customScaleOption" value="custom"></option>
|
||||
<option value="0.5">50%</option>
|
||||
<option value="0.75">75%</option>
|
||||
@ -143,7 +176,7 @@
|
||||
<option id="pageFitOption" value="page-fit">Page Fit</option>
|
||||
<option id="pageAutoOption" value="auto" selected="selected">Auto</option>
|
||||
</select>
|
||||
|
||||
-->
|
||||
<div class="separator"></div>
|
||||
|
||||
<button id="print" onclick="window.print();" oncontextmenu="return false;">
|
||||
@ -167,7 +200,7 @@
|
||||
</a>
|
||||
|
||||
</div>
|
||||
<div id="errorWrapper" hidden='true'>
|
||||
<!-- <div id="errorWrapper" hidden='true'>
|
||||
<div id="errorMessageLeft">
|
||||
<span id="errorMessage"></span>
|
||||
<button id="errorShowMore" onclick="" oncontextmenu="return false;">
|
||||
@ -185,7 +218,7 @@
|
||||
<div class="clearBoth"></div>
|
||||
<textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
|
||||
</div>
|
||||
|
||||
-->
|
||||
<!-- <div id="sidebar">
|
||||
<div id="sidebarBox">
|
||||
<div id="pinIcon" onClick="PDFView.pinSidebar()"></div>
|
||||
|
Loading…
Reference in New Issue
Block a user