From: Stephen Cameron <stephen@cubedesigners.com>
Date: Wed, 11 Sep 2019 14:49:50 +0000 (+0200)
Subject: Done #2753
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9cfed74802c96ca731e8e1edbcdbb24a1c7ef8a6;p=pmi.git

Done #2753
---

diff --git a/resources/styles/components/grids.styl b/resources/styles/components/grids.styl
index f53cc17..ab8d089 100644
--- a/resources/styles/components/grids.styl
+++ b/resources/styles/components/grids.styl
@@ -53,6 +53,9 @@ $vw-spacing = {
     &-cols-4
       grid-template-columns: repeat(4, 1fr)
 
+    &-cols-5
+      grid-template-columns: repeat(5, 1fr)
+
 
   //&-cols-2
   //
diff --git a/resources/views/pages/aboutus.blade.php b/resources/views/pages/aboutus.blade.php
index 20ceb55..ac8df0d 100644
--- a/resources/views/pages/aboutus.blade.php
+++ b/resources/views/pages/aboutus.blade.php
@@ -6,9 +6,9 @@
 
 
 @section('content')
-    @intro(['padding' => 'pb-4v'])
+    @intro(['padding' => 'pb-2v'])
 
-    <full-width padding="pb-4v">
+    <full-width padding="pb-2v">
         <content>
             <columns>
                 <column class="pr-1v sm:pr-0">
@@ -23,16 +23,62 @@
                 </column>
             </columns>
         </content>
+
+        {{-- VALUES --}}
+        <content class="pt-2v">
+        @if ($page->get('values', true))
+            <text-block :title="$page->get('values_title', __('Nos valeurs'))">
+                @markdown($page->get('values_text'))
+            </text-block>
+
+            <grid cols="5" gap="xl" class="mt-2v md:grid-cols-4 sm:grid-cols-3 xs:grid-cols-2">
+                @foreach($page->get('values', []) as $value)
+                    <div class="text-center">
+                        <div class="bg-grey-100 pb-100p rounded-full mb-4 bg-no-repeat bg-center"
+                             style="background-image: url({{ $page->getImageURLByCollection($value['image'])}}); background-size: 50%"></div>
+                        <h4 class="text-navy font-display font-medium">{{ $value['title'] }}</h4>
+                        @if ($value['text'])
+                            <p>{{ $value['text'] }}</p>
+                        @endif
+                    </div>
+                @endforeach
+            </grid>
+        @endif
+        </content>
+
+        {{-- TEAM --}}
+        @if (config('features.team') && $page->get('team'))
+            <content class="pt-2v">
+                <text-block :title="$page->get('team_title', __('L\'équipe'))"/>
+                <grid cols="4" gap="lg" class="md:grid-cols-3 sm:grid-cols-2">
+                    @foreach($page->get('team', []) as $staff)
+                        <div class="team-member">
+                            <div class="team-member-photo bg-cover mb-4"
+                                 {{-- Padding bottom sets image container ratio 1:1.3 --}}
+                                 style="padding-bottom: 130%; background-image: url({{ $page->getImageURLByCollection($staff['photo']) }})"></div>
+                            <h4 class="text-navy font-display font-medium mb-1">
+                                {{ $staff['name'] }}
+                            </h4>
+                            <p>{{ $staff['role'] }}</p>
+                        </div>
+                    @endforeach
+                </grid>
+            </content>
+        @endif
+
     </full-width>
 
-    @if(config('features.partners'))
+
+
+    @if (config('features.partners'))
         {{-- Our Partners --}}
         <full-width class="bg-grey-100">
             <content>
                 <text-block :title="__('Nos partenaires')"/>
 
-                @include("partials.logowall",['logos'=>$page->get('partners')])
+                @include('partials.logowall', ['logos' => $page->get('partners')])
             </content>
         </full-width>
     @endif
+
 @endsection
diff --git a/yarn.lock b/yarn.lock
index 438fd42..05b6c9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1267,11 +1267,6 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap@^4.0.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
-  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3172,7 +3167,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
   integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -6184,7 +6179,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -6228,6 +6223,11 @@ selfsigned@^1.10.4:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
+semver@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@^6.1.0, semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
@@ -6560,7 +6560,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.7.2:
+source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -6816,12 +6816,10 @@ stylus-loader@^3.0.2:
   dependencies:
     css-parse "~2.0.0"
     debug "~3.1.0"
-    glob "^7.1.3"
+    glob "~7.1.2"
     mkdirp "~0.5.x"
-    safer-buffer "^2.1.2"
     sax "~1.2.4"
-    semver "^6.0.0"
-    source-map "^0.7.3"
+    source-map "~0.7.2"
 
 supports-color@^2.0.0:
   version "2.0.0"