From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 15 Jul 2016 17:31:59 +0000 (+0000)
Subject: WIP #553 @2.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=744b1ae5107e6257e9ad3a900e433abb71df0f5a;p=fluidbook-v3.git

WIP #553 @2.5
---

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index 7a49ead..5448acb 100644
--- 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 13bae54..6209613 100644
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -14,6 +14,8 @@ body {
 	font-size: 14px;
 	line-height: 26/14;
 	min-width: @content-min-width;
+	-moz-text-size-adjust: 100%;
+	-webkit-text-size-adjust: 100%;
 
 	@media @m900 {
 		font-size: 12px;
diff --git a/less/105-mmenu.less b/less/105-mmenu.less
index 9b5de0f..8dd2ec1 100644
--- a/less/105-mmenu.less
+++ b/less/105-mmenu.less
@@ -148,6 +148,10 @@ html.mm-front #mm-blocker {
 	display: inline-block;
 	margin: 0 auto;
 	bottom: 50px;
+
+	@media (max-height: 700px) {
+		bottom: 20px;
+	}
 }
 
 #mmenu {
diff --git a/less/310-contact.less b/less/310-contact.less
index 0470b6e..77f9e89 100644
--- 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;