mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 01:17:33 -04:00 
			
		
		
		
	Merge pull request #5833 from beganovich/v5-2605-repeating-designs
(v5) Improvements when using repeating designs
This commit is contained in:
		
						commit
						e846ff3a9c
					
				| @ -191,19 +191,6 @@ | ||||
|         font-size: 1.5rem; | ||||
|     } | ||||
| 
 | ||||
|     table.page-container { | ||||
|         page-break-after: always; | ||||
|         min-width: 100%; | ||||
|     } | ||||
| 
 | ||||
|     thead.page-header { | ||||
|         display: table-header-group; | ||||
|     } | ||||
| 
 | ||||
|     tfoot.page-footer { | ||||
|         display: table-footer-group; | ||||
|     } | ||||
| 
 | ||||
|     .footer-wrapper { | ||||
|         margin-top: 1rem; | ||||
|         background-color: #2d2c2a; | ||||
| @ -221,25 +208,91 @@ | ||||
|     [data-ref="total_table-footer"] { | ||||
|         padding-top: 0.5rem | ||||
|     } | ||||
| 
 | ||||
|     /** Repeating header & footer styling. */ | ||||
|     table { | ||||
|         width: 100%; | ||||
|     } | ||||
| 
 | ||||
|     table.print-content {} | ||||
| 
 | ||||
|     table.print-content th, | ||||
|     table.print-content td { | ||||
|         padding: .2rem .4rem; | ||||
|         text-align: left; | ||||
|         vertical-align: top; | ||||
|         border-top: 1px solid #dee2e6; | ||||
|     } | ||||
| 
 | ||||
|     @media print { | ||||
|         .print-footer { | ||||
|             position: fixed; | ||||
|             bottom: 0; | ||||
|             left: 0; | ||||
|         } | ||||
| 
 | ||||
|         .no-print { | ||||
|             display: none | ||||
|         } | ||||
|     } | ||||
| </style> | ||||
| 
 | ||||
| <table class="page-container"> | ||||
|     <thead class="page-header"> | ||||
| <table> | ||||
|     <!-- Start Header --> | ||||
|     <thead> | ||||
|     <tr> | ||||
|         <th class="page-header-cell"> | ||||
|         <td> | ||||
|             <div class="header-wrapper" id="header"> | ||||
|                 <img class="company-logo" src="$company.logo" alt="$company.name logo"/> | ||||
|                 <div id="company-details"></div> | ||||
|                 <div id="company-address"></div> | ||||
|             </div> | ||||
|         </th> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </thead> | ||||
| 
 | ||||
|     <tfoot class="page-footer"> | ||||
|     <!-- End Header --> | ||||
|     <tr> | ||||
|         <td class="page-footer-cell"> | ||||
|             <div class="footer-wrapper" id="footer"> | ||||
|         <td id="body"> | ||||
|             <div class="client-entity-wrapper"> | ||||
|                 <div class="client-wrapper-left-side"> | ||||
|                     <h4 class="entity-label">$entity_label</h4> | ||||
|                     <div id="client-details" cellspacing="0"></div> | ||||
|                 </div> | ||||
| 
 | ||||
|                 <div class="entity-details-wrapper-right-side"> | ||||
|                     <div class="entity-details-wrapper"> | ||||
|                         <table id="entity-details"></table> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
| 
 | ||||
|             <!-- Start Print Content --> | ||||
|             <table id="product-table" cellspacing="0" class="print-content"></table> | ||||
| 
 | ||||
|             <table id="task-table" cellspacing="0" class="print-content"></table> | ||||
| 
 | ||||
|             <table id="delivery-note-table" cellspacing="0" class="print-content"></table> | ||||
|             <!-- End Print Content --> | ||||
|         </td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td> | ||||
|             <div id="table-totals" cellspacing="0"></div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     <!-- Start Space For Footer --> | ||||
|     <tfoot> | ||||
|     <tr> | ||||
|         <td style="height: 180px"> | ||||
|             <!-- Leave this empty and don't remove it. This space is where footer placed on print. --> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tfoot> | ||||
|     <!-- End Space For Footer --> | ||||
| </table> | ||||
| 
 | ||||
| <!-- Start Footer --> | ||||
| <div class="footer-wrapper print-footer" id="footer"> | ||||
|     <div> | ||||
|         <p data-ref="total_table-footer">$entity_footer</p> | ||||
| 
 | ||||
| @ -257,34 +310,4 @@ | ||||
|     <div> <!-- #2 column --> </div> | ||||
|     <div> <!-- #3 column --> </div> | ||||
| </div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tfoot> | ||||
| 
 | ||||
|     <tbody class="page-content"> | ||||
|     <tr> | ||||
|         <td class="page-content-cell" id="body"> | ||||
|             <div class="client-entity-wrapper"> | ||||
|                 <div class="client-wrapper-left-side"> | ||||
|                     <h4 class="entity-label">$entity_label</h4> | ||||
|                     <div id="client-details" cellspacing="0"></div> | ||||
|                 </div> | ||||
| 
 | ||||
|                 <div class="entity-details-wrapper-right-side"> | ||||
|                     <div class="entity-details-wrapper"> | ||||
|                         <table id="entity-details"></table> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
| 
 | ||||
|             <table id="product-table" cellspacing="0"></table> | ||||
| 
 | ||||
|             <table id="task-table" cellspacing="0"></table> | ||||
| 
 | ||||
|             <table id="delivery-note-table" cellspacing="0"></table> | ||||
| 
 | ||||
|             <div id="table-totals" cellspacing="0"></div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tbody> | ||||
| </table> | ||||
| <!-- End Footer --> | ||||
|  | ||||
| @ -227,25 +227,87 @@ | ||||
|         margin-top: 2rem; | ||||
|         margin-bottom: 2rem | ||||
|     } | ||||
| 
 | ||||
|     /** Repeating header & footer styling. */ | ||||
|     table { | ||||
|         width: 100%; | ||||
|     } | ||||
| 
 | ||||
|     table.print-content {} | ||||
| 
 | ||||
|     table.print-content th, | ||||
|     table.print-content td { | ||||
|         padding: .2rem .4rem; | ||||
|         text-align: left; | ||||
|         vertical-align: top; | ||||
|         border-top: 1px solid #dee2e6; | ||||
|     } | ||||
| 
 | ||||
|     @media print { | ||||
|         .print-footer { | ||||
|             position: fixed; | ||||
|             bottom: 0; | ||||
|             left: 0; | ||||
|         } | ||||
| 
 | ||||
|         .no-print { | ||||
|             display: none | ||||
|         } | ||||
|     } | ||||
| </style> | ||||
| 
 | ||||
| <table class="page-container"> | ||||
|     <thead class="page-header"> | ||||
| <table> | ||||
|     <!-- Start Header --> | ||||
|     <thead> | ||||
|     <tr> | ||||
|         <th class="page-header-cell"> | ||||
|         <td> | ||||
|             <div class="header-container" id="header"> | ||||
|                 <h1 class="company-name">$company.name</h1> | ||||
|                 <table id="entity-details" cellspacing="0"></table> | ||||
|             </div> | ||||
|         </th> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </thead> | ||||
|     <tfoot class="page-footer"> | ||||
|     <!-- End Header --> | ||||
|     <tr> | ||||
|         <td class="page-footer-cell"> | ||||
|             <div class="footer-info"> | ||||
|                 <div style="margin-top: 195px"></div> | ||||
|                 <div class="footer-wrapper" id="footer"> | ||||
|         <td id="body"> | ||||
|             <div class="logo-client-wrapper"> | ||||
|                 <img | ||||
|                     class="company-logo" | ||||
|                     src="$company.logo" | ||||
|                     alt="$company.name logo" | ||||
|                 /> | ||||
| 
 | ||||
|                 <div id="client-details"></div> | ||||
|             </div> | ||||
| 
 | ||||
|             <!-- Start Print Content --> | ||||
|             <div class="table-wrapper"> | ||||
|                 <table id="product-table" cellspacing="0" class="print-content"></table> | ||||
|                 <table id="task-table" cellspacing="0" class="print-content"></table> | ||||
|                 <table id="delivery-note-table" cellspacing="0" class="print-content"></table> | ||||
|             </div> | ||||
|             <!-- End Print Content --> | ||||
|         </td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|         <td> | ||||
|             <div id="table-totals" cellspacing="0"></div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     <!-- Start Space For Footer --> | ||||
|     <tfoot> | ||||
|     <tr> | ||||
|         <td style="height: 230px"> | ||||
|             <!-- Leave this empty and don't remove it. This space is where footer placed on print --> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tfoot> | ||||
|     <!-- End Space For Footer --> | ||||
| </table> | ||||
| 
 | ||||
| <!-- Start Footer --> | ||||
| <div class="footer-wrapper print-footer" id="footer"> | ||||
|     <div class="footer-content"> | ||||
|         <div> | ||||
|             <p data-ref="total_table-footer">$entity_footer</p> | ||||
| @ -265,31 +327,4 @@ | ||||
|         <div id="company-address"></div> | ||||
|     </div> | ||||
| </div> | ||||
|             </div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tfoot> | ||||
|     <tbody class="page-content"> | ||||
|     <tr> | ||||
|         <td class="page-content-cell" id="body"> | ||||
|             <div class="logo-client-wrapper"> | ||||
|                 <img | ||||
|                     class="company-logo" | ||||
|                     src="$company.logo" | ||||
|                     alt="$company.name logo" | ||||
|                 /> | ||||
| 
 | ||||
|                 <div id="client-details"></div> | ||||
|             </div> | ||||
| 
 | ||||
|             <div class="table-wrapper"> | ||||
|                 <table id="product-table" cellspacing="0"></table> | ||||
|                 <table id="task-table" cellspacing="0"></table> | ||||
|                 <table id="delivery-note-table" cellspacing="0"></table> | ||||
|             </div> | ||||
| 
 | ||||
|             <div id="table-totals" cellspacing="0"></div> | ||||
|         </td> | ||||
|     </tr> | ||||
|     </tbody> | ||||
| </table> | ||||
| <!-- End Footer --> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user