WIP #553 @2.5

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index 7a49ead697a3874f144a717391c4281fc00b3781..5448acb2d9a1f473b94ad1076f4489e0618b89d8 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -3,6 +3,9 @@
 if ($this->acl()->isAllowed('edition')) {
        $this->headScript()->addCommonsAdmin();
 }
+
+$this->headMeta()->setViewport('device-width');
+
 $this->headScript()->addIEConditionnals();
 $this->headScript()->appendFile('/js/002-common.js');
 //<link href="https://file.myfontastic.com/2VZntjQVKuJUUqArhhJzkD/icons.css" rel="stylesheet">

diff --git a/less/002-common.less b/less/002-common.less
index 13bae5426d1826377531da899bc6a497194668ea..62096137ebc7d716cc7c3a7fc3b98866b6e27c18 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -14,6 +14,8 @@ body {
        font-size: 14px;\r
        line-height: 26/14;\r
        min-width: @content-min-width;\r
+       -moz-text-size-adjust: 100%;\r
+       -webkit-text-size-adjust: 100%;\r
 \r
        @media @m900 {\r
                font-size: 12px;\r

diff --git a/less/105-mmenu.less b/less/105-mmenu.less
index 9b5de0f73ae427cdfe82bd26522d14666dba0659..8dd2ec1ca16408a68ee773b1a5e8b5e53ca463d5 100644 (file)
--- a/less/105-mmenu.less
+++ b/less/105-mmenu.less
@@ -148,6 +148,10 @@ html.mm-front #mm-blocker {
        display: inline-block;\r
        margin: 0 auto;\r
        bottom: 50px;\r
+\r
+       @media (max-height: 700px) {\r
+               bottom: 20px;\r
+       }\r
 }\r
 \r
 #mmenu {\r

diff --git a/less/310-contact.less b/less/310-contact.less
index 0470b6ec7175cf4f16770a2ba567494fb899bc77..77f9e894840c5a141d0e499f4de46402c6d0d38b 100644 (file)
--- a/less/310-contact.less
+++ b/less/310-contact.less
@@ -38,15 +38,27 @@
 }
 
 .resellers {
+  display: block !important;
   background-color: @color-light-grey;
-  flex-wrap: wrap;
   margin-bottom: -30px; // Global offset for the bottom margin on .reseller items
+
+  @media @m900 {
+    text-align: center;
+  }
 }
 
 .reseller {
+  display: inline-block;
+  vertical-align: top;
   padding-right: 30px;
+  width: percentage(1/6);
   min-width: 240px;
   margin-bottom: 30px; // Needed when items wrap
+  text-align: left;
+
+  @media @m900 {
+    min-width: 210px;
+  }
 
   a {
     text-decoration: none;