Done #2047 @0.5

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 7e0a836e067373439d1832ca47d7bb8d33e583d1..c79167755cbeeada857402e58bedd8b00c3450be 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -18,29 +18,29 @@ $f = $this->options['footer'];
                                        <span class="heading"><?php echo $f['adresse']['titre'] ?></span>\r
                                        <p><?php echo nl2br($f['adresse']['contenu']) ?></p>\r
                                </div>\r
-                               <div class="box information">\r
-                                       <span class="heading"><?php echo $f['urgences']['titre'] ?></span>\r
-                                       <p><?php echo nl2br($f['urgences']['contenu']) ?></p>\r
-                               </div>\r
                        </div>\r
                        <div class="info-area timing">\r
                                <div class="note"><p><?php echo nl2br($f['horaires']) ?></p></div>\r
-\r
-                               <?php\r
-                               $items = array();\r
-                               foreach ($f['logos'] as $logo) {\r
-                                       $image = $this->imageCms($logo['logo'], $logo['nom'], -1, -1);\r
-                                       if ($logo['url'] == '') {\r
-                                               $item = $image;\r
-                                       } else {\r
-                                               $item = $this->link($image, $logo['url']);\r
-                                       }\r
-                                       $items[] = $item;\r
-                               }\r
-                               echo $this->listUnordered($items, array('class' => 'logos'));\r
-                               ?>\r
-\r
+                <div class="box information">\r
+                    <span class="heading"><?php echo $f['urgences']['titre'] ?></span>\r
+                    <p><?php echo nl2br($f['urgences']['contenu']) ?></p>\r
+                </div>\r
                        </div>\r
+            <div class="partner-logos">\r
+                <?php\r
+                $items = array();\r
+                foreach ($f['logos'] as $logo) {\r
+                    $image = $this->imageCms($logo['logo'], $logo['nom'], -1, -1);\r
+                    if ($logo['url'] == '') {\r
+                        $item = $image;\r
+                    } else {\r
+                        $item = $this->link($image, $logo['url']);\r
+                    }\r
+                    $items[] = $item;\r
+                }\r
+                echo $this->listUnordered($items, array('class' => 'logos'));\r
+                ?>\r
+            </div>\r
                </div>\r
        </div>\r
        <div class="info">\r
@@ -51,4 +51,4 @@ $f = $this->options['footer'];
                echo $this->navigation()->separatedlist()->renderList($footer, ' - ');\r
                ?>\r
        </div>\r
-</footer>
\ No newline at end of file
+</footer>\r

diff --git a/less/common.less b/less/common.less
index c1783d2694f6edc6fabdd9f6b28b9ad47ac01123..20f8ad5514a222658fb21c8f767b9eed8138833d 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -232,7 +232,7 @@ q:after {
 }
 
 .nav {
-       float: left;
+       display: inline-block;
        width: 197px;
 }
 
@@ -262,7 +262,7 @@ q:after {
 }
 
 .info-area {
-       float: left;
+       display: inline-block;
        margin: 13px 0 0 42px;
        width: 389px;
 }
@@ -275,6 +275,7 @@ q:after {
 
 .info-area .box.information {
        background-image: url("/images/exclamation.svg");
+       margin-left: 53px;
 }
 
 .info-area ul {
@@ -420,9 +421,9 @@ q:after {
 }
 
 #footer .timing.info-area {
-       float: left;
-       margin: 12px 0 0 -17px;
-       width: 368px;
+       display: inline-block;
+       margin: 12px 0 0 0;
+       width: 340px;
        min-height: 130px;
 }
 
@@ -437,35 +438,33 @@ q:after {
 
 #footer .timing {
        position: relative;
-       padding: 0 0 96px 0;
 }
 
 #footer .timing .note p {
        margin: 0;
 }
 
-#footer .timing .logos {
+#footer .logos {
        margin: 0;
        padding: 0;
        list-style: none;
-       white-space: nowrap;
-       position: absolute;
-       right: 0px;
-       bottom: 0px;
+       display: flex;
+       align-items: center;
+       justify-content: space-between;
 }
 
-#footer .timing .logos li:first-child {
+#footer .logos li:first-child {
        margin: 22px 0 0;
 }
 
-#footer .timing .logos li {
+#footer .logos li {
        display: inline-block;
        vertical-align: middle;
        margin: 0 0 0 39px;
        float: none;
 }
 
-#footer .timing .logos img {
+#footer .logos img {
        display: block;
 }
 
@@ -490,6 +489,10 @@ q:after {
        color: #0ea6db;
 }
 
+#footer .partner-logos {
+       padding: 10px 0 20px 0;
+}
+
 #content .dotclear .accordion {
        h3 {
                cursor: pointer;