done #601 0:15

diff --git a/framework/application/views/helpers/BackgroundBlock.php b/framework/application/views/helpers/BackgroundBlock.php
index 9313c5ff128a4d49d988c4bffba6cf1d9b86e9ac..e52c1c6b11c9e3ad7c6b9d90377f637e117c4906 100644 (file)
--- 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'])) {\r
                        $data['bg_image'] = $data['backgroundimage'];\r
                }\r
-\r
-               $bgimage = CubeIT_Util_Cms::extractFile($data['bg_image']);\r
-               $extra_attributes = array();\r
-               if ($bgimage) {\r
-                       $image_path = CubeIT_View_Helper_ImageCms::getPath($bgimage);\r
-\r
-                       // Work out the ratio of the background image\r
-                       CubeIT_Image::getDimensions($image_path, $image_width, $image_height);\r
-                       $image_ratio = $image_height / $image_width;\r
-            $attributes['data-bg-ratio'] = $image_ratio;\r
-\r
-            $style = "background-image: url($image_path);";\r
-\r
-            if (isset($data['backgroundcolor'])) {\r
-                $style .= 'background-color:'. $data['backgroundcolor'];\r
-            }\r
+               if (isset($data['bg_image'])) {\r
+                       $bgimage = CubeIT_Util_Cms::extractFile($data['bg_image']);\r
+                       $extra_attributes = array();\r
+                       if ($bgimage) {\r
+                               $image_path = CubeIT_View_Helper_ImageCms::getPath($bgimage);\r
+\r
+                               // Work out the ratio of the background image\r
+                               CubeIT_Image::getDimensions($image_path, $image_width, $image_height);\r
+                               $image_ratio = $image_height / $image_width;\r
+                               $attributes['data-bg-ratio'] = $image_ratio;\r
+\r
+                               $style = "background-image: url($image_path);";\r
+\r
+                               if (isset($data['backgroundcolor'])) {\r
+                                       $style .= 'background-color:' . $data['backgroundcolor'];\r
+                               }\r
+                       }\r
                }\r
 \r
                if (isset($data['bg_color'])) {\r

diff --git a/framework/application/views/helpers/HomeFeatures.php b/framework/application/views/helpers/HomeFeatures.php
index a7d5ef8838ebd13cad8e67ea1d3255dcb13da0a7..953a4bbc0dc29a38307d8e624739f5eb28337d6f 100644 (file)
--- 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
 \r
                $this->data = $data;\r
 \r
-               $res .= $this->_leftText();\r
+               $res = $this->_leftText();\r
 \r
                return $this->_layer($res, 'features');\r
        }\r

diff --git a/framework/application/views/helpers/HomeServices.php b/framework/application/views/helpers/HomeServices.php
index 60da2352ee987d490c15ff4bf041483928518ff6..a964ce252b0622549845cc21a2aa45e9d9e092e9 100644 (file)
--- 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
 \r
                $this->data = $data;\r
 \r
-        $res .= '<div class="text">';\r
+        $res = '<div class="text">';\r
         $res .= $this->_leftText();\r
         $res .= '</div>'; // .text\r
 \r

diff --git a/less/101-header.less b/less/101-header.less
index 1bd6f5aec798470d97928d90083def7c77865554..db761d2ebf850aae93bbb029547798b14c7119ea 100644 (file)
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -95,21 +95,7 @@ header#h {
 \r
        &.light {\r
                color: #fff;\r
-               nav#menu {\r
-                       li.active a, a:hover {\r
-                               border-bottom-color: #fff;\r
-                       }\r
-                       a {\r
-                               color: #fff;\r
-                       }\r
-               }\r
-               nav#contactnav {\r
-                       a {\r
-                               &.agencies {\r
-                                       .border-button(#fff, #fff);\r
-                               }\r
-                       }\r
-               }\r
+\r
                .logo {\r
                        .text-dark {\r
                                opacity: 0;\r

diff --git a/less/104-nav.less b/less/104-nav.less
index f5d6b264d33c5dbd2d569ee3d87fcd5f6f598877..b53f9340739176bdb86f2425246893d03ad4f455 100644 (file)
--- a/less/104-nav.less
+++ b/less/104-nav.less
@@ -271,4 +271,24 @@ nav#contactnav {
        }\r
 }\r
 \r
+header#h.light {\r
+       nav#menu {\r
+               a {\r
+                       color: #fff;\r
+               }\r
+\r
+               > ul > li > a:after {\r
+                       background-color: #fff;\r
+               }\r
+\r
+       }\r
+       nav#contactnav {\r
+               a {\r
+                       &.agencies {\r
+                               .border-button(#fff, #fff);\r
+                       }\r
+               }\r
+       }\r
+}\r
+\r
 @import "105-mmenu";
\ No newline at end of file