Merge branch 'feature/swvMaaktSopSchool' into develop

# Conflicts: # application/views/monpas/modals/school_modal.php
2022-11-07 14:06:23 +01:00
parent a44e4c5611 e07c6555a5
commit 9ee3c86265
7 changed files with 72 additions and 37 deletions
@@ -1,3 +0,0 @@
-een <img   src="http://app.monpas.nl/images/logos/frameworklogo.png" 
-            style=" height:20px"/>
-product
@@ -2,7 +2,7 @@
    <title>Compact Sop</title>   
 </head>

-<div style="width: 59%;  
+<div style="width: 59%;
            float:left;
            padding-left: 10px;
            margin-bottom:-10px">
@@ -24,7 +24,10 @@
 </div>

 <div style=" width: 39%; float :right;margin-bottom:-10px;padding-right:5px ">
-    <img    src="<?=$logoschool?>" 
-            style="float: right; height:60px"/>
-   
+
+    <img    src="<?=$logoframework?>"
+            style=" float: right; height:20px;  "/>
+    <img    src="<?=$logoschool?>"
+            style="float: right; height:60px;  padding-right: 10px;"/>
+
 </div>
@@ -109,7 +109,7 @@


            <div class="modal-footer">
-                <button class="btn btn-small buttonCompact"
+                <button class="btn btn-small buttonCompacte" style="margin-top: 3px;"
                        data-dismiss="modal">sluiten
                </button>
            </div> <!-- footer -->