(no commit message)

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index f92e427e26a70e6154a669c1f67ed572e86792d1..8c71cc89a5c90b07f25c408d29fe53309e69cb2f 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -1,6 +1,6 @@
 <?php\r
 \r
-$this->headScript()->addScriptAndStyle('footer');\r
+$this->headScript()->addScriptAndStyle('102-footer');\r
 \r
 $res = '<footer class="site">';\r
 \r

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index f75068bc4eea59b9fa4d99e902781370952d826a..a0bf5bea54c6dfee0fcb2942d65087ab0e21efa2 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -1,6 +1,6 @@
 <?php\r
 $this->headScript()\r
-       ->addScriptAndStyle('header')\r
+       ->addScriptAndStyle('101-header')\r
        ->addGSAP();\r
 \r
 $homepage = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/1');\r
@@ -14,8 +14,8 @@ if (!is_null($homepage)) {
                <?php\r
                /* LOGO */\r
 \r
-               $logos = $this->image('/images/logo/Cube.svg', "Cubedesigners Logo", -1, -1, array('class' => 'cube'));\r
-               $logos .= $this->image('/images/logo/Typo.svg', 'Cubedesigners', -1, -1, array('class' => 'typo'));\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
@@ -25,7 +25,6 @@ if (!is_null($homepage)) {
                }\r
                /* NAVIGATION */\r
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);\r
-               //              echo '<a href="#menu" class="menu-link">&#9776;</a>';\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

diff --git a/js/002-common.js b/js/002-common.js
index ea71ddf3e9c59aa4530f6c60d78b35078f1577f5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 856b7561acadac11ba40bc633c7537c0c11fb1bf..25d684339c5ed1e7fcdb0a592959a1ea51c5f265 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -2,4 +2,4 @@
 \r
 body {\r
        font-family: @body-font;\r
-}
\ No newline at end of file
+}\r

diff --git a/less/027-ie7.less b/less/027-ie7.less
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/028-ie8.less b/less/028-ie8.less
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/029-ie9.js.less b/less/029-ie9.js.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/101-header.less b/less/101-header.less
index 75ee0181c55bb8bbd02e2d751a4ca7a9738ba649..c958f3b341ab89f3981e49aa74c4fd56f0ce1c9d 100644 (file)
--- 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";\r
+\r
+header {\r
+       color: #2a3743;\r
+\r
+       nav#menu {\r
+               ul {\r
+                       list-style: none;\r
+                       li {\r
+                               display: inline-block;\r
+                       }\r
+               }\r
+               a {\r
+                       color: #2a3743;\r
+               }\r
+       }\r
+\r
+       &.light {\r
+               color: #fff;\r
+               nav #menu {\r
+                       a {\r
+                               color: #fff;\r
+                       }\r
+               }\r
+       }\r
+}
\ No newline at end of file

diff --git a/less/102-footer.less b/less/102-footer.less
new file mode 100644 (file)
index 0000000..947c828
--- /dev/null
+++ b/less/102-footer.less
@@ -0,0 +1,23 @@
+@import "000-imports";
+
+footer {
+  .font-thinning();
+
+  a {
+    color: #fff;
+    text-decoration: none;
+  }
+}
+
+footer.site {
+  color: #fff;
+  background-color: @color-footer-bg-primary;
+  padding: 75px 85px 75px 42px;
+}
+
+// Copyright and legal bar
+footer.legal {
+  background-color: @color-footer-bg-secondary;
+  color: #5c6268;
+  padding: 40px 85px;
+}
\ No newline at end of file

diff --git a/less/footer.less b/less/footer.less
deleted file mode 100644 (file)
index 947c828..0000000
--- a/less/footer.less
+++ /dev/null
@@ -1,23 +0,0 @@
-@import "000-imports";
-
-footer {
-  .font-thinning();
-
-  a {
-    color: #fff;
-    text-decoration: none;
-  }
-}
-
-footer.site {
-  color: #fff;
-  background-color: @color-footer-bg-primary;
-  padding: 75px 85px 75px 42px;
-}
-
-// Copyright and legal bar
-footer.legal {
-  background-color: @color-footer-bg-secondary;
-  color: #5c6268;
-  padding: 40px 85px;
-}
\ No newline at end of file