From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 17 Feb 2025 16:06:43 +0000 (+0100)
Subject: wip #7257 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=31f8641dcb632f7b17b3aa40f6c6314d52238fc3;p=fluidbook-v3.git

wip #7257 @3
---

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index d277fc2..f66b5e1 100644
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -1,104 +1,105 @@
 version: '3.1'
 services:
-    fluidbook-v3-httpd:
-        container_name: fluidbook-v3-httpd
-        build: './images/httpd'
-        working_dir: /application
-        volumes:
-            - './www/:/usr/local/apache2/htdocs'
-            - './www/:/application/'
-            - './config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
-        environment:
-            VIRTUAL_HOST: www.fluidbook.com,en.fluidbook.com,fluidbook.com,elearning.fluidbook.com,fr.elearning.fluidbook.com
-            LETSENCRYPT_HOST: www.fluidbook.com,en.fluidbook.com,fluidbook.com,elearning.fluidbook.com,fr.elearning.fluidbook.com
-        restart: unless-stopped
-        networks:
-          - nginxproxy
-          - fluidbook-v3
+  fluidbook-v3-httpd:
+    container_name: fluidbook-v3-httpd
+    build: './images/httpd'
+    working_dir: /application
+    volumes:
+      - './www/:/usr/local/apache2/htdocs'
+      - './www/:/application/'
+      - './config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
+    environment:
+      VIRTUAL_HOST: www.fluidbook.com,en.fluidbook.com,fluidbook.com,elearning.fluidbook.com,fr.elearning.fluidbook.com
+      LETSENCRYPT_HOST: www.fluidbook.com,en.fluidbook.com,fluidbook.com,elearning.fluidbook.com,fr.elearning.fluidbook.com
+    restart: unless-stopped
+    networks:
+      - nginxproxy
+      - fluidbook-v3
 
-    fluidbook-v3:
-        container_name: fluidbook-v3
-        hostname: fluidbook-v3
-        build: './images/php-fpm'
-        working_dir: /application
-        volumes:
-            # SSH
-            - './config/ssh/root/:/root/.ssh/'
-            - './config/ssh/user/:/application/.ssh/'
-            - './config/ssh/server/:/etc/ssh/'
-            # Rsyslog
-            - './config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'
-            - './config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'
-            # Composer
-            - './config/composer/:/root/.config/composer/'
-            - './config/composer/:/application/.config/composer/'
-            # Sudoers
-            - './config/sudoers:/etc/sudoers.d/fluidbook-v3'
-            # ImageMagick
-            - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'
-            # Passwords
-            - './config/passwords:/root/passwords'
-            # Cron
-            - './config/cron/crontab:/etc/crontab'
-            # PHP
-            - './config/php.ini:/etc/php/8.3/fpm/conf.d/99-overrides.ini'
-            # Web path
-            - './www:/application'
-        tmpfs:
-            - /home/tmp
-            - /application/framework/data/temp
-        ports:
-          - '38840:22'
-        restart: unless-stopped
-        networks:
-          - fluidbook-v3
+  fluidbook-v3:
+    container_name: fluidbook-v3
+    hostname: fluidbook-v3
+    build: './images/php-fpm'
+    working_dir: /application
+    volumes:
+      # SSH
+      - './config/ssh/root/:/root/.ssh/'
+      - './config/ssh/user/:/application/.ssh/'
+      - './config/ssh/server/:/etc/ssh/'
+      # Rsyslog
+      - './config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'
+      - './config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'
+      # Composer
+      - './config/composer/:/root/.config/composer/'
+      - './config/composer/:/application/.config/composer/'
+      # Sudoers
+      - './config/sudoers:/etc/sudoers.d/fluidbook-v3'
+      # ImageMagick
+      - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'
+      # Passwords
+      - './config/passwords:/root/passwords'
+      # Cron
+      - './config/cron/crontab:/etc/crontab'
+      # PHP
+      - './config/php.ini:/etc/php/8.3/fpm/conf.d/99-overrides.ini'
+      # Web path
+      - './www:/application'
+    tmpfs:
+      - /home/tmp
+      - /application/framework/data/temp
+    ports:
+      - '38840:22'
+    restart: unless-stopped
+    networks:
+      - fluidbook-v3
 
-    adminer:
-      image: 'adminer:latest'
-      container_name: fluidbook-v3-adminer
-      restart: unless-stopped
-      environment:
-        ADMINER_DEFAULT_SERVER: fluidbook-v3-mariadb
-        VIRTUAL_HOST: adminer.fluidbook.com
-        LETSENCRYPT_HOST: adminer.fluidbook.
-      networks:
-        - fluidbook-v3
+  adminer:
+    image: 'adminer:latest'
+    container_name: fluidbook-v3-adminer
+    restart: unless-stopped
+    environment:
+      ADMINER_DEFAULT_SERVER: fluidbook-v3-mariadb
+      VIRTUAL_HOST: adminer.fluidbook.com
+      LETSENCRYPT_HOST: adminer.fluidbook.com
+    networks:
+      - fluidbook-v3
+      - nginxproxy
 
-    fluidbook-v3-mariadb:
-        container_name: fluidbook-v3-mariadb
-        image: 'mariadb:latest'
-        restart: unless-stopped
-        environment:
-          MARIADB_ROOT_PASSWORD: FB8qVD7R0jqsXYNR
-          MARIADB_DATABASE: fluidbook-v3
-          MARIADB_AUTO_UPGRADE: 1
-        volumes:
-          - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
-          - "./database/scripts/:/usr/local/bin/scripts/"
-          - "./database/data:/var/lib/mysql"
-          - './config/mariadb:/etc/mysql/conf.d:z'
-        logging:
-          driver: json-file
-          options:
-            max-size: 10M
-            max-file: 10
-        networks:
-          - fluidbook-v3
+  fluidbook-v3-mariadb:
+    container_name: fluidbook-v3-mariadb
+    image: 'mariadb:latest'
+    restart: unless-stopped
+    environment:
+      MARIADB_ROOT_PASSWORD: FB8qVD7R0jqsXYNR
+      MARIADB_DATABASE: fluidbook-v3
+      MARIADB_AUTO_UPGRADE: 1
+    volumes:
+      - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
+      - "./database/scripts/:/usr/local/bin/scripts/"
+      - "./database/data:/var/lib/mysql"
+      - './config/mariadb:/etc/mysql/conf.d:z'
+    logging:
+      driver: json-file
+      options:
+        max-size: 10M
+        max-file: 10
+    networks:
+      - fluidbook-v3
 
-    mysqlbackup:
-      image: selim13/automysqlbackup
-      container_name: fluidbook-v3-automysqlbackup
-      volumes:
-        - "./database/backup:/backup"
-      environment:
-        USERNAME: root
-        PASSWORD: FB8qVD7R0jqsXYNR
-        DBHOST: fluidbook-v3-mariadb
-        DBEXCLUDE: "performance_schema information_schema"
-        CRON_SCHEDULE: "0 0 * * *"
-        EXTRA_OPTS: "--single-transaction"
-      networks:
-        - fluidbook-v3
+  mysqlbackup:
+    image: selim13/automysqlbackup
+    container_name: fluidbook-v3-automysqlbackup
+    volumes:
+      - "./database/backup:/backup"
+    environment:
+      USERNAME: root
+      PASSWORD: FB8qVD7R0jqsXYNR
+      DBHOST: fluidbook-v3-mariadb
+      DBEXCLUDE: "performance_schema information_schema"
+      CRON_SCHEDULE: "0 0 * * *"
+      EXTRA_OPTS: "--single-transaction"
+    networks:
+      - fluidbook-v3
 
 networks:
   nginxproxy:
diff --git a/.docker/production/update b/.docker/production/update
index a413e51..63c1bcf 100644
--- a/.docker/production/update
+++ b/.docker/production/update
@@ -9,6 +9,7 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
 docker compose down -v
+rm -f ./database/data/tc.log
 docker compose up -d
 
 ufw-docker allow fluidbook-v3
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2fd453f..f0eb2cc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7257 @0.75">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7264 @2">
+      <change beforePath="$PROJECT_DIR$/.docker/production/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/production/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/views/scripts/common/body.phtml" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/scripts/common/body.phtml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Db.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Db.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/Bootstrap.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/Bootstrap.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/Zend/View/Helper/Navigation/Sitemap.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/Zend/View/Helper/Navigation/Sitemap.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/Zend/Xml/Security.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/Zend/Xml/Security.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/less/104-nav.less" beforeDir="false" afterPath="$PROJECT_DIR$/less/104-nav.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -263,33 +264,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Works/FluidbookWebV3/framework/library/CubeIT/Bootstrap",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookWebV3/framework/library/CubeIT/Bootstrap&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookWebV3\framework\library\CubeIT\Bootstrap" />
@@ -397,6 +398,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="ArquillianJUnit" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -485,6 +492,31 @@
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <method v="2" />
     </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG">
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <pass-parent-envs>true</pass-parent-envs>
+      <method v="2" />
+    </configuration>
     <configuration default="true" type="tests" factoryName="Attests">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -810,7 +842,9 @@
       <workItem from="1728998686616" duration="8507000" />
       <workItem from="1731579305063" duration="12263000" />
       <workItem from="1739209041347" duration="1137000" />
-      <workItem from="1739539005844" duration="4203000" />
+      <workItem from="1739539005844" duration="4288000" />
+      <workItem from="1739788502594" duration="628000" />
+      <workItem from="1739800972227" duration="5782000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1155,7 +1189,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="174" />
+    <option name="localTasksCounter" value="175" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 6e093ae..2f6e779 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -33,15 +33,13 @@ class Bootstrap extends CubeIT_Bootstrap
 
     protected function _makeNavigationOnePage(&$navigation, $r, $t, $isAdmin, $locale = false)
     {
+
+        $page = parent::_makeNavigationOnePage($navigation, $r, $t, $isAdmin, $locale);
         // Remove all reference of the blog on the english version
         if ($r->template === 'blog' && $locale === 'en') {
-            if (!$isAdmin) {
-                return;
-            } else {
-                $r->online = false;
-            }
+            $page->setMenu(false);
+            $page->setSitemap(false);
         }
-        $page = parent::_makeNavigationOnePage($navigation, $r, $t, $isAdmin, $locale);
 
         if (!$page) return;
 
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 5afde8f..ced1009 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -52,8 +52,6 @@ acl.roles[] = admin
 
 mail.test = APPLICATION_PATH "/../data/email/test"
 
-compat_ie = 9
-
 privacy.dnt = 1
 privacy.analytics = 1
 
diff --git a/framework/library/CubeIT/Bootstrap/Navigation.php b/framework/library/CubeIT/Bootstrap/Navigation.php
index 4d374ee..57a4213 100644
--- a/framework/library/CubeIT/Bootstrap/Navigation.php
+++ b/framework/library/CubeIT/Bootstrap/Navigation.php
@@ -24,48 +24,39 @@ class CubeIT_Bootstrap_Navigation extends CubeIT_Bootstrap_Locale
         profile(__FILE__, __LINE__, 'Make Application navigation');
 
 
-        $cache = $this->getCoreCache();
-
         $isAdmin = $this->isAllowed('administration');
         $cacheId = $this->_getNavigationCacheId($isAdmin, $full);
 
-        $mtime = max(filemtime(CubeIT_Util_PHP::getFileDeclaring($this)), filemtime(__FILE__));
-        $meta = $cache->getMetadatas($cacheId);
-
-        if (!$this->_cacheNavigation || $refresh || !$cache->test($cacheId) || $mtime > $meta['mtime']) {
-            $navigation = $this->_createNavigation($isAdmin);
+        $navigation = $this->_createNavigation($isAdmin);
 
-            $r = $this->navRoot;
-            if ($full) {
-                $r = null;
-            }
+        $r = $this->navRoot;
+        if ($full) {
+            $r = null;
+        }
 
-            if ($this->isMultilang()) {
-                $this->_makeNavigationMultiLocale($navigation, $isAdmin, $r);
-            } else {
-                $this->_makeNavigationMonoLocale($navigation, $isAdmin, $r);
-            }
+        if ($this->isMultilang()) {
+            $this->_makeNavigationMultiLocale($navigation, $isAdmin, $r);
+        } else {
+            $this->_makeNavigationMonoLocale($navigation, $isAdmin, $r);
+        }
 
-            if (!$isAdmin) {
-                foreach ($this->_getNextRedirectionTemplates() as $template) {
-                    foreach ($navigation->findAllByTemplate($template) as $p) {
-                        $p->setUri($p->getFinalUri());
-                    }
-                }
-                foreach ($navigation->findAllByTemplate('pageredirection') as $p) {
-                    $p->setUri($p->getFinalUri());
-                }
-                foreach ($navigation->findAllByTemplate('subredirection') as $p) {
+        if (!$isAdmin) {
+            foreach ($this->_getNextRedirectionTemplates() as $template) {
+                foreach ($navigation->findAllByTemplate($template) as $p) {
                     $p->setUri($p->getFinalUri());
                 }
             }
-            if ($this->_cacheNavigation) {
-                $cache->save($navigation, $cacheId, array('navigation'));
-                $navigation->archive($this->getDb());
+            foreach ($navigation->findAllByTemplate('pageredirection') as $p) {
+                $p->setUri($p->getFinalUri());
+            }
+            foreach ($navigation->findAllByTemplate('subredirection') as $p) {
+                $p->setUri($p->getFinalUri());
             }
-        } else {
-            $navigation = $cache->load($cacheId, false);
         }
+        if ($this->_cacheNavigation) {
+            $navigation->archive($this->getDb());
+        }
+
         return $navigation;
     }
 
diff --git a/less/104-nav.less b/less/104-nav.less
index a2ef367..201fcf4 100644
--- a/less/104-nav.less
+++ b/less/104-nav.less
@@ -1,331 +1,354 @@
 @import "000-imports";
 
 nav {
-	font-family: @montserrat;
-	font-weight: 300;
-	a {
-		text-transform: uppercase;
-		text-decoration: none;
-		font-size: 12px;
-		color: @color-header-grey;
-
-		&:hover {
-			color: currentColor;
-		}
-	}
-	ul {
-		list-style: none;
-		li {
-			display: inline-block;
-		}
-	}
+  font-family: @montserrat;
+  font-weight: 300;
+
+  a {
+    text-transform: uppercase;
+    text-decoration: none;
+    font-size: 12px;
+    color: @color-header-grey;
+
+    &:hover {
+      color: currentColor;
+    }
+  }
+
+  ul {
+    list-style: none;
+
+    li {
+      display: inline-block;
+    }
+  }
+
+  li:empty {
+    display: none;
+  }
 }
 
 nav#menu {
-	position: absolute;
-	top: 60px;
-	left: 44%; // Must be kept in sync with TweenMax value in 101-header.js
-	transform: translateX(-50%);
-	margin-left: 36px; // Extra spacing for logo symbol
-
-	@media @m1320 { // Left align menu
-		transform: none !important;
-		left: 0 !important;
-		top: 26px !important;
-	}
-
-	@media @bp-menu {
-		display: none;
-	}
-
-	a {
-		line-height: 9px;
-		border: 1px solid transparent;
-		padding-bottom: 13px;
-		display: inline-block;
-	}
-
-	> ul {
-		> li {
-
-			margin: 0 25px;
-			position: relative;
-
-			@media @m1280 {
-				margin: 0 15px;
-			}
-
-			@media (max-width: 900px) {
-				margin: 0 7px;
-			}
-
-			> a {
-				position: relative;
-				&:after {
-					content: "";
-					height: 1px;
-					width: 0;
-					position: absolute;
-					background-color: @color-header-grey;
-					left: 0;
-					bottom: 0;
-					transition: @transition-time-buttons width;
-				}
-			}
-
-			&.active > a, a:hover {
-				color: @color-header-grey;
-				&:after {
-					width: 100%;
-				}
-			}
-			&:hover {
-				> ul {
-					display: block;
-				}
-			}
-
-			> ul {
-				position: absolute;
-				top: 40px;
-				left: -20px;
-				background-color: #fff;
-				box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-				white-space: nowrap;
-				display: none;
-				&:before {
-					content: "";
-					background-color: transparent;
-					height: 20px;
-					width: 100%;
-					top: -20px;
-					left: 0px;
-					position: absolute;
-				}
-
-				> li {
-					display: block;
-					text-align: left;
-
-					margin: 10px 20px;
-
-					a {
-						transition: @transition-time-buttons color;
-
-						header#h.light & {
-							color: @color-header-grey;
-						}
-					}
-
-					&.active a, a:hover {
-						border-bottom-color: transparent;
-						color: @color-submenu-hover !important;
-					}
-				}
-			}
-		}
-	}
+  position: absolute;
+  top: 60px;
+  left: 44%; // Must be kept in sync with TweenMax value in 101-header.js
+  transform: translateX(-50%);
+  margin-left: 36px; // Extra spacing for logo symbol
+
+  @media @m1320 {
+    // Left align menu
+    transform: none !important;
+    left: 0 !important;
+    top: 26px !important;
+  }
+
+  @media @bp-menu {
+    display: none;
+  }
+
+  a {
+    line-height: 9px;
+    border: 1px solid transparent;
+    padding-bottom: 13px;
+    display: inline-block;
+  }
+
+  > ul {
+    > li {
+
+      margin: 0 25px;
+      position: relative;
+
+      @media @m1280 {
+        margin: 0 15px;
+      }
+
+      @media (max-width: 900px) {
+        margin: 0 7px;
+      }
+
+      > a {
+        position: relative;
+
+        &:after {
+          content: "";
+          height: 1px;
+          width: 0;
+          position: absolute;
+          background-color: @color-header-grey;
+          left: 0;
+          bottom: 0;
+          transition: @transition-time-buttons width;
+        }
+      }
+
+      &.active > a, a:hover {
+        color: @color-header-grey;
+
+        &:after {
+          width: 100%;
+        }
+      }
+
+      &:hover {
+        > ul {
+          display: block;
+        }
+      }
+
+      > ul {
+        position: absolute;
+        top: 40px;
+        left: -20px;
+        background-color: #fff;
+        box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+        white-space: nowrap;
+        display: none;
+
+        &:before {
+          content: "";
+          background-color: transparent;
+          height: 20px;
+          width: 100%;
+          top: -20px;
+          left: 0px;
+          position: absolute;
+        }
+
+        > li {
+          display: block;
+          text-align: left;
+
+          margin: 10px 20px;
+
+          a {
+            transition: @transition-time-buttons color;
+
+            header#h.light & {
+              color: @color-header-grey;
+            }
+          }
+
+          &.active a, a:hover {
+            border-bottom-color: transparent;
+            color: @color-submenu-hover !important;
+          }
+        }
+      }
+    }
+  }
 }
 
 nav#contactnav {
-	position: absolute;
-	right: 0;
-	bottom: 1px;
-
-	@media @bp-menu {
-		bottom: -10px;
-	}
-
-	@media @m768 {
-		bottom: 5px;
-	}
-
-	li {
-		margin-left: 19px;
-		@media (max-width: 900px ) {
-			margin-left: 10px;
-		}
-	}
-	a {
-		.rounded-button();
-		&.quoteLink {
-			.background-button-green();
-			color: #fff;
-			line-height: 1;
-			@media @m640 {
-				display: none;
-			}
-
-			position: relative;
-		}
-		&.agencies {
-			.border-button-fill(@color-header-grey, #c2c4c7, 5%);
-			line-height: 1;
-			@media @bp-menu {
-				display: none;
-			}
-		}
-		.smallarrow-button(10px, 30px, 10px, 7px);
-
-		@media @m1024 {
-			padding-left: 15px;
-			padding-right: 15px;
-		}
-
-		@media @bp-menu {
-			padding-left: 29px;
-			padding-right: 29px;
-		}
-
-		@media @m768 {
-			padding-left: 15px;
-			padding-right: 15px;
-		}
-	}
+  position: absolute;
+  right: 0;
+  bottom: 1px;
+
+  @media @bp-menu {
+    bottom: -10px;
+  }
+
+  @media @m768 {
+    bottom: 5px;
+  }
+
+  li {
+    margin-left: 19px;
+    @media (max-width: 900px ) {
+      margin-left: 10px;
+    }
+  }
+
+  a {
+    .rounded-button();
+
+    &.quoteLink {
+      .background-button-green();
+      color: #fff;
+      line-height: 1;
+      @media @m640 {
+        display: none;
+      }
+
+      position: relative;
+    }
+
+    &.agencies {
+      .border-button-fill(@color-header-grey, #c2c4c7, 5%);
+      line-height: 1;
+      @media @bp-menu {
+        display: none;
+      }
+    }
+
+    .smallarrow-button(10px, 30px, 10px, 7px);
+
+    @media @m1024 {
+      padding-left: 15px;
+      padding-right: 15px;
+    }
+
+    @media @bp-menu {
+      padding-left: 29px;
+      padding-right: 29px;
+    }
+
+    @media @m768 {
+      padding-left: 15px;
+      padding-right: 15px;
+    }
+  }
 }
 
 .macaron {
-	box-sizing: border-box;
-	display: inline-block;
-	position: absolute;
-	top: -22px;
-	right: -25px;
-	width: 45px;
-	height: 45px;
-	border-radius: 50%;
-	background-color: #f7807e;
-	color: #fff;
-	font-family: "Times New Roman", "Times", serif;
-	font-size: 19px;
-	text-align: center;
-	padding-top: 13px;
-	sup {
-		font-size: 50%;
-	}
-	z-index: 1;
-
-	@media @m1024 {
-		width: 35px;
-		height: 35px;
-		font-size: 17px;
-		padding-top: 8px;
-		top: -12px;
-		right: -18px;
-		line-height:17px;
-	}
-
-	@media @m640 {
-		position: absolute;
-		top: 12px;
-		right: auto;
-		margin-left:20px;
-		padding-top:6px;
-	}
+  box-sizing: border-box;
+  display: inline-block;
+  position: absolute;
+  top: -22px;
+  right: -25px;
+  width: 45px;
+  height: 45px;
+  border-radius: 50%;
+  background-color: #f7807e;
+  color: #fff;
+  font-family: "Times New Roman", "Times", serif;
+  font-size: 19px;
+  text-align: center;
+  padding-top: 13px;
+
+  sup {
+    font-size: 50%;
+  }
+
+  z-index: 1;
+
+  @media @m1024 {
+    width: 35px;
+    height: 35px;
+    font-size: 17px;
+    padding-top: 8px;
+    top: -12px;
+    right: -18px;
+    line-height: 17px;
+  }
+
+  @media @m640 {
+    position: absolute;
+    top: 12px;
+    right: auto;
+    margin-left: 20px;
+    padding-top: 6px;
+  }
 }
 
 #nav-icon {
-	width: 31px;
-	height: 26px;
-	position: fixed;
-	transform: rotate(0deg);
-	cursor: pointer;
-	top: 36px;
-	left: 50px;
-	display: none;
-	z-index: 12;
-
-	@media @bp-menu {
-		display: block;
-	}
-
-	@media @m768 {
-		width: 18px;
-		height: 18px;
-		top: 25px;
-		left: 25px;
-	}
-
-	&.light {
-		span {
-			background: #fff;
-			.mm-opening & {
-				background: #2a3743;
-			}
-		}
-	}
-
-	span {
-		display: block;
-		position: absolute;
-		height: 2px;
-		width: 100%;
-		background: #2a3743;
-		border-radius: 0px;
-		opacity: 1;
-		left: 0;
-		transform: rotate(0deg);
-		transition: .25s ease-in-out;
-
-		&:nth-child(1) {
-			top: 0px;
-		}
-		&:nth-child(2) {
-			top: 12px;
-			@media @m768 {
-				top: 8px;
-			}
-		}
-
-		&:nth-child(3) {
-			top: 26px;
-			@media @m768 {
-				top: 16px;
-			}
-		}
-	}
-
-	.mm-opened & {
-		span {
-			&:nth-child(1) {
-				top: 12px;
-				transform: rotate(135deg);
-				@media @m768 {
-					top: 8px;
-				}
-			}
-			&:nth-child(2) {
-				opacity: 0;
-				left: -30px;
-			}
-			&:nth-child(3) {
-				top: 12px;
-				transform: rotate(-135deg);
-				@media @m768 {
-					top: 8px;
-				}
-			}
-		}
-	}
+  width: 31px;
+  height: 26px;
+  position: fixed;
+  transform: rotate(0deg);
+  cursor: pointer;
+  top: 36px;
+  left: 50px;
+  display: none;
+  z-index: 12;
+
+  @media @bp-menu {
+    display: block;
+  }
+
+  @media @m768 {
+    width: 18px;
+    height: 18px;
+    top: 25px;
+    left: 25px;
+  }
+
+  &.light {
+    span {
+      background: #fff;
+
+      .mm-opening & {
+        background: #2a3743;
+      }
+    }
+  }
+
+  span {
+    display: block;
+    position: absolute;
+    height: 2px;
+    width: 100%;
+    background: #2a3743;
+    border-radius: 0px;
+    opacity: 1;
+    left: 0;
+    transform: rotate(0deg);
+    transition: .25s ease-in-out;
+
+    &:nth-child(1) {
+      top: 0px;
+    }
+
+    &:nth-child(2) {
+      top: 12px;
+      @media @m768 {
+        top: 8px;
+      }
+    }
+
+    &:nth-child(3) {
+      top: 26px;
+      @media @m768 {
+        top: 16px;
+      }
+    }
+  }
+
+  .mm-opened & {
+    span {
+      &:nth-child(1) {
+        top: 12px;
+        transform: rotate(135deg);
+        @media @m768 {
+          top: 8px;
+        }
+      }
+
+      &:nth-child(2) {
+        opacity: 0;
+        left: -30px;
+      }
+
+      &:nth-child(3) {
+        top: 12px;
+        transform: rotate(-135deg);
+        @media @m768 {
+          top: 8px;
+        }
+      }
+    }
+  }
 }
 
 header#h.light {
-	nav#menu {
-		a {
-			color: #fff;
-		}
-
-		> ul > li > a:after {
-			background-color: #fff;
-		}
-
-	}
-	nav#contactnav {
-		a {
-			&.agencies {
-				.border-button(#fff, #fff);
-			}
-		}
-	}
+  nav#menu {
+    a {
+      color: #fff;
+    }
+
+    > ul > li > a:after {
+      background-color: #fff;
+    }
+
+  }
+
+  nav#contactnav {
+    a {
+      &.agencies {
+        .border-button(#fff, #fff);
+      }
+    }
+  }
 }
 
 @import "105-mmenu";