From a73603c4dfacf38c518a3bbaf30adc0df1fcf733 Mon Sep 17 00:00:00 2001
From: "stephen@cubedesigners.com"
 <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 8 Jan 2019 16:52:32 +0000
Subject: [PATCH] WIP #2033 @8

---
 .../views/helpers/CasestudiesList.php         |  3 +++
 .../views/scripts/templates/casestudies.phtml |  7 ++++-
 js/common.js                                  |  4 +--
 less/casestudies.less                         |  8 ++++--
 less/header.less                              | 26 +++++++++++++++----
 less/home.less                                |  4 +--
 6 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php
index 24bb5fc..495c563 100644
--- a/framework/application/views/helpers/CasestudiesList.php
+++ b/framework/application/views/helpers/CasestudiesList.php
@@ -167,6 +167,9 @@ class Cubedesigners_View_Helper_CasestudiesList extends CubeIT_View_Helper_Abstr
 		$c.= '<h2>' . $s->titre . '</h2>';
 		$c.='<h3>' . $s->description . '</h3>';
 
+		// Todo: display names of secondary categories (via join?) using IDs in: $s->tags_secondaires);
+
+
 		return $this->link($c, $url, array('data-cat' => $s->categories)) . ' '; // Space needed between elements for justified alignment
 	}
 
diff --git a/framework/application/views/scripts/templates/casestudies.phtml b/framework/application/views/scripts/templates/casestudies.phtml
index 0779798..2acdcfe 100644
--- a/framework/application/views/scripts/templates/casestudies.phtml
+++ b/framework/application/views/scripts/templates/casestudies.phtml
@@ -17,4 +17,9 @@ $this->headScript()->addScriptAndStyle('casestudies');
 		echo $this->CasestudiesList($datas);
 		?>
 	</div>
-</div>
\ No newline at end of file
+
+    <p class="casestudies-archive-link">
+        <?php echo $this->linkInternal(__('Voir les archives') . $this->linkArrow(), 'Portfolio', array('class' => 'arrow-link')); ?>
+    </p>
+
+</div>
diff --git a/js/common.js b/js/common.js
index cfa9b1e..b84b09b 100644
--- a/js/common.js
+++ b/js/common.js
@@ -58,7 +58,7 @@ function load_commons() {
     $menulink.click(function () {
         $menulink.toggleClass('active');
         $menu.toggleClass('active');
-        //$menulink.parent().toggleClass('menu-active');
+        $menulink.parent().toggleClass('menu-active');
         return false;
     });
 
@@ -80,4 +80,4 @@ function orientationchange() {
         $("[name='viewport']").attr("content", "width=device-width, initial-scale=1.0");
     }
 
-}
\ No newline at end of file
+}
diff --git a/less/casestudies.less b/less/casestudies.less
index 89c216d..85b3844 100644
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -10,7 +10,6 @@
 	// Settings specific to the isotope grid
 	&.grid {
 		display: none; // Hidden until Isotope is ready
-        margin-bottom: 50px;
 	}
 
 	a {
@@ -141,4 +140,9 @@
 
 .casestudies-detail-content {
 	background-color: @yellow;
-}
\ No newline at end of file
+}
+
+.casestudies-archive-link {
+  margin-bottom: 4em;
+  text-align: right;
+}
diff --git a/less/header.less b/less/header.less
index 38b573c..3bf026d 100644
--- a/less/header.less
+++ b/less/header.less
@@ -82,8 +82,10 @@ header {
 
 		&-symbol, &-text {
 			display: inline-block;
+			height: 100%;
+
 			svg {
-				height: 48px;
+				height: 100%;
 				width: auto;
 			}
 		}
@@ -144,7 +146,7 @@ header {
 	.nav-icon:after,
 	.nav-icon:before,
 	.nav-icon div {
-		background-color: #fff;
+		background-color: currentColor;
 		border-radius: 3px;
 		content: '';
 		display: block;
@@ -156,7 +158,12 @@ header {
 	.nav-icon.active:after,
 	.nav-icon.active:before,
 	.nav-icon.active div {
-		background-color: #fff;
+		background-color: currentColor;
+
+		// When menu is open, background is white so icon must be black
+		.menu-active & {
+			background-color: #000;
+		}
 	}
 
 	.nav-icon.active {
@@ -186,10 +193,15 @@ header {
 		height: auto;
 		height: 130px;
 		z-index: 10;
+
+		// When menu is open, white background is in place so force dark colour
+		&.menu-active {
+			color: #222428 !important;
+		}
 	}
 
 	nav[role=navigation] {
-		background-color: #222428;
+		background-color: #fff;
 		//margin: 0 -20px; // To offset the 20px margin from .content
 	}
 
@@ -224,11 +236,15 @@ header {
 
 			a {
 				border: none !important;
+
+				&:after {
+					display: none;
+				}
 			}
 		}
 
 		a {
-			color: #fff !important;
+			color: currentColor;
 			display: block;
 			&:hover {
 				border-radius: 0;
diff --git a/less/home.less b/less/home.less
index e44872f..3a64b60 100644
--- a/less/home.less
+++ b/less/home.less
@@ -72,7 +72,7 @@ nav.active[role="navigation"] {
 					//                  -webkit-animation: bg-anim 15s linear 1s infinite;
 					//                  transform: scale(1);
 					display: block;
-					z-index: -2;
+					//z-index: -2; // Why was this here?? Doesn't seem to be needed and causes a bug with first slide display now
 				}
 
 				> div {
@@ -186,4 +186,4 @@ nav.active[role="navigation"] {
 		}
 	}
 
-}
\ No newline at end of file
+}
-- 
2.39.5