样式更新

app/public/netcasign/ui/css/common.css

@@ -6,8 +6,8 @@
 }
 
 .openfile,.verification,.about,.fullscreen,.sign,.zoomIn,.zoomOut{
-    width:45px;
-    height:60px;
+    width:30px;
+    height:45px;
 }
 .pageUp,.pageDown{
     width:45px;
@@ -20,14 +20,14 @@
 }
 #pageNumber,#numPages,#scaleSelectContainer{
     margin-top:20px;
-    color:#000;
+    color: #6c757d;
 }
 #scaleSelect,#scaleSelectContainer{
-    min-width: 82px!important;
+    min-width: 60px!important;
 }
 #pageNumber{
-    margin-left:20px;
-    background:#fff;
+    /*margin-left:20px;*/
+    /*background:#fff;*/
 }
 #toolbarViewer,#toolbarContainer{
     height:45px;
@@ -73,12 +73,13 @@ html[dir='ltr'] .splitToolbarButton
     margin:0;
 }
 input#pageNumber.toolbarField.pageNumber{
-    height:24px;
-    line-height:24px;
+    height:14px;
+    line-height:14px;
     margin-top:7px;
-    margin-left:20px;
+    /*margin-left:20px;*/
     border: 1px solid #bbb;
     border-radius: 4px;
+    width: 20px;
 }
 span#numPages.toolbarLabel{
     height:24px;
@@ -89,12 +90,12 @@ span#scaleSelectContainer.dropdownToolbarButton{
     height:30px;
     line-height:20px;
     margin-top:7px;
-    margin-left:20px;
-    border: 1px solid #bbb;
+    /*margin-left:20px;*/
+    /*border: 1px solid #bbb;*/
     border-radius: 4px;
 }
 span#scaleSelectContainer.dropdownToolbarButton select{
-    height: 30px;
+    /*height: 30px;*/
 }
 #previous,#next{
     width:59px;
@@ -123,6 +124,11 @@ div#findbar.findbar.doorHanger{
 }
 #scaleSelect{
     padding-bottom:0;
+    color: #6c757d;
+    background-color: #f2f2f2;
+    border-radius: 4px;
+    border: 1px solid #bbb;
+    font-size: 14px;
 }
 #NetcaReaderAxTable tr td{
     padding:10px;

app/public/netcasign/ui/css/netcasignpdf.css

@@ -1098,8 +1098,8 @@ html[dir='rtl'] .splitToolbarButtonSeparator {
   padding: 2px 6px 0;
   /*border: 1px solid transparent;*/
   border-radius: 2px;
-  color: hsla(0,0%,100%,.8);
-  font-size: 12px;
+  /*color: hsla(0,0%,100%,.8);*/
+  font-size: 20px;
   line-height: 14px;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -1247,7 +1247,7 @@ html[dir='ltr'] .splitToolbarButton:first-child,
 html[dir='ltr'] .toolbarButton:first-child,
 html[dir='rtl'] .splitToolbarButton:last-child,
 html[dir='rtl'] .toolbarButton:last-child {
-  margin-left: 45px;
+  /*margin-left: 45px;*/
 }
 html[dir='ltr'] .splitToolbarButton:last-child,
 html[dir='ltr'] .toolbarButton:last-child,
@@ -1557,9 +1557,9 @@ html[dir='rtl'] .verticalToolbarSeparator {
 
 .toolbarField.pageNumber {
   -moz-appearance: textfield; /* hides the spinner in moz */
-  min-width: 16px;
+  /*min-width: 16px;*/
   text-align: right;
-  width: 40px;
+  /*width: 40px;*/
 }
 
 .toolbarField.pageNumber.visiblePageIsLoading {

app/view/report/archive_pdf.ejs

@@ -157,23 +157,15 @@
         <div class="toolbar">
             <div id="toolbarContainer">
                 <div id="toolbarViewer">
-                    <div id="toolbarViewerLeft">
-                        <div class="toolbarButton file-box pfxFile hidden" id="openFile">
-                            <input type="file" name="fileField" class="file">
-                            <button class="openFile hiddenLargeView sign">
-                                <img src="/public/netcasign/ui/images/icon/but_new.png" alt="" /></br>打开</button>
-                        </div>
-                        <button id="closeFile" class="toolbarButton netca_btn28 hidden">
-                            <img src="/public/netcasign/ui/images/icon/but_close.png" alt="" /></br>关闭</button>
-                        <button id="print" class="toolbarButton hiddenLargeView sign netca_btn22 hidden">
-                            <img src="/public/netcasign/ui/images/icon/but_print.png" alt="" /></br>打印</button>
-                        <button id="viewFind" class="toolbarButton openfile netca_btn3 hidden">
-                            <img src="/public/netcasign/ui/images/icon/but_search.png" alt="" /></br>搜索</button>
-                        <button id="zoomIn" class="toolbarButton zoomIn netca_btn4">
-                            <img width="40%" src="/public/netcasign/ui/images/icon/but_enlarge.png" alt="" /></br>放大</button>
-                        <button id="zoomOut" class="toolbarButton zoomOut netca_btn5">
-                            <img width="40%" src="/public/netcasign/ui/images/icon/but_narrow.png" alt="" /></br>缩小</button>
-                        <span id="scaleSelectContainer" class="dropdownToolbarButton netca_btn6">
+                    <div style="width: 100%;text-align: center;color: #6c757d;">
+                        <span id="netcapage" class="netca_btn10">
+                            <input type="number" id="pageNumber" class="toolbarField pageNumber" title="Page" value="1" size="4" min="1" tabindex="15" data-l10n-id="page">
+                            <span id="numPages" class="toolbarLabel"></span>
+                        </span>
+                        <span style="border-left: 1px solid #e4e7ea;"></span>
+                            <button id="zoomOut" class="toolbarButton zoomOut netca_btn5" style="cursor: pointer;color: #6c757d;">
+                                -</button>
+                            <span id="scaleSelectContainer" class="netca_btn6">
                     <select id="scaleSelect" title="Zoom" tabindex="23" data-l10n-id="zoom">
                       <option id="customScaleOption" title="" value="custom" disabled="disabled" hidden="true"></option>
                       <option title="" value="0.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 50 }'>50%</option>
@@ -186,18 +178,56 @@
                       <option title="" value="4" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 400 }'>400%</option>
                     </select>
                   </span>
-                    </div>
-                    <div id="toolbarViewerMiddle">
-                        <div class="splitToolbarButton">
+                            <button id="zoomIn" class="toolbarButton zoomIn netca_btn4" style="cursor: pointer;color: #6c757d;">
+                                +</button>
+                        <div class="splitToolbarButton hidden">
                             <button class="toolbarButton pageUp netca_btn8" id="previous">
                                 <img width="40%" src="/public/netcasign/ui/images/icon/but_pre.png" alt="" /></br>上一页</button>
                             <button class="toolbarButton pageDown netca_btn9"  id="next">
                                 <img width="40%" src="/public/netcasign/ui/images/icon/but_next.png" alt="" /></br>下一页</button>
                         </div>
-                        <div id="netcapage" class="netca_btn10">
-                            <input type="number" id="pageNumber" class="toolbarField pageNumber" title="Page" value="1" size="4" min="1" tabindex="15" data-l10n-id="page">
-                            <span id="numPages" class="toolbarLabel"></span>
+                    </div>
+                    <div id="toolbarViewerLeft">
+                        <div class="toolbarButton file-box pfxFile hidden" id="openFile">
+                            <input type="file" name="fileField" class="file">
+                            <button class="openFile hiddenLargeView sign">
+                                <img src="/public/netcasign/ui/images/icon/but_new.png" alt="" /></br>打开</button>
                         </div>
+                        <button id="closeFile" class="toolbarButton netca_btn28 hidden">
+                            <img src="/public/netcasign/ui/images/icon/but_close.png" alt="" /></br>关闭</button>
+                        <button id="print" class="toolbarButton hiddenLargeView sign netca_btn22 hidden">
+                            <img src="/public/netcasign/ui/images/icon/but_print.png" alt="" /></br>打印</button>
+                        <button id="viewFind" class="toolbarButton openfile netca_btn3 hidden">
+                            <img src="/public/netcasign/ui/images/icon/but_search.png" alt="" /></br>搜索</button>
+                        <!--<button id="zoomIn" class="toolbarButton zoomIn netca_btn4">-->
+                            <!--<img width="40%" src="/public/netcasign/ui/images/icon/but_enlarge.png" alt="" /></br>放大</button>-->
+                        <!--<button id="zoomOut" class="toolbarButton zoomOut netca_btn5">-->
+                            <!--<img width="40%" src="/public/netcasign/ui/images/icon/but_narrow.png" alt="" /></br>缩小</button>-->
+                        <!--<span id="scaleSelectContainer" class="dropdownToolbarButton netca_btn6">-->
+                    <!--<select id="scaleSelect" title="Zoom" tabindex="23" data-l10n-id="zoom">-->
+                      <!--<option id="customScaleOption" title="" value="custom" disabled="disabled" hidden="true"></option>-->
+                      <!--<option title="" value="0.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 50 }'>50%</option>-->
+                      <!--<option title="" value="0.75" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 75 }'>75%</option>-->
+                      <!--<option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }'>100%</option>-->
+                      <!--<option title="" value="1.25" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 125 }'>125%</option>-->
+                      <!--<option title="" value="1.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 150 }'>150%</option>-->
+                      <!--<option title="" value="2" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 200 }'>200%</option>-->
+                      <!--<option title="" value="3" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 300 }'>300%</option>-->
+                      <!--<option title="" value="4" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 400 }'>400%</option>-->
+                    <!--</select>-->
+                  <!--</span>-->
+                    </div>
+                    <div id="toolbarViewerMiddle">
+                        <!--<div class="splitToolbarButton hidden">-->
+                            <!--<button class="toolbarButton pageUp netca_btn8" id="previous">-->
+                                <!--<img width="40%" src="/public/netcasign/ui/images/icon/but_pre.png" alt="" /></br>上一页</button>-->
+                            <!--<button class="toolbarButton pageDown netca_btn9"  id="next">-->
+                                <!--<img width="40%" src="/public/netcasign/ui/images/icon/but_next.png" alt="" /></br>下一页</button>-->
+                        <!--</div>-->
+                        <!--<div id="netcapage" class="netca_btn10">-->
+                            <!--<input type="number" id="pageNumber" class="toolbarField pageNumber" title="Page" value="1" size="4" min="1" tabindex="15" data-l10n-id="page">-->
+                            <!--<span id="numPages" class="toolbarLabel"></span>-->
+                        <!--</div>-->
                     </div>
                     <div id="toolbarViewerRight">
                         <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView fullscreen hidden">