From c5706e414edd02c92356a7c1672c5b1e0d4d8ce8 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 22 Jun 2016 14:55:42 +0000
Subject: [PATCH]

---
 .../views/scripts/common/footer.phtml         |  2 +-
 .../views/scripts/common/header.phtml         |  7 +++--
 js/002-common.js                              |  1 -
 less/002-common.less                          |  2 +-
 less/028-ie8.less                             |  0
 less/{027-ie7.less => 029-ie9.js.less}        |  0
 less/101-header.less                          | 27 ++++++++++++++++++-
 less/{footer.less => 102-footer.less}         |  0
 8 files changed, 31 insertions(+), 8 deletions(-)
 delete mode 100644 less/028-ie8.less
 rename less/{027-ie7.less => 029-ie9.js.less} (100%)
 rename less/{footer.less => 102-footer.less} (100%)

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index f92e427..8c71cc8 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -1,6 +1,6 @@
 <?php
 
-$this->headScript()->addScriptAndStyle('footer');
+$this->headScript()->addScriptAndStyle('102-footer');
 
 $res = '<footer class="site">';
 
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index f75068b..a0bf5be 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -1,6 +1,6 @@
 <?php
 $this->headScript()
-	->addScriptAndStyle('header')
+	->addScriptAndStyle('101-header')
 	->addGSAP();
 
 $homepage = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/1');
@@ -14,8 +14,8 @@ if (!is_null($homepage)) {
 		<?php
 		/* LOGO */
 
-		$logos = $this->image('/images/logo/Cube.svg', "Cubedesigners Logo", -1, -1, array('class' => 'cube'));
-		$logos .= $this->image('/images/logo/Typo.svg', 'Cubedesigners', -1, -1, array('class' => 'typo'));
+		$logos = $this->image('/images/logo/Cube.svg', "Fluidbook", -1, -1, array('class' => 'cube'));
+		$logos .= $this->image('/images/logo/Typo.svg', 'Fluidbook', -1, -1, array('class' => 'typo'));
 
 		echo $this->link($logos, $home, array('class' => 'logo'));
 		if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
@@ -25,7 +25,6 @@ if (!is_null($homepage)) {
 		}
 		/* NAVIGATION */
 		$mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
-		//		echo '<a href="#menu" class="menu-link">&#9776;</a>';
 		echo '<div class="nav-icon"><div></div></div>';
 		echo '<nav id="menu" role="navigation">';
 		echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
diff --git a/js/002-common.js b/js/002-common.js
index ea71ddf..e69de29 100644
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -1 +0,0 @@
-alert('common.js');
\ No newline at end of file
diff --git a/less/002-common.less b/less/002-common.less
index 856b756..25d6843 100644
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -2,4 +2,4 @@
 
 body {
 	font-family: @body-font;
-}
\ No newline at end of file
+}
diff --git a/less/028-ie8.less b/less/028-ie8.less
deleted file mode 100644
index e69de29..0000000
diff --git a/less/027-ie7.less b/less/029-ie9.js.less
similarity index 100%
rename from less/027-ie7.less
rename to less/029-ie9.js.less
diff --git a/less/101-header.less b/less/101-header.less
index 75ee018..c958f3b 100644
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -1 +1,26 @@
-@import "000-imports";
\ No newline at end of file
+@import "000-imports";
+
+header {
+	color: #2a3743;
+
+	nav#menu {
+		ul {
+			list-style: none;
+			li {
+				display: inline-block;
+			}
+		}
+		a {
+			color: #2a3743;
+		}
+	}
+
+	&.light {
+		color: #fff;
+		nav #menu {
+			a {
+				color: #fff;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/less/footer.less b/less/102-footer.less
similarity index 100%
rename from less/footer.less
rename to less/102-footer.less
-- 
2.39.5