]> _ Git - fluidbook-v3.git/commitdiff
wip #480 @3
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jun 2016 17:25:53 +0000 (17:25 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 22 Jun 2016 17:25:53 +0000 (17:25 +0000)
16 files changed:
framework/application/configs/application.ini
framework/application/views/helpers/HeaderContactNav.php [new file with mode: 0644]
framework/application/views/helpers/HeaderLogo.php [new file with mode: 0644]
framework/application/views/helpers/HeaderNav.php [new file with mode: 0644]
framework/application/views/helpers/LinkQuote.php [new file with mode: 0644]
framework/application/views/scripts/common/content.phtml
framework/application/views/scripts/common/header.phtml
images/logo/leave.svg [new file with mode: 0644]
images/logo/text-dark.svg [new file with mode: 0644]
images/logo/text-white.svg [new file with mode: 0644]
js/002-common.js
js/101-header.js [new file with mode: 0644]
less/001-variables.less
less/002-common.less
less/003-mixins.less
less/101-header.less

index 02b88f1c807e8c5e75d332c94fdd3ba1a220c9e1..d89c2c118baa55b50ea182c25d3e14c88d9be1d7 100644 (file)
@@ -19,8 +19,6 @@ timezone = 'Europe/Paris'
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
 
-webhost = www.fluidbook.com
-
 database.adapter = pdo_mysql
 database.params.host = localhost
 database.params.username = fluidbookwebv3
@@ -45,6 +43,8 @@ navigation.containers[] = -2;
 navigation.containers[] = -3;
 navigation.containers.Sitemap = -4;
 
+webhost = www.fluidbook.com
+
 locales.fr = www.fluidbook.com
 locales.en = en.fluidbook.com
 
@@ -63,7 +63,6 @@ dev = true
 firephp = true
 
 minify.js = false
-minify.css = false
 
 seo.universalAnalytics =
 
@@ -74,7 +73,7 @@ httpauth.ip_whitelist[] = 82.216.164.184
 
 robots = false
 
-webhost = fluidbookwebv3.dev.cubedesigners.com
+webhost = dev.fluidbook.com
 
-locales.fr = fluidbookwebv3.dev.cubedesigners.com
-locales.en = en.fluidbookwebv3.dev.cubedesigners.com
\ No newline at end of file
+locales.fr = dev.fluidbook.com
+locales.en = en.dev.fluidbook.com
\ No newline at end of file
diff --git a/framework/application/views/helpers/HeaderContactNav.php b/framework/application/views/helpers/HeaderContactNav.php
new file mode 100644 (file)
index 0000000..1b56cd7
--- /dev/null
@@ -0,0 +1,16 @@
+<?php\r
+\r
+class Fluidbook_View_Helper_HeaderContactNav extends CubeIT_View_Helper_Abstract {\r
+       /**\r
+        * @return string\r
+        */\r
+       public function headerContactNav() {\r
+\r
+               $res = array();\r
+\r
+               $res[] = $this->linkInternal(null, 'internal:agences',array('class'=>'agencies'));\r
+               $res[] = $this->linkQuote('Demandez un devis');\r
+\r
+               return $this->htmlElement($this->listUnordered($res), 'nav', array('id' => 'contactnav', 'role' => 'navigation'));\r
+       }\r
+}
\ No newline at end of file
diff --git a/framework/application/views/helpers/HeaderLogo.php b/framework/application/views/helpers/HeaderLogo.php
new file mode 100644 (file)
index 0000000..acb6d32
--- /dev/null
@@ -0,0 +1,16 @@
+<?php\r
+\r
+class Fluidbook_View_Helper_HeaderLogo extends CubeIT_View_Helper_Abstract {\r
+       /**\r
+        * @return string\r
+        */\r
+       public function headerLogo() {\r
+               \r
+               \r
+               $logos = $this->image('/images/logo/leave.svg', "", -1, -1, array('class' => 'leave'));\r
+               $logos .= $this->image('/images/logo/text-white.svg', 'Fluidbook', -1, -1, array('class' => 'text-white'));\r
+               $logos .= $this->image('/images/logo/text-dark.svg', '', -1, -1, array('class' => 'text-dark'));\r
+\r
+               return $this->link($logos, '/', array('class' => 'logo'));\r
+       }\r
+}
\ No newline at end of file
diff --git a/framework/application/views/helpers/HeaderNav.php b/framework/application/views/helpers/HeaderNav.php
new file mode 100644 (file)
index 0000000..512653b
--- /dev/null
@@ -0,0 +1,12 @@
+<?php\r
+\r
+class Fluidbook_View_Helper_HeaderNav extends CubeIT_View_Helper_Abstract {\r
+       /**\r
+        * @return string\r
+        */\r
+       public function headerNav() {\r
+               $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);\r
+               $res = $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0));\r
+               return $this->htmlElement($res, 'nav', array('id' => 'menu', 'role' => 'navigation'));\r
+       }\r
+}
\ No newline at end of file
diff --git a/framework/application/views/helpers/LinkQuote.php b/framework/application/views/helpers/LinkQuote.php
new file mode 100644 (file)
index 0000000..d3f1195
--- /dev/null
@@ -0,0 +1,10 @@
+<?php\r
+\r
+class Fluidbook_View_Helper_LinkQuote extends CubeIT_View_Helper_Abstract {\r
+       /**\r
+        * @return string\r
+        */\r
+       public function linkQuote($label) {\r
+               return $this->linkInternal($label, 'internal:contact', array('class' => 'quoteLink'));\r
+       }\r
+}
\ No newline at end of file
index d6b5ab21d02d680159cc81c5152775a0aefdadfd..4e06e1844bcc675c9eef814ce1dca08c83bcd37e 100644 (file)
@@ -2,5 +2,7 @@
 \r
 $content = $this->layout()->content . "\n";\r
 echo $this->render('common/header.phtml');\r
+echo '<main>';\r
 echo $content;\r
+echo '</main>';\r
 echo $this->render('common/footer.phtml');\r
index a0bf5bea54c6dfee0fcb2942d65087ab0e21efa2..e3c8dc5a7cb01ee6bcb7a9beb9e9c9bc79d8bc9d 100644 (file)
@@ -12,23 +12,11 @@ if (!is_null($homepage)) {
 <header>\r
        <div id="header" class="content">\r
                <?php\r
-               /* LOGO */\r
+               echo $this->headerLogo();\r
+               echo $this->headerNav();\r
+               echo $this->headerContactNav();\r
 \r
-               $logos = $this->image('/images/logo/Cube.svg', "Fluidbook", -1, -1, array('class' => 'cube'));\r
-               $logos .= $this->image('/images/logo/Typo.svg', 'Fluidbook', -1, -1, array('class' => 'typo'));\r
-\r
-               echo $this->link($logos, $home, array('class' => 'logo'));\r
-               if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {\r
-                       echo '<div class="sublogo"><h1>' . $this->cmsValue('logoTitle') . '</h1><h2>' . $this->cmsValue('baseline') . '</h2></div>';\r
-               } else {\r
-                       echo '<div class="sublogo"><h2>' . $this->cmsValue('logoTitle') . '</h2><h3>' . $this->cmsValue('baseline') . '</h3></div>';\r
-               }\r
-               /* NAVIGATION */\r
-               $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);\r
                echo '<div class="nav-icon"><div></div></div>';\r
-               echo '<nav id="menu" role="navigation">';\r
-               echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";\r
-               echo '</nav>';\r
                ?>\r
        </div>\r
 </header>
\ No newline at end of file
diff --git a/images/logo/leave.svg b/images/logo/leave.svg
new file mode 100644 (file)
index 0000000..584a3f0
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<svg version="1.0" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        viewBox="0 0 32 45" style="enable-background:new 0 0 32 45;" xml:space="preserve">\r
+<style type="text/css">\r
+       .st0{fill:url(#SVGID_1_);}\r
+       .st1{fill:url(#SVGID_2_);}\r
+       .st2{opacity:0.8;fill:url(#SVGID_3_);}\r
+</style>\r
+<g>\r
+       <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1.3201" y1="22.3523" x2="30.4148" y2="22.3523">\r
+               <stop  offset="0" style="stop-color:#B1D348"/>\r
+               <stop  offset="1" style="stop-color:#57772B"/>\r
+       </linearGradient>\r
+       <path class="st0" d="M29.1,43.7c2.1-16.7,2-23.5-2.9-30.4c-4.9-6.9-16-7-23.5-12.3c-3.4,19.2-0.9,30,10.7,34.3S29.1,43.7,29.1,43.7\r
+               z"/>\r
+       <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5.2973" y1="29.0059" x2="29.1046" y2="29.0059">\r
+               <stop  offset="0" style="stop-color:#57772B"/>\r
+               <stop  offset="1" style="stop-color:#B1D348"/>\r
+       </linearGradient>\r
+       <path class="st1" d="M29.1,43.7c0-12.6-0.7-17.7-5-22.4c-4.3-4.7-12.6-3.7-18.7-7C4.7,28.9,7.6,36.7,16.6,38.9\r
+               C25.6,41,29.1,43.7,29.1,43.7z"/>\r
+       <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1" y1="35.3924" x2="29.1163" y2="35.3924">\r
+               <stop  offset="0" style="stop-color:#B1D348"/>\r
+               <stop  offset="1" style="stop-color:#57772B"/>\r
+       </linearGradient>\r
+       <path class="st2" d="M29.1,43.7c-4-10-6.2-13.7-11.1-16.1c-4.9-2.3-11.2,1-17,0.3c4.1,11.7,8.9,17,16.7,15.9\r
+               C25.5,42.7,29.1,43.7,29.1,43.7z"/>\r
+</g>\r
+</svg>\r
diff --git a/images/logo/text-dark.svg b/images/logo/text-dark.svg
new file mode 100644 (file)
index 0000000..f067651
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        viewBox="0 0 174 42" style="enable-background:new 0 0 174 42;" xml:space="preserve">\r
+<style type="text/css">\r
+       .st0{fill: #343c44;}\r
+</style>\r
+<g>\r
+       <g>\r
+               <g>\r
+                       <path class="st0" d="M22.2,4.4c0-2.7-4-3.4-6.3-3.4C9.4,1,6.4,4.4,6.4,11.6c0,0,0,7.4,0,8c-0.6,0-5.1,0-5.1,0v2c0,0,4.5,0,5.1,0\r
+                               v12.6c0,3.4-1.3,4.3-5.1,4.6l-0.3,0v1.7l8.3-0.2l3.5,0.1l3.9,0.1l0-0.4l0-1.3l-1.2,0c-1.6,0-3.2-0.1-3.8-1.6\r
+                               c-0.2-0.5-0.4-1.7-0.4-2.9c0,0,0-12,0-12.6c0.6,0,6,0,6,0v-2c0,0-5.4,0-6,0c0-0.6,0-8.8,0-8.8c0-1.9,0-4.2,0.7-5.9\r
+                               c0.6-1.5,1.7-2.1,3.6-2.1c1.5,0,2,0.6,2.5,1.9c0.3,0.7,0.8,1.6,2,1.6C21.2,6.3,22.2,5.5,22.2,4.4z M65.9,39l-0.3,0\r
+                               c-2.8-0.2-2.8-0.9-2.8-3.1l0-1V20.3l-7.6,1.5v1.5l0.3,0c0.7,0,2.5-0.1,2.7,0.7c0.1,0.2,0.2,1.2,0.2,4.8v6.3l0,0.6\r
+                               c0,2.4,0,3.1-2.7,3.2l-0.3,0v1.5l5.5-0.2l2.5,0.1l2.6,0.1l0-0.3V39z M29.7,39l-0.3,0c-2.8-0.2-2.8-0.9-2.8-3.1l0-1V12l-7.7,1.5\r
+                               v1.4l0.8,0.1c0.9,0.1,1.7,0.2,2.1,0.9c0.4,0.9,0.4,3.6,0.4,4.6v14.5l0,0.5c0,2.5,0,3.2-2.8,3.4l-0.3,0v1.5l5.2-0.2\r
+                               c0,0,2.4,0.1,2.4,0.1l2.9,0.1l0-0.3V39z M51.9,37.8c-1.2,0-1.3-1.2-1.3-2.6V20.7l-2.1,0.1c0,0-1.6,0.1-1.7,0.1c0,0-4-0.2-4-0.2\r
+                               l0,0.3v1.1l0.3,0c3.1,0.5,3.1,1.1,3.1,3.9l0,0.6v5.9c0,1.6-0.6,3.2-1.6,4.3c-1.1,1.2-2.5,1.9-4.1,1.9c-2.9,0-3.4-2.8-3.4-5.8\r
+                               V20.7l-2,0.1l-1.8,0.1c0,0-1.8-0.1-1.8-0.1l-2.2-0.1l0,0.3v1.1l0.3,0c3.1,0.5,3.1,1.1,3.1,3.9l0,0.6v7.5c0,4.5,2.1,6.6,6.4,6.6\r
+                               c2.7,0,5.5-1.5,7.2-3.7c0.2,0.9,0.8,3.8,0.8,3.8l6.7-1.7v-1.6l-0.9,0.1C52.6,37.8,52.2,37.8,51.9,37.8z M60.2,15.4\r
+                               c1.4,0,2.6-1.2,2.6-2.6c0-1.5-1.2-2.7-2.6-2.7c-1.5,0-2.7,1.2-2.7,2.7C57.4,14.3,58.7,15.4,60.2,15.4z M140.6,20.3\r
+                               c-4.9,0-10.2,4-10.2,10.1c0,5.8,4.6,10.5,10.2,10.5c5.8,0,10.2-4.5,10.2-10.4C150.8,25,146.2,20.3,140.6,20.3z M145,36.6\r
+                               c-0.9,1.8-2.3,2.7-4.2,2.7c-4.9,0-5.7-5.5-5.7-8.7c0-2,0.4-8.6,5.3-8.6c4.7,0,5.7,4.8,5.7,8.9C146.1,32.4,145.9,34.7,145,36.6z\r
+                                M172.6,40.1V39l-0.3,0c-1.2-0.2-1.6-0.6-2.2-1.3l-0.6-0.6c0,0-7.9-7.7-8.3-8.1c0.4-0.4,3.9-4.3,3.9-4.3c0,0,0.4-0.4,0.4-0.4\r
+                               c1.2-1.3,1.7-1.9,3.7-2l0.3,0v-1.5l-4.1,0.2c0,0-1.9-0.1-1.9-0.1l-2.3-0.1l0,0.3v1.2h0.3c1.3,0,2,0.3,2,0.8\r
+                               c0,0.3-0.4,1.3-3.2,4.2c0,0-1.8,1.9-2.5,2.6c0-1.4,0-20.3,0-20.3l-7.7,1.5v1.4l0.7,0.1c0.9,0.1,1.8,0.2,2.2,0.9\r
+                               c0.4,0.8,0.4,3.1,0.4,4v17.5l0,0.5c0,2.5,0,3.2-2.8,3.4l-0.3,0v1.5l2.9-0.1l2.4-0.1c0,0,2.4,0.1,2.4,0.1l2.8,0.1l0-0.3V39l-0.3,0\r
+                               c-2.6-0.2-2.8-0.8-2.8-2.7c0-0.2,0-0.4,0-0.7l0-0.8c0,0,0-2.4,0-2.6c0.1-0.1,0.3-0.3,0.6-0.6c0.4,0.4,8.3,8.8,8.3,8.8\r
+                               s2.8-0.2,2.9-0.2c0,0,3,0.2,3,0.2L172.6,40.1z M86.1,32.2V9.6l-7.7,1.5v1.4l0.3,0c2.9,0.1,3,1.2,3,3.8c0,0,0,5,0,6.2\r
+                               c-1.5-1.5-3.6-2.3-6-2.3c-6.1,0-9.7,5.4-9.7,10.5c0,5.8,4.1,10.1,9.7,10.1c2.9,0,5-1,7-3.4c0.2,0,3.9-0.5,3.9-0.5l-0.1-0.4\r
+                               C86.1,35.6,86.1,33.4,86.1,32.2z M81.7,32.8c0,2.9-0.9,6.3-4.9,6.3c-5.2,0-5.7-5.8-5.7-8.2c0-2,0.4-8.5,5.7-8.5\r
+                               c2.4,0,4.9,1.6,4.9,4.2V32.8z M98.5,20.3c-2.4,0-4.5,0.8-6,2.3c0-1.2,0-6.2,0-6.2c0-2.6,0.1-3.8,3-3.8l0.3,0v-1.4l-7.7-1.5v22.7\r
+                               c0,1.2,0,3.4-0.4,4.5l-0.1,0.4c0,0,3.7,0.4,3.9,0.5c2,2.4,4.1,3.4,7,3.4c5.6,0,9.7-4.2,9.7-10.1C108.2,25.7,104.6,20.3,98.5,20.3\r
+                               z M97.5,39.1c-4.1,0-4.9-3.4-4.9-6.3v-6.3c0-2.6,2.6-4.2,4.9-4.2c5.3,0,5.7,6.5,5.7,8.5C103.2,33.4,102.6,39.1,97.5,39.1z\r
+                                M119.3,20.3c-4.9,0-10.2,4-10.2,10.1c0,5.8,4.6,10.5,10.2,10.5c5.8,0,10.2-4.5,10.2-10.4C129.6,25,124.9,20.3,119.3,20.3z\r
+                                M123.7,36.6c-0.9,1.8-2.3,2.7-4.2,2.7c-4.9,0-5.7-5.5-5.7-8.7c0-2,0.4-8.6,5.3-8.6c4.7,0,5.7,4.8,5.7,8.9\r
+                               C124.8,32.4,124.6,34.7,123.7,36.6z"/>\r
+               </g>\r
+       </g>\r
+</g>\r
+</svg>\r
diff --git a/images/logo/text-white.svg b/images/logo/text-white.svg
new file mode 100644 (file)
index 0000000..69466b1
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        viewBox="0 0 174 42" style="enable-background:new 0 0 174 42;" xml:space="preserve">\r
+<style type="text/css">\r
+       .st0{fill:#FFFFFF;}\r
+</style>\r
+<g>\r
+       <g>\r
+               <g>\r
+                       <path class="st0" d="M22.2,4.4c0-2.7-4-3.4-6.3-3.4C9.4,1,6.4,4.4,6.4,11.6c0,0,0,7.4,0,8c-0.6,0-5.1,0-5.1,0v2c0,0,4.5,0,5.1,0\r
+                               v12.6c0,3.4-1.3,4.3-5.1,4.6l-0.3,0v1.7l8.3-0.2l3.5,0.1l3.9,0.1l0-0.4l0-1.3l-1.2,0c-1.6,0-3.2-0.1-3.8-1.6\r
+                               c-0.2-0.5-0.4-1.7-0.4-2.9c0,0,0-12,0-12.6c0.6,0,6,0,6,0v-2c0,0-5.4,0-6,0c0-0.6,0-8.8,0-8.8c0-1.9,0-4.2,0.7-5.9\r
+                               c0.6-1.5,1.7-2.1,3.6-2.1c1.5,0,2,0.6,2.5,1.9c0.3,0.7,0.8,1.6,2,1.6C21.2,6.3,22.2,5.5,22.2,4.4z M65.9,39l-0.3,0\r
+                               c-2.8-0.2-2.8-0.9-2.8-3.1l0-1V20.3l-7.6,1.5v1.5l0.3,0c0.7,0,2.5-0.1,2.7,0.7c0.1,0.2,0.2,1.2,0.2,4.8v6.3l0,0.6\r
+                               c0,2.4,0,3.1-2.7,3.2l-0.3,0v1.5l5.5-0.2l2.5,0.1l2.6,0.1l0-0.3V39z M29.7,39l-0.3,0c-2.8-0.2-2.8-0.9-2.8-3.1l0-1V12l-7.7,1.5\r
+                               v1.4l0.8,0.1c0.9,0.1,1.7,0.2,2.1,0.9c0.4,0.9,0.4,3.6,0.4,4.6v14.5l0,0.5c0,2.5,0,3.2-2.8,3.4l-0.3,0v1.5l5.2-0.2\r
+                               c0,0,2.4,0.1,2.4,0.1l2.9,0.1l0-0.3V39z M51.9,37.8c-1.2,0-1.3-1.2-1.3-2.6V20.7l-2.1,0.1c0,0-1.6,0.1-1.7,0.1c0,0-4-0.2-4-0.2\r
+                               l0,0.3v1.1l0.3,0c3.1,0.5,3.1,1.1,3.1,3.9l0,0.6v5.9c0,1.6-0.6,3.2-1.6,4.3c-1.1,1.2-2.5,1.9-4.1,1.9c-2.9,0-3.4-2.8-3.4-5.8\r
+                               V20.7l-2,0.1l-1.8,0.1c0,0-1.8-0.1-1.8-0.1l-2.2-0.1l0,0.3v1.1l0.3,0c3.1,0.5,3.1,1.1,3.1,3.9l0,0.6v7.5c0,4.5,2.1,6.6,6.4,6.6\r
+                               c2.7,0,5.5-1.5,7.2-3.7c0.2,0.9,0.8,3.8,0.8,3.8l6.7-1.7v-1.6l-0.9,0.1C52.6,37.8,52.2,37.8,51.9,37.8z M60.2,15.4\r
+                               c1.4,0,2.6-1.2,2.6-2.6c0-1.5-1.2-2.7-2.6-2.7c-1.5,0-2.7,1.2-2.7,2.7C57.4,14.3,58.7,15.4,60.2,15.4z M140.6,20.3\r
+                               c-4.9,0-10.2,4-10.2,10.1c0,5.8,4.6,10.5,10.2,10.5c5.8,0,10.2-4.5,10.2-10.4C150.8,25,146.2,20.3,140.6,20.3z M145,36.6\r
+                               c-0.9,1.8-2.3,2.7-4.2,2.7c-4.9,0-5.7-5.5-5.7-8.7c0-2,0.4-8.6,5.3-8.6c4.7,0,5.7,4.8,5.7,8.9C146.1,32.4,145.9,34.7,145,36.6z\r
+                                M172.6,40.1V39l-0.3,0c-1.2-0.2-1.6-0.6-2.2-1.3l-0.6-0.6c0,0-7.9-7.7-8.3-8.1c0.4-0.4,3.9-4.3,3.9-4.3c0,0,0.4-0.4,0.4-0.4\r
+                               c1.2-1.3,1.7-1.9,3.7-2l0.3,0v-1.5l-4.1,0.2c0,0-1.9-0.1-1.9-0.1l-2.3-0.1l0,0.3v1.2h0.3c1.3,0,2,0.3,2,0.8\r
+                               c0,0.3-0.4,1.3-3.2,4.2c0,0-1.8,1.9-2.5,2.6c0-1.4,0-20.3,0-20.3l-7.7,1.5v1.4l0.7,0.1c0.9,0.1,1.8,0.2,2.2,0.9\r
+                               c0.4,0.8,0.4,3.1,0.4,4v17.5l0,0.5c0,2.5,0,3.2-2.8,3.4l-0.3,0v1.5l2.9-0.1l2.4-0.1c0,0,2.4,0.1,2.4,0.1l2.8,0.1l0-0.3V39l-0.3,0\r
+                               c-2.6-0.2-2.8-0.8-2.8-2.7c0-0.2,0-0.4,0-0.7l0-0.8c0,0,0-2.4,0-2.6c0.1-0.1,0.3-0.3,0.6-0.6c0.4,0.4,8.3,8.8,8.3,8.8\r
+                               s2.8-0.2,2.9-0.2c0,0,3,0.2,3,0.2L172.6,40.1z M86.1,32.2V9.6l-7.7,1.5v1.4l0.3,0c2.9,0.1,3,1.2,3,3.8c0,0,0,5,0,6.2\r
+                               c-1.5-1.5-3.6-2.3-6-2.3c-6.1,0-9.7,5.4-9.7,10.5c0,5.8,4.1,10.1,9.7,10.1c2.9,0,5-1,7-3.4c0.2,0,3.9-0.5,3.9-0.5l-0.1-0.4\r
+                               C86.1,35.6,86.1,33.4,86.1,32.2z M81.7,32.8c0,2.9-0.9,6.3-4.9,6.3c-5.2,0-5.7-5.8-5.7-8.2c0-2,0.4-8.5,5.7-8.5\r
+                               c2.4,0,4.9,1.6,4.9,4.2V32.8z M98.5,20.3c-2.4,0-4.5,0.8-6,2.3c0-1.2,0-6.2,0-6.2c0-2.6,0.1-3.8,3-3.8l0.3,0v-1.4l-7.7-1.5v22.7\r
+                               c0,1.2,0,3.4-0.4,4.5l-0.1,0.4c0,0,3.7,0.4,3.9,0.5c2,2.4,4.1,3.4,7,3.4c5.6,0,9.7-4.2,9.7-10.1C108.2,25.7,104.6,20.3,98.5,20.3\r
+                               z M97.5,39.1c-4.1,0-4.9-3.4-4.9-6.3v-6.3c0-2.6,2.6-4.2,4.9-4.2c5.3,0,5.7,6.5,5.7,8.5C103.2,33.4,102.6,39.1,97.5,39.1z\r
+                                M119.3,20.3c-4.9,0-10.2,4-10.2,10.1c0,5.8,4.6,10.5,10.2,10.5c5.8,0,10.2-4.5,10.2-10.4C129.6,25,124.9,20.3,119.3,20.3z\r
+                                M123.7,36.6c-0.9,1.8-2.3,2.7-4.2,2.7c-4.9,0-5.7-5.5-5.7-8.7c0-2,0.4-8.6,5.3-8.6c4.7,0,5.7,4.8,5.7,8.9\r
+                               C124.8,32.4,124.6,34.7,123.7,36.6z"/>\r
+               </g>\r
+       </g>\r
+</g>\r
+</svg>\r
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..40f5236e27e1c02b6755c6c9f701206f21b94a94 100644 (file)
@@ -0,0 +1,18 @@
+registerLoader(load_common, true);\r
+\r
+function load_common() {\r
+    $(window).on('cubeitresize', resize);\r
+    resize();\r
+}\r
+\r
+function resize() {\r
+    var ww = $(window).width();\r
+    var wh = $(window).height();\r
+\r
+    var mainHeight = wh;\r
+    $("footer").each(function () {\r
+        mainHeight -= $(this).outerHeight();\r
+    });\r
+\r
+    $('main').css('min-height', mainHeight);\r
+}
\ No newline at end of file
diff --git a/js/101-header.js b/js/101-header.js
new file mode 100644 (file)
index 0000000..4c5b0c0
--- /dev/null
@@ -0,0 +1,18 @@
+registerLoader(load_header, true);\r
+\r
+function load_header() {\r
+    $(window).on('cubeitresize', resizeHeader());\r
+    resizeHeader();\r
+\r
+}\r
+\r
+function resizeHeader() {\r
+    var ww = $(window).width();\r
+    var wh = $(window).height();\r
+\r
+    var nav = $("header nav#menu");\r
+    var menuLeft = (ww - $(nav).outerWidth()) / 2;\r
+    $(nav).data('centeroffset', menuLeft).css('left',menuLeft);\r
+\r
+\r
+}\r
index 339d97ac6fa7050d426ad35392bcac7a2db084ec..3a4bb9689b0f1a3193eaabdb7ad3970d10b9d864 100644 (file)
@@ -11,6 +11,8 @@
 //-- Colours
 @color-footer-bg-primary: #263340;
 @color-footer-bg-secondary: #161e26;
+@color-green: #8aab41;
+@color-header-grey: #2a3743;
 
 //-- Content and breakpoints
 @mobile-breakpoint: 1024px;
\ No newline at end of file
index 25d684339c5ed1e7fcdb0a592959a1ea51c5f265..8a03dcb5dac54a6356a3c73901da03a63c4292a9 100644 (file)
@@ -1,5 +1,13 @@
 @import "000-imports";\r
 \r
+*{\r
+       box-sizing: border-box;\r
+}\r
+\r
 body {\r
        font-family: @body-font;\r
 }\r
+\r
+main{\r
+       background-color: #fff;\r
+}
\ No newline at end of file
index adacd16123e55f02b777e8d6a6368bb913a0aea2..e15e61d65e74ef0f7ccc69a9775230943cdeb7e4 100644 (file)
@@ -2,11 +2,43 @@
 // See: https://maximilianhoffmann.com/posts/better-font-rendering-on-osx
 // also: http://usabilitypost.com/2012/11/05/stop-fixing-font-smoothing/
 .font-thinning() {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+       -webkit-font-smoothing: antialiased;
+       -moz-osx-font-smoothing: grayscale;
 }
 
 .font-thinning-off() {
-  -webkit-font-smoothing: auto;
-  -moz-osx-font-smoothing: auto;
+       -webkit-font-smoothing: auto;
+       -moz-osx-font-smoothing: auto;
+}
+
+.border-button(@base-color,@border-color) {
+       transition: all 200ms;
+
+       border-color: @border-color;
+       color: @base-color;
+
+       &:hover {
+               border-color: lighten(@border-color, 5%);
+               color: lighten(@base-color, 5%);
+       }
+       &:active {
+               border-color: darken(@border-color, 2%);
+               color: darken(@base-color, 2%);
+       }
+}
+
+.background-button(@base-color) {
+       transition: all 200ms;
+
+       background-color: @base-color;
+       border-color: @base-color;
+
+       &:hover {
+               background-color: lighten(@base-color, 5%);
+               border-color: lighten(@base-color, 5%);
+       }
+       &:active {
+               background-color: darken(@base-color, 2%);
+               border-color: darken(@base-color, 2%);
+       }
 }
\ No newline at end of file
index c958f3b341ab89f3981e49aa74c4fd56f0ce1c9d..657f9e4fc7fbfe24066191f5642945be4df70a58 100644 (file)
 @import "000-imports";\r
 \r
 header {\r
-       color: #2a3743;\r
+       position: fixed;\r
+       top: 0px;\r
+       left: 0px;\r
 \r
-       nav#menu {\r
+       height: 90px;\r
+       width: 100%;\r
+\r
+       color: @color-header-grey;\r
+       padding: 0 5%;\r
+       vertical-align: bottom;\r
+       border: 1px solid #f00;\r
+\r
+       #header {\r
+               height: 90px;\r
+               width: 100%;\r
+               position: relative;\r
+\r
+       }\r
+\r
+       nav {\r
+               font-family: @montserrat;\r
+               font-weight: 300;\r
+               a {\r
+                       text-transform: uppercase;\r
+                       text-decoration: none;\r
+                       font-size: 12px;\r
+                       color: @color-header-grey;\r
+               }\r
                ul {\r
                        list-style: none;\r
                        li {\r
                                display: inline-block;\r
                        }\r
                }\r
+       }\r
+\r
+       nav#menu {\r
+               position: relative;\r
+               top: 54px;\r
+\r
+               display: inline-block;\r
+               text-align: center;\r
+\r
+               li {\r
+                       margin: 0 25px;\r
+               }\r
+\r
                a {\r
-                       color: #2a3743;\r
+                       line-height: 9px;\r
+                       border: 1px solid transparent;\r
+                       padding-bottom: 13px;\r
+               }\r
+\r
+               li.active a, a:hover {\r
+                       border-bottom-color: @color-header-grey;\r
+               }\r
+       }\r
+\r
+       nav#contactnav {\r
+               position: absolute;\r
+               right: 0;\r
+               bottom: 1px;\r
+\r
+               li {\r
+                       margin-left: 19px;\r
+               }\r
+               a {\r
+                       display: inline-block;\r
+                       border: 1px solid @color-header-grey;\r
+                       padding: 13px 29px 14px;\r
+                       line-height: 9px;\r
+                       border-radius: 19px;\r
+                       &.quoteLink {\r
+                               .background-button(@color-green);\r
+                               color: #fff;\r
+                       }\r
+                       &.agencies{\r
+                               .border-button(@color-header-grey,#c2c4c7);\r
+                       }\r
                }\r
        }\r
 \r
        &.light {\r
                color: #fff;\r
                nav #menu {\r
+                       li.active a, a:hover {\r
+                               border-bottom-color: #fff;\r
+                       }\r
                        a {\r
                                color: #fff;\r
                        }\r
                }\r
        }\r
+\r
+       .logo {\r
+               position: absolute;\r
+               display: inline-block;\r
+               top: 35px;\r
+               height: 50px;\r
+               width: 220px;\r
+\r
+               .leave {\r
+                       position: absolute;\r
+                       top: 0;\r
+                       left: 0;\r
+               }\r
+\r
+               .text-white, .text-dark {\r
+                       position: absolute;\r
+                       left: 35px;\r
+                       top: 13px;\r
+               }\r
+\r
+               .text-white {\r
+                       opacity: 0;\r
+               }\r
+       }\r
 }
\ No newline at end of file