Merge branch 'develop' into develop-bootstrap

1 files changed, 32 insertions, 3 deletions

diff --git a/ishtar_common/static/media/style_basic.css b/ishtar_common/static/media/style_basic.css
index 1d92928dc..d0f5bbe4a 100644
--- a/ishtar_common/static/media/style_basic.css
+++ b/ishtar_common/static/media/style_basic.css
@@ -1,7 +1,8 @@
 @page {
   size: a4 portrait;
-  margin: 2.5cm 1cm 2.5cm 1cm;
+  margin: 2cm 1cm 2.5cm 1cm;
   background-image: url("images/ishtar-bg.jpg");
+  background-repeat: no-repeat;
   @frame footer {
     -pdf-frame-content: pdffooter;
     bottom: 1cm;
@@ -16,6 +17,9 @@
     margin-right: 1cm;
     height: 1.5cm;
   }
+  @bottom-center {
+      content: counter(page) "/" counter(pages);
+  }
 }
 
 label{
@@ -36,6 +40,13 @@ caption, h3{
     font-size:1.5em;
 }
 
+a img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    padding:0.5em;
+}
+
 th{
     text-align:center;
     border-bottom:2px solid #922;
@@ -72,10 +83,21 @@ td{
     display:none;
 }
 
+caption, hr, .tool-left, .tool-right, .display_details, .display_details_inline{
+    display: None;
+    color: transparent;
+    background-color: transparent;
+    border-color: transparent;
+}
+
 p{
     margin:0.2em;
 }
 
+td{
+    background-color: #ddd;
+}
+
 #pdffooter, #pdfheader{
     text-align:center;
 }
@@ -84,8 +106,15 @@ p{
     font-weight:bold;
     width:100%;
     border-bottom:1px solid #922;
+    position: fixed;
+    top: -0.5cm;
 }
 
-.display_details, .display_details_inline{
-    display: none;
+.window-refs{
+    text-align:center;
+    padding:0;
+    margin:0;
+    font-size: 0.9em;
+    width:100%;
+    display:block;
 }