瀏覽代碼

style fixes for CMF licence

Olivier Massot 9 月之前
父節點
當前提交
1a88782387

二進制
public/fonts/CaviarDreams/CaviarDreams.ttf


二進制
public/fonts/CaviarDreams/CaviarDreams_Bold.ttf


二進制
public/fonts/CaviarDreams/CaviarDreams_BoldItalic.ttf


二進制
public/fonts/CaviarDreams/CaviarDreams_Italic.ttf


+ 42 - 20
templates/export/licence_cmf.html.twig

@@ -10,6 +10,19 @@
     <style media="all">
 
         {% block style %}
+        @font-face {
+            font-family: 'CaviarDreams';
+            src: url('/fonts/CaviarDreams/CaviarDreams.ttf') format('truetype');
+            font-weight: normal;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'CaviarDreams';
+            src: url('/fonts/CaviarDreams/CaviarDreams_Bold.ttf') format('truetype');
+            font-weight: bold;
+            font-style: normal;
+        }
+
         html {
             word-wrap: break-word;
         }
@@ -22,47 +35,47 @@
         }
 
         .Style1 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
             font-weight: bold;
             color: #FFFFFF;
         }
 
         .Style2 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-size: 12px;
-            font-weight: 600;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
+            font-size: 10px;
+            font-weight: bold;
         }
 
         .Style3 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 8px;
             color: #FFFFFF;
             vertical-align: text-top;
         }
 
         .Style4 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
-            font-size: 9px;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
+            font-size: 8px;
         }
 
         .Style5 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 10px;
         }
 
         .Style7 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 16px;
         }
 
         .Style8 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
         }
 
         .Style9 {
-            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-family: CaviarDreams, Verdana, Arial, Helvetica, sans-serif;
             font-size: 12px;
             font-weight: bold;
         }
@@ -87,7 +100,7 @@
 
         #year_card {
             position: absolute;
-            bottom: 46px;
+            bottom: 52px;
             left: 52px;
             color: #9d1348;
             font-size: 14px;
@@ -99,6 +112,15 @@
             padding: 0;
         }
 
+        .Style2 p {
+            line-height: 10px;
+            max-width: 220px;
+        }
+
+        .Style4 p {
+            line-height: 9px;
+        }
+
         .page_break {
             page-break-before: always;
             top: 0 !important;
@@ -243,18 +265,18 @@
                         </tr>
                         <tr class="up">
                             {% if licence.isOrganizationLicence %}
-                                <td height="78" width="78" id="avatar">
+                                <td height="62" width="62" id="avatar">
                                     <div align="center">
                                         {% if(licence.logo is null) %}
                                             <img src="{{ 'images/picto_face.png' }}"
-                                                 height="78"/>
+                                                 height="62"/>
                                         {% else %}
                                             <img src="{{ fileImagePath(licence.logo, 'sm') }}"
-                                                 height="78"/>
+                                                 height="62"/>
                                         {% endif %}
                                     </div>
                                 </td>
-                                <td colspan="2">
+                                <td height="72" colspan="2">
                                     <span class="Style2">
                                         <p>{{ licence.personLastName }} {{ licence.personFirstName }}</p>
                                         <p>{{ licence.organizationName }}</p>
@@ -264,12 +286,12 @@
                                     </span>
                                 </td>
                             {% else %}
-                                <td height="78" width="78" id="avatar">
+                                <td height="62" width="62" id="avatar">
                                     <div align="center">
                                         {% if(licence.personAvatar is null) %}
                                             <img
                                                     src="{{ 'images/picto_face.png' }}"
-                                                    height="80"/>
+                                                    height="62"/>
                                         {% else %}
                                             <img class="avatar"
                                                  src="{{ fileImagePath(licence.personAvatar, 'sm') }}"/>
@@ -289,7 +311,7 @@
                         </tr>
 
                         <tr class="top">
-                            <td height="30" width="60" valign="middle"
+                            <td height="54" width="84" valign="middle"
                                 style="vertical-align: bottom;">
                                 <div align="center">
                                     <img src="{{ 'images/cmf_licence.png' }}"
@@ -319,7 +341,7 @@
 
                         <tr>
                             <td height="22" colspan="3" align="center" bgcolor="{{ licence.color }}">
-                                <span class="Style3">CMF ● cmf@cmf-musique.org ● 01 55 58 22 82 ● www.cmf-musique.org</span>
+                                <span class="Style3">CMF - cmf@cmf-musique.org - 01 55 58 22 82 - www.cmf-musique.org</span>
                             </td>
                         </tr>
                     </tbody>