wip #1809 @0:40

diff --git a/framework/application/views/helpers/FeatureDetails.php b/framework/application/views/helpers/FeatureDetails.php
index 9d3041c05d18719c08d6332934215d02a9c68e23..7ddc76579435139acbb1ab5345296183161e3abb 100644 (file)
--- a/framework/application/views/helpers/FeatureDetails.php
+++ b/framework/application/views/helpers/FeatureDetails.php
@@ -21,12 +21,7 @@ class Fluidbook_View_Helper_FeatureDetails extends CubeIT_View_Helper_Abstract {
                $c = $this->htmlElement($c, 'div', ['class' => 'content']);\r
                $image = $this->imageProcess($d['image'], $d['title'], 755, 1000, [], 'R');\r
 \r
-               if ($imageRight) {\r
-                       $res = $c . $image;\r
-               } else {\r
-                       $res = $image . $c;\r
-               }\r
-\r
+               $res = $image . $c;\r
 \r
                return $this->htmlElement($res, 'article', ['class' => $imageRight ? 'iright' : 'ileft']);\r
        }\r

diff --git a/framework/application/views/helpers/IntroBlock.php b/framework/application/views/helpers/IntroBlock.php
index 7653e29c295430c68499336fbced9cda3d636dda..250f96816faccea05ce9053205feb65aa7bdd92f 100644 (file)
--- a/framework/application/views/helpers/IntroBlock.php
+++ b/framework/application/views/helpers/IntroBlock.php
@@ -17,17 +17,27 @@ class Fluidbook_View_Helper_IntroBlock extends CubeIT_View_Helper_Abstract {
                $res .= '</div>'; // .col-2
                $res .= '</div>'; // .grid
 
+               $attrs = array('class' => array('intro'));
+
                if ($outsideContent) {
                        $res .= $outsideContent;
                }
 
-               $res = $this->backgroundBlock($res, $intro);
+               if (isset($intro['backgroundimage']) && !isset($intro['bg_image'])) {
+                       $intro['bg_image'] = $intro['backgroundimage'];
+               }
+               if (!isset($intro['bg_image']) || !$intro['bg_image']) {
+                       $attrs['class'][] = 'nobg';
+               } else {
+                       $attrs['data-bg'] = print_r($intro['bg_image'], true);
+               }
 
+               $res = $this->backgroundBlock($res, $intro);
                if ($intro['chapo']) {
                        $res .= $this->htmlElement($this->htmlElement(nl2br($intro['chapo']), 'div'), 'blockquote');
                }
 
-               $attrs = array('class' => array('intro'));
+
                if (!$paddingTop) {
                        $attrs['class'][] = 'nopad';
                }

diff --git a/framework/application/views/helpers/Logos.php b/framework/application/views/helpers/Logos.php
index fcc4a6d5a220190cc008d5ea0e56faf989a178a7..1e15bcff649b03b60c29e89ad3f29967b2a1d253 100644 (file)
--- a/framework/application/views/helpers/Logos.php
+++ b/framework/application/views/helpers/Logos.php
@@ -14,7 +14,7 @@ class Fluidbook_View_Helper_Logos extends CubeIT_View_Helper_Abstract {
 \r
                $res = '';\r
                foreach ($images as $image) {\r
-                       $res .= $this->imageCms($image).' '; // Space needed for the justify\r
+                       $res .= $this->htmlElement($this->imageCms($image), 'div', ['class' => 'i']) . ' '; // Space needed for the justify\r
                }\r
 \r
                $res = $this->htmlElement($res, 'div', ['class' => 'c']);\r

diff --git a/less/102-intro.less b/less/102-intro.less
index ffd7bde212db2177ffea609bf768e7bd28e129fd..836a0defff4a413ceb9e5facf4d229aa7f30fdf6 100644 (file)
--- a/less/102-intro.less
+++ b/less/102-intro.less
@@ -9,6 +9,14 @@
                }\r
        }\r
 \r
+       &.nobg {\r
+               .content-wrapper {\r
+                       @media @m900 {\r
+                               padding-bottom: 15%;\r
+                       }\r
+               }\r
+       }\r
+\r
        .content-wrapper {\r
                .intro-padding();\r
                background-size: 100% auto;\r

diff --git a/less/106-logos.less b/less/106-logos.less
index d3fc50661a9bf1e67fd6b5a63c44841f84cdbfac..a554e48715ebcc0bfe61a691fc09970a297d4823 100644 (file)
--- a/less/106-logos.less
+++ b/less/106-logos.less
@@ -2,10 +2,12 @@
 \r
 .logos {\r
        &.content-wrapper {\r
-               padding-top: 56px;\r
-               padding-bottom: 50px;\r
+               padding-top: 4%;\r
+               padding-bottom: 2%;\r
        }\r
+\r
        background-color: @color-light-grey;\r
+\r
        .c {\r
                display: inline-block;\r
                width: 100%;\r
@@ -15,14 +17,27 @@
                margin: 0 auto;\r
                line-height: 0;\r
 \r
+               @media @m900 {\r
+                       padding-left: 0;\r
+                       padding-right: 0;\r
+               }\r
+\r
                &:after {\r
                        content: "";\r
                        display: inline-block;\r
                        width: 100%;\r
                        height: 0;\r
                }\r
-               img {\r
-                       vertical-align: middle;\r
+\r
+               .i {\r
+                       width: 120px;\r
+                       height: 45px;\r
+                       display: inline-block;\r
+                       text-align: center;\r
+\r
+                       img {\r
+                               vertical-align: middle;\r
+                       }\r
                }\r
        }\r
 }
\ No newline at end of file

diff --git a/less/420-features-details.less b/less/420-features-details.less
index 3e1f2c7ceaad7c3f5a62034f67a9001c7d9fb103..42edb4c187ed023296e84f5186df7d3e5e9e3127 100644 (file)
--- a/less/420-features-details.less
+++ b/less/420-features-details.less
@@ -10,8 +10,8 @@
                }\r
 \r
                .content {\r
-                       width: 755px;\r
-                       padding: 60px 130px 0;\r
+                       width: 50%;\r
+                       padding: 8% 10% 0;\r
                        display: inline-block;\r
                        vertical-align: top;\r
                        font-size: 14px;\r
@@ -25,8 +25,62 @@
                }\r
                img {\r
                        display: inline-block;\r
-                       width: 755px;\r
+                       width: 50%;\r
+                       height: auto;\r
                        vertical-align: top;\r
                }\r
+\r
+               @media @m1280 {\r
+                       &.ileft {\r
+                               .content {\r
+                                       padding: 0 0 0 4%;\r
+                               }\r
+                       }\r
+\r
+                       &.iright {\r
+                               .content {\r
+                                       padding: 0 4% 0 0;\r
+                               }\r
+                       }\r
+               }\r
+\r
+               @media @m900 {\r
+                       margin-top: 70px;\r
+\r
+                       .content {\r
+                               float: none !important;\r
+                               width: 100%;\r
+                               padding: 0 !important;\r
+                               display: block;\r
+                               margin-top: 20px;\r
+                       }\r
+\r
+                       img {\r
+                               float: none !important;\r
+                               width: 100%;\r
+                               height: auto;\r
+                               display: block;\r
+                       }\r
+\r
+               }\r
+\r
+               &.ileft {\r
+                       .content {\r
+                               float: right;\r
+                       }\r
+                       img {\r
+                               float: left;\r
+                       }\r
+\r
+               }\r
+\r
+               &.iright {\r
+                       .content {\r
+                               float: left;\r
+                       }\r
+                       img {\r
+                               float: right;\r
+                       }\r
+               }\r
        }\r
 }
\ No newline at end of file