Commit 067a1f9eb6ed08bacde4ab24b25cfaaad68a74e9
Merge branch 'printPriviewIssueIPAD' into QA-IPAD-MAC
Showing
2 changed files
with
19 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/Home/printPreview.html
@@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
43 | </div> | 43 | </div> |
44 | </div> | 44 | </div> |
45 | <div class=" mar-top-25" align="center" id="dvPortrait" style="text-align: center;"> | 45 | <div class=" mar-top-25" align="center" id="dvPortrait" style="text-align: center;"> |
46 | - <img src="" alt="" class="logo-image" id="imgPortrait" style="width: 100%; " /> | 46 | + <img src="" alt="" class="logo-image img-responsive" id="imgPortrait" style="width: 100%; " /> |
47 | </div> | 47 | </div> |
48 | <div> | 48 | <div> |
49 | <div class="pp-col-sm-4" style="position: absolute; bottom: 20px;"> | 49 | <div class="pp-col-sm-4" style="position: absolute; bottom: 20px;"> |
@@ -67,8 +67,8 @@ | @@ -67,8 +67,8 @@ | ||
67 | <span class="pull-right font12 span-font" id="spnBodyViewTitleLan"></span> | 67 | <span class="pull-right font12 span-font" id="spnBodyViewTitleLan"></span> |
68 | </div> | 68 | </div> |
69 | </div> | 69 | </div> |
70 | - <div class="" id="dvLandscape" align="center" style="position: absolute; margin-top: 13%;"> | ||
71 | - <img src="" alt="" class="logo-image" id="imgLandscape" style="width: 100%;" /> | 70 | + <div class="" id="dvLandscape" align="center"> |
71 | + <img src="" alt="" class="logo-image img-responsive" id="imgLandscape" style="width: 100%;" /> | ||
72 | </div> | 72 | </div> |
73 | <div class="print-footer-land"> | 73 | <div class="print-footer-land"> |
74 | <div class="pp-col-sm-4" style="position: absolute; bottom: 20px; left: 10px;"> | 74 | <div class="pp-col-sm-4" style="position: absolute; bottom: 20px; left: 10px;"> |
400-SOURCECODE/AIAHTML5.Web/content/css/print-main.css
@@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
10 | padding: 0px !important; | 10 | padding: 0px !important; |
11 | } | 11 | } |
12 | 12 | ||
13 | - #dvPortrait { margin-top:42%;} | ||
14 | - | 13 | + |
14 | +#dvPortrait, #dvLandscape { /*margin-top:42%;*/ position:absolute; top:20%;left:0;} | ||
15 | .pp-col-sm-4 .print-col-sm-4{ | 15 | .pp-col-sm-4 .print-col-sm-4{ |
16 | padding-left: 0px !important; | 16 | padding-left: 0px !important; |
17 | padding-right: 0px !important; | 17 | padding-right: 0px !important; |
@@ -57,3 +57,17 @@ | @@ -57,3 +57,17 @@ | ||
57 | width:100%; | 57 | width:100%; |
58 | height:100%; | 58 | height:100%; |
59 | } | 59 | } |
60 | + | ||
61 | + | ||
62 | +@media (min-width: 768px) and (max-width:1024px) { | ||
63 | + | ||
64 | +#dvPortrait, #dvLandscape { | ||
65 | + position:inherit; | ||
66 | + margin-top: 5%; | ||
67 | + margin-bottom:8%; | ||
68 | +} | ||
69 | + | ||
70 | +.portrait-box, .landscape-box{height:auto !important;} | ||
71 | + | ||
72 | + } | ||
73 | + | ||
60 | \ No newline at end of file | 74 | \ No newline at end of file |