wip #7217 @5

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 40cc565337c01a447a4dc056e202f7983361e604..ea7be1c96dfa3082f77d91946fd1f6f8d681246d 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -55,7 +55,6 @@ database.params.password = 0b0uezljtKO7RrjR
 database.params.dbname = bloomsburie
 database.params.username = root
 
-locales.fr = fr.bloomsburie.dev2.cubedesigners.com
 locales.en = bloomsburie.dev2.cubedesigners.com
 
 webhost = bloomsburie.dev2.cubedesigners.com

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index bcb4cd3c09428eecf3796414d867e187c41ac258..3365a94330231d86c49b9763954493cdac592e24 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -3,20 +3,12 @@
 $fonts = [
             'google' => [
                 'families' => [
-                    'Rubik:300,300i,400'
+                    'Raleway:300,600,400'
                 ]
             ],
-            //'custom' => array('families' => array('Klavika'), 'urls' => array('/css/fonts/Klavika/Klavika.css'))
         ];
-// Locally hosted version of the fonts - this was so fonts would work for Windows Phones and IE but there were too many issues
-// The robotocondensed.css refers to a custom webfont kit from Font Squirrel. It doesn't display as well as the Google Fonts version
-// To make this display properly, we need type hinting and lots of testing and tweaking. End result: not worth it currently...
-// Reference: http://pixelsvsbytes.com/blog/2013/02/nice-web-fonts-for-every-browser/
-// Note: this custom web font is also missing a character currently: "ö" for Jens' surname.
-//$fonts = array('custom' => array('families' => array('Roboto Condensed'), 'urls' => array('/css/fonts/robotocondensed.css')));
 
 $this->headScript()->addWebFont($fonts);
-//$this->headScript()->addFastclick(); // Removed because it was causing errors on Android and is probably no longer needed for modern devices
 $this->headScript()->addWOW(); // For reveal on scroll animations
 
 if ($this->acl()->isAllowed('edition')) {
@@ -28,7 +20,6 @@ $this->headLink()->appendStylesheet('/less/common.less', 'all');
 
 $this->headMeta()->setViewport('device-width');
 
-
 profile(__FILE__, __LINE__, 'Before rendering body');
 $res = $this->htmlPage($this->render('common/body.phtml'));
 profile(__FILE__, __LINE__, 'Body rendered');

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index c12457df1b1a98cb1448342371db337457c813b2..a0ea1c360c8faaa229d26160009ae50ed6666cf5 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -37,23 +37,6 @@ echo $this->clear();
                                        }
                                        ?>
                                </div>
-
-                               <?php
-                               if (!in_array('en', $this->localesEnabled())) {
-                                       echo '<nav class="locale">';
-                                       $fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-                                       if (!isset($this->enversion)) {
-                                               $en = 'http://en.cubedesigners.com/en/';
-                                       } else {
-                                               $en = $this->enversion;
-                                       }
-                                       echo $this->link('fr', $fr, array('class' => 'active', 'hreflang' => 'fr'));
-                                       echo $this->link('en', $en, array('hreflang' => 'en'));
-                                       echo '</nav>';
-                               } else {
-                                       echo $this->localeNavigation(true, CubeIT_View_Helper_LocaleNavigation::BIGRAMME);
-                               }
-                               ?>
                        </div>
                </div>
        </div>

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index fd6614d5f8306d9795da3e6894250495eca6a567..aa894a906a9132d57aec5c804120314486fec3eb 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -15,7 +15,7 @@ if (!is_null($homepage)) {
                <?php
                /* LOGO */
 
-               $logo['symbol'] = $this->inlineSVG('images/logo/Cube.svg', true, 'logo-symbol');
+               $logo['symbol'] = $this->inlineSVG('images/logo/Symbol.svg', true, 'logo-symbol');
                $logo['text'] = $this->inlineSVG('images/logo/Typo.svg', true, 'logo-text');
 
                echo $this->link($logo['symbol'] . $logo['text'], $home, array('class' => 'logo'));

diff --git a/images/logo/Cube.svg b/images/logo/Cube.svg
deleted file mode 100644 (file)
index 5e3c2d6..0000000
--- a/images/logo/Cube.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg version="1.0" id="cubeSymbol" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 57.8 60.6" style="enable-background:new 0 0 57.8 60.6;" xml:space="preserve">
-<g>
-       <path class="st0" d="M24.3,0.6c-1.2,0.6-19.6,11-22.5,12.7c-1.4,0.7-1.6,1.8-1.6,3.3c0,1,0,24.8,0,27.9c0,1.8,0.9,2.2,1.6,2.7
-               c4.6,2.9,18.5,11.4,20.7,12.6c2.6,1.6,5.5-0.5,4-3.1C25.1,54,16.5,37.6,16.5,37.6c4.1-2.4,8-4.7,9.1-5.5c2.3-1.4,2.5-1.5,2.5-4.6
-               c0-2,0-20.3,0-24.3C28.2,0.8,26.1-0.3,24.3,0.6z M24.3,57.6l-0.4,0.3L3.6,45.4c0,0,5.6-3.7,10.7-6.8L24.3,57.6z M2.6,43.2V15.7
-               L25.4,2.8l0.4,0.3v26L2.6,43.2z"/>
-       <path class="st0" d="M33.4,60c1.2-0.6,19.6-11,22.5-12.7c1.4-0.7,1.6-1.8,1.6-3.3c0-1,0-24.8,0-27.9c0-1.8-0.9-2.2-1.6-2.7
-               C51.4,10.5,37.4,2,35.3,0.8c-2.6-1.6-5.5,0.5-4,3.1c1.4,2.8,10,19.1,10,19.1c-4.1,2.4-8,4.7-9.1,5.5c-2.3,1.4-2.5,1.5-2.5,4.6
-               c0,2,0,20.3,0,24.3C29.7,59.8,31.7,60.9,33.4,60z M33.3,3l0.4-0.3L54,15.2c0,0-5.6,3.7-10.7,6.8L33.3,3z M55.3,17.4v27.5L32.4,57.8
-               L32,57.5V31.6L55.3,17.4z"/>
-</g>
-</svg>

diff --git a/images/logo/Symbol.svg b/images/logo/Symbol.svg
new file mode 100644 (file)
index 0000000..023a40a
--- /dev/null
+++ b/images/logo/Symbol.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 57 56">
+  <defs>
+    <style>
+      .cls-1, .cls-2 {
+        fill: currentColor;
+      }
+    </style>
+  </defs>
+  <g>
+    <g id="Calque_1">
+      <g>
+        <path class="cls-1" d="M52,2l2.3-1.2c.5-.2,1,.1.9.7l-.4,2.5c0,.2,0,.4.2.6l1.8,1.8c.4.4.2,1-.3,1.1l-2.5.4c-.2,0-.4.2-.5.3l-1.1,2.3c-.2.5-.9.5-1.1,0l-1.1-2.3c0-.2-.3-.3-.5-.3l-2.5-.4c-.5,0-.7-.7-.3-1.1l1.8-1.8c.1-.1.2-.4.2-.6l-.4-2.5c0-.5.4-.9.9-.7l2.3,1.2c.2,0,.4,0,.6,0Z"/>
+        <path class="cls-2" d="M40.1,45.5l-1.9.3c-.1,0-.2,0-.3,0-5.7-2.7-10.2-6.9-13.1-12.2.2-.6.5-1.2.7-1.7.1-.4,0-.8-.4-.9h-.2c-3.2-1.3-6.7,0-8.4,3.1-2.9,5.1-7.3,9.3-13,11.9l-1.9.9c-.8.4-1.1,1.3-.8,2l2.4,5.3c.4.9,1.7,1,2.3.2l1-1.6c0,0,.1-.2.2-.2,5.8-2.7,10.6-6.7,14.1-11.6,3.6,5,8.4,8.9,14.2,11.6l1.8.8c.8.4,1.8,0,2.2-.8l2.4-5.2c.4-.9-.3-1.9-1.3-1.8Z"/>
+        <path class="cls-2" d="M43.3,15.5c1.5,1.5,1.4,4.1-.2,5.5-6.5,5.5-14.4,8.4-22.7,8.4-.4,0-.7-.3-.7-.7v-.2c-.1-3.4,2.3-6.3,5.6-6.9,5.1-.9,11.8-4,16.3-8,.7-.6,1.7-.2,1.8.7v1.3Z"/>
+        <path class="cls-2" d="M30.8,15.6c0,2.6-2.1,4.8-4.8,4.8s-4.8-2.1-4.8-4.8,2.1-4.8,4.8-4.8,4.8,2.1,4.8,4.8Z"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file

diff --git a/images/logo/Typo.svg b/images/logo/Typo.svg
index b2df55380ce76beca194d31c34da039ce9256cfb..7fb7e564dc22f29c75f419156d3d0e402b4c2afa 100644 (file)
--- a/images/logo/Typo.svg
+++ b/images/logo/Typo.svg
@@ -1,48 +1,27 @@
-<svg version="1.0" id="cubeText" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 206.7 61" style="enable-background:new 0 0 206.7 61;" xml:space="preserve">
-<g>
-       <g>
-               <g>
-                       <g>
-                               <path class="st0" d="M27.8,23.8v13.6c0,1.2,0.6,1.6,1.7,1.6c1.3,0,4.1-0.8,6-1.8V23.8h3.1v17.8h-2.5l-0.3-1.6
-                                       c-2,1-5,1.9-7.2,1.9c-2.9,0-3.9-1.8-3.9-4.6V23.6L27.8,23.8L27.8,23.8z"/>
-                               <path class="st0" d="M56.6,35.3c0,4.1-1.4,6.7-7.6,6.7c-1.6,0-4.3-0.2-6.3-0.7V16.6l3.1-0.4v8.6c1.2-0.7,3.3-1.2,5.7-1.2
-                                       c3.7,0,5.2,2.2,5.2,5.6L56.6,35.3L56.6,35.3z M45.7,39.1c1.2,0.2,2.4,0.3,3.5,0.3c3.6,0,4.3-1.4,4.3-3.8v-6.5
-                                       c0-1.8-0.8-2.7-2.9-2.7c-1.6,0-3.7,0.7-4.9,1.4V39.1L45.7,39.1z"/>
-                               <path class="st0" d="M66.8,39.3c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.2,0-7.1-2.5-7.1-6.5v-5.3
-                                       c0-3.7,1.7-6.7,7-6.7c5.2,0,6.7,3.1,6.7,6.7V34H62.5v1.5C62.5,38.2,63.3,39.3,66.8,39.3z M62.5,31.4h7.6v-1.4
-                                       c0-2.5-0.8-3.9-3.7-3.9c-2.9,0-4,1.4-4,3.9L62.5,31.4L62.5,31.4z"/>
-                               <path class="st0" d="M77.3,29.2c0-3.5,1.6-5.8,5.8-5.8c1.6,0,3.7,0.3,5.1,0.5v-7.4l3.1-0.4v25.6h-2.6l-0.3-1.6
-                                       c-1.4,1.2-3.5,2-5.9,2c-3.5,0-5.2-1.8-5.2-5.5V29.2L77.3,29.2z M88.2,26.7c-1.6-0.3-3.7-0.5-4.9-0.5c-2,0-2.9,1-2.9,3.1v7.3
-                                       c0,1.8,0.6,2.7,2.7,2.7c1.8,0,3.8-1,5-2.1L88.2,26.7L88.2,26.7z"/>
-                               <path class="st0" d="M102.2,39.3c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.3,0-7.1-2.5-7.1-6.5v-5.3
-                                       c0-3.7,1.7-6.7,7-6.7c5.2,0,6.7,3.1,6.7,6.7V34H98v1.5C98,38.2,98.7,39.3,102.2,39.3z M98,31.4h7.6v-1.4c0-2.5-0.8-3.9-3.8-3.9
-                                       c-2.9,0-3.9,1.4-3.9,3.9v1.4H98z"/>
-                               <path class="st0" d="M117.1,42c-1.8,0-4.2-0.4-5.7-1l0.4-2.4c1.6,0.4,3.5,0.7,5.1,0.7c2.8,0,3.3-0.5,3.3-2.4s-0.1-2.1-3.7-3
-                                       c-4.4-1.1-4.8-2-4.8-5.7c0-3.3,1.4-4.8,6.1-4.8c1.7,0,3.6,0.2,5,0.6l-0.2,2.5c-1.5-0.3-3.5-0.5-4.9-0.5c-2.7,0-3,0.6-3,2.2
-                                       c0,2,0.1,2.3,3.1,3.1c5.1,1.3,5.5,1.9,5.5,5.5C123.2,40.3,122.2,42,117.1,42z"/>
-                               <path class="st0" d="M126.9,20.9v-4.4h3.1v4.4H126.9z M126.9,41.6V23.7h3.1v17.8L126.9,41.6L126.9,41.6z"/>
-                               <path class="st0" d="M162,41.6V28c0-1.2-0.6-1.6-1.7-1.6c-1.3,0-4.1,0.8-6,1.8v13.5h-3.1V23.8h2.5l0.3,1.6c2-1,5-1.9,7.2-1.9
-                                       c2.9,0,3.9,1.8,3.9,4.5v13.6H162L162,41.6z"/>
-                               <path class="st0" d="M175.8,39.3c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.3,0-7.1-2.5-7.1-6.5v-5.3
-                                       c0-3.7,1.7-6.7,7-6.7s6.7,3.1,6.7,6.7V34h-10.6v1.5C171.6,38.2,172.4,39.3,175.8,39.3z M171.6,31.4h7.6v-1.4
-                                       c0-2.5-0.8-3.9-3.8-3.9c-2.9,0-3.9,1.4-3.9,3.9v1.4H171.6z"/>
-                               <path class="st0" d="M193.9,26.2c-1.7,0.8-3.6,2-5.1,3.1v12.3h-3.1V23.8h2.7l0.2,2.5c1.3-1,3.1-2.1,4.9-2.9L193.9,26.2z"/>
-                               <path class="st0" d="M200.7,42c-1.8,0-4.2-0.4-5.7-1l0.4-2.4c1.6,0.4,3.5,0.7,5.1,0.7c2.8,0,3.3-0.5,3.3-2.4s-0.1-2.1-3.8-3
-                                       c-4.4-1.1-4.8-2-4.8-5.7c0-3.3,1.5-4.8,6.1-4.8c1.7,0,3.6,0.2,5,0.6l-0.2,2.5c-1.5-0.3-3.5-0.5-4.9-0.5c-2.7,0-3,0.6-3,2.2
-                                       c0,2,0.1,2.3,3,3.1c5.1,1.3,5.5,1.9,5.5,5.5C206.8,40.3,205.8,42,200.7,42z"/>
-                               <path class="st0" d="M135.8,35.4c-1,0.7-1.7,1.8-1.7,3.1c0,1.6,0.8,3.1,3.5,3.3c2.1,0.2,2.7,0.3,4.7,0.4
-                                       c2.1,0.2,2.7,0.4,2.7,1.9c0,0.3,0,0.5-0.1,0.7h2.9c0-0.3,0-0.5,0-0.8c0-2.7-1.2-4-4.4-4.3c-2.2-0.2-3.2-0.3-5-0.5
-                                       c-0.8-0.1-1.2-0.3-1.2-1s0.7-1.4,1.3-1.9c0.5,0.1,1.2,0.1,1.8,0.1c4.6,0,7-2.2,7-6.1v-0.8c-0.1-1.4-0.3-2.7-1-3.5l2.1-0.4v-1.8
-                                       h-5.1c-0.8-0.3-2.1-0.3-3-0.3c-5.1,0-7,2.2-7,6.1v0.8C133.3,32.7,134.1,34.5,135.8,35.4z M136.2,29.6c0-2.7,1.1-3.6,4.1-3.6
-                                       c2.9,0,4.1,1,4.1,3.6v0.7c0,2.3-1.2,3.5-4.1,3.5c-2.9,0-4.1-0.8-4.1-3.5V29.6z"/>
-                       </g>
-               </g>
-       </g>
-       <g>
-               <path class="st0" d="M10,35.5v-5.7c0-4.1,1.6-6.5,7.2-6.5c1.6,0,3.3,0.3,4.3,0.5l-0.3,2.6c-1.4-0.3-2.7-0.4-4-0.4
-                       c-3.1,0-4.1,0.9-4.1,3.7v5.9c0,2.8,1,3.7,4.1,3.7c1.2,0,2.5-0.1,4-0.4l0.3,2.6c-0.9,0.3-2.7,0.5-4.3,0.5C11.4,42,10,39.6,10,35.5z
-                       "/>
-       </g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 215.5 56">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: currentColor;
+      }
+    </style>
+  </defs>
+  <g>
+    <g id="Calque_1">
+      <g>
+        <path class="cls-1" d="M22.8,41.3c0,1.3-.3,2.4-1,3.5-.7,1-1.5,1.8-2.6,2.4-1.1.6-2.3.9-3.6.9H3.3v-26h12.5c1.2,0,2.3.3,3.2,1,.9.6,1.6,1.5,2,2.5.5,1,.7,2.1.7,3.2s-.3,2.5-1,3.6c-.7,1.1-1.6,1.9-2.7,2.4,1.5.4,2.7,1.3,3.5,2.4.9,1.2,1.3,2.6,1.3,4.2ZM5.8,24.3v9.6h8.9c.9,0,1.6-.2,2.3-.7.7-.5,1.2-1,1.6-1.8.4-.7.6-1.5.6-2.3s-.2-1.7-.5-2.4c-.4-.7-.9-1.3-1.5-1.7-.6-.4-1.4-.7-2.2-.7H5.8ZM20.2,40.9c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.8-.7-.5-1.4-.7-2.3-.7H5.8v9.8h9.7c.9,0,1.7-.2,2.4-.7.7-.5,1.3-1.1,1.7-1.8.4-.7.6-1.5.6-2.4Z"/>
+        <path class="cls-1" d="M27.2,21.3h2.5v22.5c0,1,.2,1.6.5,1.9.3.3.8.4,1.2.4s.9,0,1.3-.1c.4,0,.8-.2,1.1-.3l.4,2c-.5.2-1,.4-1.7.5-.7.1-1.2.2-1.7.2-1.1,0-2-.3-2.7-1-.7-.7-1-1.6-1-2.7v-23.3Z"/>
+        <path class="cls-1" d="M45.2,48.4c-1.4,0-2.7-.3-3.8-.8-1.2-.5-2.2-1.2-3-2.1-.8-.9-1.5-2-2-3.1-.5-1.2-.7-2.4-.7-3.7s.2-2.6.7-3.8c.5-1.2,1.1-2.2,2-3.1.9-.9,1.9-1.6,3-2.1,1.2-.5,2.4-.8,3.8-.8s2.6.3,3.8.8c1.1.5,2.1,1.2,3,2.1.9.9,1.5,2,2,3.1.5,1.2.7,2.4.7,3.8s-.2,2.6-.7,3.7c-.5,1.2-1.1,2.2-2,3.1-.8.9-1.8,1.6-3,2.1-1.2.5-2.4.8-3.8.8ZM38.3,38.6c0,1.4.3,2.7.9,3.8.6,1.1,1.5,2.1,2.5,2.7,1,.7,2.2,1,3.5,1s2.4-.3,3.5-1c1-.7,1.9-1.6,2.5-2.8.6-1.2,1-2.5,1-3.9s-.3-2.6-1-3.8c-.6-1.2-1.5-2.1-2.5-2.8-1-.7-2.2-1-3.5-1s-2.4.4-3.5,1.1c-1,.7-1.9,1.6-2.5,2.8-.6,1.1-.9,2.4-.9,3.9Z"/>
+        <path class="cls-1" d="M67,48.4c-1.4,0-2.7-.3-3.8-.8-1.2-.5-2.2-1.2-3-2.1-.8-.9-1.5-2-2-3.1-.5-1.2-.7-2.4-.7-3.7s.2-2.6.7-3.8c.5-1.2,1.1-2.2,2-3.1.9-.9,1.9-1.6,3-2.1,1.2-.5,2.4-.8,3.8-.8s2.6.3,3.8.8c1.1.5,2.1,1.2,3,2.1.9.9,1.5,2,2,3.1.5,1.2.7,2.4.7,3.8s-.2,2.6-.7,3.7c-.5,1.2-1.1,2.2-2,3.1-.8.9-1.8,1.6-3,2.1-1.2.5-2.4.8-3.8.8ZM60,38.6c0,1.4.3,2.7.9,3.8.6,1.1,1.5,2.1,2.5,2.7,1,.7,2.2,1,3.5,1s2.4-.3,3.5-1c1-.7,1.9-1.6,2.5-2.8.6-1.2,1-2.5,1-3.9s-.3-2.6-1-3.8c-.6-1.2-1.5-2.1-2.5-2.8-1-.7-2.2-1-3.5-1s-2.4.4-3.5,1.1c-1,.7-1.9,1.6-2.5,2.8-.6,1.1-.9,2.4-.9,3.9Z"/>
+        <path class="cls-1" d="M108.9,48h-2.5v-10.6c0-2.2-.4-3.8-1.1-4.9-.7-1-1.8-1.6-3.1-1.6s-2.7.5-3.9,1.5c-1.1,1-1.9,2.3-2.4,3.9v11.6h-2.5v-10.6c0-2.2-.3-3.9-1-4.9-.7-1-1.7-1.5-3.1-1.5s-2.7.5-3.8,1.5c-1.1,1-2,2.3-2.4,3.9v11.6h-2.5v-19h2.3v4.3c.8-1.5,1.8-2.6,3.1-3.4,1.3-.8,2.6-1.2,4.2-1.2s2.9.4,3.8,1.3c1,.9,1.6,2.1,1.8,3.5.9-1.6,1.9-2.8,3.2-3.6,1.2-.8,2.6-1.2,4.2-1.2s2,.2,2.7.6c.7.4,1.3.9,1.8,1.7.5.7.8,1.6,1,2.6.2,1,.3,2.1.3,3.4v11.1Z"/>
+        <path class="cls-1" d="M120.4,48.4c-1.6,0-3-.3-4.4-.8-1.3-.5-2.5-1.3-3.5-2.3l1-1.8c1.1,1,2.2,1.7,3.2,2.2,1.1.5,2.2.7,3.5.7s2.7-.3,3.6-.9c.9-.6,1.4-1.4,1.4-2.6s-.2-1.3-.7-1.7c-.5-.4-1.1-.7-1.9-1-.8-.3-1.8-.5-3-.8-1.3-.4-2.4-.7-3.3-1.1-.9-.4-1.6-.9-2-1.5-.5-.6-.7-1.4-.7-2.4s.3-2.3.9-3.1c.6-.8,1.5-1.4,2.6-1.9,1.1-.4,2.3-.6,3.6-.6s2.8.2,3.9.7c1.1.5,2,1.1,2.7,1.9l-1.2,1.7c-.7-.8-1.5-1.4-2.4-1.7-.9-.4-2-.6-3.1-.6s-1.5.1-2.2.3c-.7.2-1.3.5-1.7,1-.5.5-.7,1.1-.7,1.9s.2,1.2.5,1.6c.3.4.9.7,1.5.9.7.3,1.5.5,2.5.8,1.4.4,2.7.8,3.8,1.2,1.1.4,1.9.9,2.5,1.5s.9,1.5.9,2.7c0,1.8-.7,3.1-2,4.1-1.3,1-3.1,1.5-5.3,1.5Z"/>
+        <path class="cls-1" d="M141.1,48.4c-1.5,0-2.9-.4-4.1-1.2-1.3-.8-2.3-1.7-3-2.9v3.7h-2.2v-26.7h2.5v11.7c.9-1.3,1.9-2.3,3.1-3.1,1.2-.8,2.6-1.2,4.2-1.2s2.5.3,3.6.8c1.1.6,2,1.3,2.7,2.2.8.9,1.3,2,1.7,3.2.4,1.2.6,2.4.6,3.6s-.2,2.6-.7,3.7c-.5,1.2-1.1,2.2-1.9,3.1-.8.9-1.8,1.6-2.9,2.1-1.1.5-2.3.8-3.6.8ZM140.5,46.2c1,0,2-.2,2.9-.6s1.6-1,2.3-1.7c.6-.7,1.1-1.5,1.5-2.4.3-.9.5-1.8.5-2.8s-.3-2.6-.9-3.8c-.6-1.2-1.4-2.1-2.4-2.8-1-.7-2.2-1.1-3.6-1.1s-1.9.2-2.7.7c-.8.4-1.6,1-2.2,1.7-.6.7-1.2,1.5-1.6,2.3v5.9c0,.7.4,1.3.8,1.8.4.6.9,1.1,1.6,1.5s1.3.7,2,1c.7.2,1.3.4,2,.4Z"/>
+        <path class="cls-1" d="M154.2,40.2v-11.1h2.5v10.7c0,2.2.4,3.8,1.1,4.8.7,1.1,1.8,1.6,3.3,1.6s1.9-.2,2.8-.6c.9-.4,1.7-1,2.4-1.8.7-.8,1.2-1.7,1.6-2.7v-11.9h2.5v16c0,.3,0,.6.2.7.1.2.4.2.7.3v2c-.3,0-.5,0-.7,0-.2,0-.3,0-.5,0-.5,0-.9-.2-1.3-.6-.4-.3-.5-.8-.6-1.2v-2.5c-.9,1.5-2,2.6-3.5,3.4-1.4.8-3,1.2-4.6,1.2s-3.5-.7-4.5-2.1c-1-1.4-1.5-3.4-1.5-6.1Z"/>
+        <path class="cls-1" d="M185.6,31.1c-1.7,0-3.1.5-4.4,1.4-1.3.9-2.1,2.1-2.7,3.6v11.8h-2.5v-19h2.3v4.5c.7-1.3,1.5-2.4,2.6-3.3,1.1-.8,2.2-1.3,3.5-1.4.2,0,.5,0,.6,0s.3,0,.5,0v2.3Z"/>
+        <path class="cls-1" d="M188.9,25v-3.7h2.5v3.7h-2.5ZM188.9,48v-19h2.5v19h-2.5Z"/>
+        <path class="cls-1" d="M205.1,48.4c-1.4,0-2.6-.3-3.8-.8-1.2-.5-2.2-1.2-3-2.1-.9-.9-1.5-2-2-3.1-.5-1.2-.7-2.5-.7-3.8s.4-3.4,1.2-4.9c.8-1.5,1.9-2.7,3.4-3.5,1.4-.9,3.1-1.3,4.9-1.3s3.5.4,4.9,1.3c1.4.9,2.5,2.1,3.3,3.5.8,1.5,1.2,3.1,1.2,4.8v.6c0,.2,0,.3,0,.4h-16.3c.1,1.4.5,2.6,1.2,3.6.6,1.1,1.5,1.9,2.5,2.5,1,.6,2.2.9,3.4.9s2.4-.3,3.5-1c1.1-.6,1.9-1.5,2.3-2.5l2.2.6c-.4.9-1,1.7-1.8,2.4-.8.7-1.7,1.3-2.8,1.7-1.1.4-2.2.6-3.5.6ZM198.1,37.6h14.1c0-1.4-.5-2.6-1.1-3.6-.6-1-1.5-1.9-2.5-2.4-1-.6-2.2-.9-3.4-.9s-2.4.3-3.4.9c-1,.6-1.9,1.4-2.5,2.5-.6,1-1,2.2-1.1,3.6Z"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file

diff --git a/less/00-constants.less b/less/00-constants.less
index ad2c0eb627edcd1953ece2469af8a052d40fcb76..d164bbfcf65aa7b29b8555afc7982064bb94de20 100644 (file)
--- a/less/00-constants.less
+++ b/less/00-constants.less
@@ -2,10 +2,11 @@
 @small : ~"screen and (max-width: 1024px)";
 
 // Todo: replace variables properly
-@roboto: 'Rubik', sans-serif;
-@Klavika: 'Rubik', sans-serif;
+@roboto: 'Raleway', sans-serif;
+@Klavika: 'Raleway', sans-serif;
 
-@yellow: #f6ae01;
+@yellow: #469ef6;
+@black: #242323;
 
 @import "01-mixins";
 @import "02-utilities";

diff --git a/less/admin.less b/less/admin.less
index bb64e7af11846b87e8000fa14376f88e4578c996..00d937e991f4f33a61800f448f459b6060a476d3 100644 (file)
--- a/less/admin.less
+++ b/less/admin.less
@@ -5,7 +5,7 @@
                display: none;
        }
 
-       background: #f6ae01;
+       background: @yellow;
        padding: 3px 0 3px;
     position: absolute; // Needed to make it sit above header. Could also be 'fixed'...
     width: 100%;

diff --git a/less/agence.less b/less/agence.less
index 69e62d2994d31ee164a14644dd27f1e991c80421..123e19f50c1460d639145b7e1f3f376654713c74 100644 (file)
--- a/less/agence.less
+++ b/less/agence.less
@@ -74,7 +74,7 @@
 /* Agence equipe */
 .agency-persons {
        background-color: #fff;
-       color: #222428;
+       color: @black;
        .bloc-holder {
                overflow: hidden;
        }

diff --git a/less/common.less b/less/common.less
index 0a3010af8d9e75065ebf75d83a46bc0d3387e35c..a3858b6a0ce87daaf174f1469973df18f8c1e2e6 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -3,202 +3,214 @@
 /* apply a natural box layout model to all elements, but allowing components to change */
 /* Reference: http://www.paulirish.com/2012/box-sizing-border-box-ftw/ */
 html {
-       box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 *, *:before, *:after {
-       box-sizing: inherit;
+  box-sizing: inherit;
 }
 
 img.responsive {
-       max-width: 100%;
-       height: auto;
+  max-width: 100%;
+  height: auto;
 }
 
 .content, .cubeit-content {
-       .content-center();
-       position: relative;
+  .content-center();
+  position: relative;
 
 }
 
 body {
-       background-color: #fafafa;
-       font-family: @roboto;
-       font-size: 18px;
-       font-weight: 300;
-       color: #1b1b1b;
-       opacity: 0;
-       transition: opacity 0.25s linear;
+  background-color: #fafafa;
+  font-family: @roboto;
+  font-size: 18px;
+  font-weight: 300;
+  color: #1b1b1b;
+  opacity: 0;
+  transition: opacity 0.25s linear;
 }
 
 #wrapper {
-       background-color: #fff;
-       overflow: hidden;
-       max-width: @content-max-width;
-       min-width: 640px;
-       margin: 0 auto;
+  background-color: #fff;
+  overflow: hidden;
+  max-width: @content-max-width;
+  min-width: 640px;
+  margin: 0 auto;
 }
 
 .wf-active body {
-       opacity: 1;
+  opacity: 1;
 }
 
 h1, h2, h3, h4, h5, h6, blockquote {
-       font-family: @Klavika;
-       transform: rotate(0.1deg); // Hack to fix poor rendering on Chrome + Windows (forces anti-aliasing)
-       -webkit-font-smoothing: antialiased;
+  font-family: @Klavika;
+  transform: rotate(0.1deg); // Hack to fix poor rendering on Chrome + Windows (forces anti-aliasing)
+  -webkit-font-smoothing: antialiased;
 }
 
 h1, h2, h3, h4, h5, h6 {
-       font-weight: 300;
+  font-weight: 300;
 }
 
 strong, b {
-       font-weight: 400;
+  font-weight: 400;
 }
 
 a {
-       color: #222428;
-       text-decoration: none;
-       transition: color 0.3s;
-       &:hover,
-       &:active {
-               color: @yellow;
-       }
-
-       &.inverted {
-               color: @yellow;
-
-               &:hover, &:active {
-                       color: #222428;
-               }
-       }
-
-       &.arrow-link {
-               .link(#222428, @yellow);
-               display: inline-block;
-               vertical-align: middle;
-
-               &:hover {
-                       svg {
-                               transform: translateX(0.25em);
-                       }
-               }
-
-               svg {
-                       fill: currentColor;
-                       display: inline-block;
-                       vertical-align: middle;
-                       height: 0.5em;
-                       width: auto;
-                       margin-left: 1em;
-                       transition: transform 0.15s ease-out;
-               }
-       }
-
-       &.but {
-               display: inline-block;
-               clear: both;
-
-               border-radius: 2px;
-               border: 2px solid @yellow;
-               padding: 13px;
-               line-height: 12px;
-               margin: 15px 0 0 0;
-               font-weight: 400;
-               font-size: 16px;
-               text-decoration: none !important;
-               text-transform: uppercase;
-               transition: all 0.3s;
-
-               .button(#fff, @yellow, @yellow, transparent);
-       }
+  color: @black;
+  text-decoration: none;
+  transition: color 0.3s;
+
+  &:hover,
+  &:active {
+    color: @yellow;
+  }
+
+  &.inverted {
+    color: @yellow;
+
+    &:hover, &:active {
+      color: @black;
+    }
+  }
+
+  &.animated-arrow{
+    text-transform: uppercase;
+  }
+
+  &.arrow-link {
+    .link(@black, @yellow);
+    display: inline-block;
+    vertical-align: middle;
+
+    &:hover {
+      svg {
+        transform: translateX(0.25em);
+      }
+    }
+
+    svg {
+      fill: currentColor;
+      display: inline-block;
+      vertical-align: middle;
+      height: 0.5em;
+      width: auto;
+      margin-left: 1em;
+      transition: transform 0.15s ease-out;
+      position: relative;
+    }
+  }
+
+  &.but {
+    display: inline-block;
+    clear: both;
+
+    border-radius: 2px;
+    border: 2px solid @yellow;
+    padding: 13px;
+    line-height: 12px;
+    margin: 15px 0 0 0;
+    font-weight: 400;
+    font-size: 16px;
+    text-decoration: none !important;
+    text-transform: uppercase;
+    transition: all 0.3s;
+
+    .button(#fff, @yellow, @yellow, transparent);
+  }
 }
 
 #main {
-       overflow-x: hidden;
-       overflow-y: visible;
-
-       .main-holder {
-               width: 100%;
-               padding: 0 20px 50px 20px;
-       }
-       ul {
-               list-style: none;
-               li {
-                       line-height: 1.4;
-                       &:before {
-                               content: "- ";
-                       }
-               }
-       }
+  overflow-x: hidden;
+  overflow-y: visible;
+
+  .main-holder {
+    width: 100%;
+    padding: 0 20px 50px 20px;
+  }
+
+  ul {
+    list-style: none;
+
+    li {
+      line-height: 1.4;
+
+      &:before {
+        content: "- ";
+      }
+    }
+  }
 }
 
 .title {
-       margin: 50px 0 10px;
-       h1 {
-               text-align: left;
-               font-size: 56px;
-               line-height: 1;
-               margin-bottom: 20px;
-       }
-       h2 {
-               text-align: left;
-               font-size: 26px;
-               line-height: 1.3;
-               white-space: pre-line; // Preserve line breaks from content
-               font-family: @roboto;
-               text-transform: none;
-               font-weight: 300;
-
-               @media screen and (max-width: 980px) {
-                       white-space: normal;
-               }
-       }
+  margin: 50px 0 10px;
+
+  h1 {
+    text-align: left;
+    font-size: 56px;
+    line-height: 1;
+    margin-bottom: 20px;
+  }
+
+  h2 {
+    text-align: left;
+    font-size: 26px;
+    line-height: 1.3;
+    white-space: pre-line; // Preserve line breaks from content
+    font-family: @roboto;
+    text-transform: none;
+    font-weight: 300;
+
+    @media screen and (max-width: 980px) {
+      white-space: normal;
+    }
+  }
 }
 
 .text-block {
-       max-width: 54rem; // = 864px or 45% of 1920px
+  max-width: 54rem; // = 864px or 45% of 1920px
 }
 
 .dotclear {
-       a {
-               //color: #1b1b1b;
-               text-decoration: underline;
-       }
+  a {
+    //color: #1b1b1b;
+    text-decoration: underline;
+  }
 
-       h1, h2 {
-               &:not(:last-child) {
-                       margin-bottom: 0.75em;
-               }
-       }
+  h1, h2 {
+    &:not(:last-child) {
+      margin-bottom: 0.75em;
+    }
+  }
 
-       p {
-               line-height: 1.6;
-       }
+  p {
+    line-height: 1.6;
+  }
 }
 
 .ajaxpopup {
-       .dotclear {
-               font-size: 16px;
-               p {
-                       margin: 10px 0;
-               }
+  .dotclear {
+    font-size: 16px;
+
+    p {
+      margin: 10px 0;
+    }
 
-               h2 {
-                       font-weight: 400;
-               }
-       }
+    h2 {
+      font-weight: 400;
+    }
+  }
 
 }
 
 // Standard select dropdown
 .form-select {
-       appearance: none;
-       padding-right: 1.5em;
-       background: url('data:image/svg+xml;utf8,<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 14.6 8" style="enable-background:new 0 0 14.6 8;" xml:space="preserve"><path d="M14.3,0.4c-0.2-0.2-0.5-0.2-0.7,0L7.3,6.6L1.1,0.4c-0.2-0.2-0.5-0.2-0.7,0s-0.2,0.5,0,0.7L7,7.7c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.4,0.1c0,0,0,0,0,0s0,0,0,0c0.1,0,0.3,0,0.4-0.1c0,0,0,0,0,0l6.6-6.6C14.5,0.9,14.5,0.5,14.3,0.4z"/></svg>') center right no-repeat;
-       background-size: auto 0.4em;
-       border: none;
-       border-radius: 0;
-       font-size: 18px;
+  appearance: none;
+  padding-right: 1.5em;
+  background: url('data:image/svg+xml;utf8,<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 14.6 8" style="enable-background:new 0 0 14.6 8;" xml:space="preserve"><path d="M14.3,0.4c-0.2-0.2-0.5-0.2-0.7,0L7.3,6.6L1.1,0.4c-0.2-0.2-0.5-0.2-0.7,0s-0.2,0.5,0,0.7L7,7.7c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.4,0.1c0,0,0,0,0,0s0,0,0,0c0.1,0,0.3,0,0.4-0.1c0,0,0,0,0,0l6.6-6.6C14.5,0.9,14.5,0.5,14.3,0.4z"/></svg>') center right no-repeat;
+  background-size: auto 0.4em;
+  border: none;
+  border-radius: 0;
+  font-size: 18px;
 }

diff --git a/less/footer.less b/less/footer.less
index 14c1393e911d615699fbc1c643dfc4862079762c..ea06d371b6a6b8283f5d15f579c9b8e7b09af77c 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -184,7 +184,7 @@
                        float: left;
 
                        a {
-                               .link(#222428, @yellow);
+                               .link(@black, @yellow);
                        }
                }
 

diff --git a/less/header.less b/less/header.less
index 3bf026d45aa1419d9b155c461c48e8c67185f45c..b58bf29f3afd98e518f707f9476fcabe7f14f0e1 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -4,7 +4,7 @@
 
 header {
        height: 130px;
-       color: #222428;
+       color: @black;
        z-index: 100; // Some elements on case studies page have a higher z-index so make sure we are above that
        position: fixed;
        top: 0;
@@ -99,6 +99,7 @@ header {
                margin: 59px 0 0;
                float: right;
                li {
+                       text-transform: uppercase;
                        &:not(:last-child) {
                                margin-right: 40px;
                        }
@@ -196,7 +197,7 @@ header {
 
                // When menu is open, white background is in place so force dark colour
                &.menu-active {
-                       color: #222428 !important;
+                       color: @black !important;
                }
        }
 

diff --git a/less/home.less b/less/home.less
index 3a64b606c99be7c94c540be6c1b51a0cad36ba4b..bd80acac961ce0d2d21f15f735e966887e71a826 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -64,7 +64,7 @@ nav.active[role="navigation"] {
                                        left: 0;
                                        width: 100%;
                                        height: 100%;
-                                       background-color: #222428; // Base colour needed so menu and text is readable before image loads
+                                       background-color: @black; // Base colour needed so menu and text is readable before image loads
                                        background-size: cover;
                                        background-repeat: no-repeat;
                                        background-position: 50% 0;
@@ -137,7 +137,7 @@ nav.active[role="navigation"] {
 }
 
 #casestudies {
-       background-color: #222428;
+       background-color: @black;
        color: #fff;
        font-size: 22px;
        padding: 10px 0 70px 0;

diff --git a/less/link-arrow.less b/less/link-arrow.less
index 25666b7097ec71a53bd65c00fde711bf35a32a54..1338fb6db6e9aabf5141162751c6474bd47a79fe 100644 (file)
--- a/less/link-arrow.less
+++ b/less/link-arrow.less
@@ -3,7 +3,6 @@
 @import "00-constants";
 
 // Variables
-@black: #222428;
 @hover-color: @yellow;
 
 @text-arrow-space: 10px;
@@ -19,12 +18,13 @@
 // The Arrow
 .the-arrow {
   width: @shaft-width;
+  top:0px;
   //transition: transform 0.2s;
 
   &.-left {
     position: absolute;
-    top: 60%;
     left: 0;
+    top:9px;
 
     > .shaft {
       //width: 0;
@@ -53,7 +53,7 @@
   }
 
   &.-right {
-    top: 3px;
+
 
     > .shaft {
       width: @shaft-width;

diff --git a/less/list.less b/less/list.less
index 001e033ccfa90d53aa4f766cd9ce376f421519f6..08de4e150bbcfae694f3f5deeb7373d4512578b2 100644 (file)
--- a/less/list.less
+++ b/less/list.less
@@ -2,7 +2,7 @@
 
 section.list {
   padding: 60px 0;
-  color: #222428;
+  color: @black;
 
   &.white {
     background-color: #fff;

diff --git a/less/news.less b/less/news.less
index 77f53b2961788b839da163d895a4c859e813594f..21f4b0aeeed1690aa41c1aef03b3e5ec1351ae01 100644 (file)
--- a/less/news.less
+++ b/less/news.less
@@ -6,7 +6,7 @@
     margin: 34px 0 100px 0;
 
     a {
-      color: #222428;
+      color: @black;
     }
 }