From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 19 Aug 2016 15:38:09 +0000 (+0000)
Subject: done #601 0:15
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=82dc8bc7e4e313047c303fdd27616d2628958a2b;p=fluidbook-v3.git

done #601 0:15
---

diff --git a/framework/application/views/helpers/BackgroundBlock.php b/framework/application/views/helpers/BackgroundBlock.php
index 9313c5f..e52c1c6 100644
--- a/framework/application/views/helpers/BackgroundBlock.php
+++ b/framework/application/views/helpers/BackgroundBlock.php
@@ -11,22 +11,23 @@ class Fluidbook_View_Helper_BackgroundBlock extends CubeIT_View_Helper_Abstract
 		if (isset($data['backgroundimage']) && !isset($data['bg_image'])) {
 			$data['bg_image'] = $data['backgroundimage'];
 		}
-
-		$bgimage = CubeIT_Util_Cms::extractFile($data['bg_image']);
-		$extra_attributes = array();
-		if ($bgimage) {
-			$image_path = CubeIT_View_Helper_ImageCms::getPath($bgimage);
-
-			// Work out the ratio of the background image
-			CubeIT_Image::getDimensions($image_path, $image_width, $image_height);
-			$image_ratio = $image_height / $image_width;
-            $attributes['data-bg-ratio'] = $image_ratio;
-
-            $style = "background-image: url($image_path);";
-
-            if (isset($data['backgroundcolor'])) {
-                $style .= 'background-color:'. $data['backgroundcolor'];
-            }
+		if (isset($data['bg_image'])) {
+			$bgimage = CubeIT_Util_Cms::extractFile($data['bg_image']);
+			$extra_attributes = array();
+			if ($bgimage) {
+				$image_path = CubeIT_View_Helper_ImageCms::getPath($bgimage);
+
+				// Work out the ratio of the background image
+				CubeIT_Image::getDimensions($image_path, $image_width, $image_height);
+				$image_ratio = $image_height / $image_width;
+				$attributes['data-bg-ratio'] = $image_ratio;
+
+				$style = "background-image: url($image_path);";
+
+				if (isset($data['backgroundcolor'])) {
+					$style .= 'background-color:' . $data['backgroundcolor'];
+				}
+			}
 		}
 
 		if (isset($data['bg_color'])) {
diff --git a/framework/application/views/helpers/HomeFeatures.php b/framework/application/views/helpers/HomeFeatures.php
index a7d5ef8..953a4bb 100644
--- a/framework/application/views/helpers/HomeFeatures.php
+++ b/framework/application/views/helpers/HomeFeatures.php
@@ -10,7 +10,7 @@ class Fluidbook_View_Helper_HomeFeatures extends Fluidbook_View_Helper_HomeLayer
 
 		$this->data = $data;
 
-		$res .= $this->_leftText();
+		$res = $this->_leftText();
 
 		return $this->_layer($res, 'features');
 	}
diff --git a/framework/application/views/helpers/HomeServices.php b/framework/application/views/helpers/HomeServices.php
index 60da235..a964ce2 100644
--- a/framework/application/views/helpers/HomeServices.php
+++ b/framework/application/views/helpers/HomeServices.php
@@ -10,7 +10,7 @@ class Fluidbook_View_Helper_HomeServices extends Fluidbook_View_Helper_HomeLayer
 
 		$this->data = $data;
 
-        $res .= '<div class="text">';
+        $res = '<div class="text">';
         $res .= $this->_leftText();
         $res .= '</div>'; // .text
 
diff --git a/less/101-header.less b/less/101-header.less
index 1bd6f5a..db761d2 100644
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -95,21 +95,7 @@ header#h {
 
 	&.light {
 		color: #fff;
-		nav#menu {
-			li.active a, a:hover {
-				border-bottom-color: #fff;
-			}
-			a {
-				color: #fff;
-			}
-		}
-		nav#contactnav {
-			a {
-				&.agencies {
-					.border-button(#fff, #fff);
-				}
-			}
-		}
+
 		.logo {
 			.text-dark {
 				opacity: 0;
diff --git a/less/104-nav.less b/less/104-nav.less
index f5d6b26..b53f934 100644
--- a/less/104-nav.less
+++ b/less/104-nav.less
@@ -271,4 +271,24 @@ nav#contactnav {
 	}
 }
 
+header#h.light {
+	nav#menu {
+		a {
+			color: #fff;
+		}
+
+		> ul > li > a:after {
+			background-color: #fff;
+		}
+
+	}
+	nav#contactnav {
+		a {
+			&.agencies {
+				.border-button(#fff, #fff);
+			}
+		}
+	}
+}
+
 @import "105-mmenu";
\ No newline at end of file