maj && modif graphique

user/themes/vocurations/Artist Candidature-'Sara-Anstis'-2019-12-04-02-16-56.txt

@@ -1,11 +0,0 @@
-first_name: Sara
-last_name: Anstis
-date_of_birth: '1991'
-phone_number: '07384593115'
-email: anstismagdalena@gmail.com
-move_in_date: ASAP
-website: 'saraanstis.com  / @saraanstis'
-portfolio: {"user\/data\/files\/Sara Anstis_VO Curations.pdf":{"name":"Sara Anstis_VO Curations.pdf","type":"application\/pdf","size":17337358,"path":"user\/data\/files\/Sara Anstis_VO Curations.pdf"}}
-studio: Either
-notes: "Hello, \r\n\r\nI was pointed in your direction by somaya Critchlow. We're currently on a residency Together in Italy and AS I AM ABOUT TO LOSE MY STUDIO IN LONDON, She mentioned you might still have some studios available for 2020. \r\n\r\nWould it be possible to organise a location visit for December 11th 2019? \r\n\r\nLooking forward to hearing from you and thank you for considering my Application \r\n\r\nall the best \r\nSara "
-

user/themes/vocurations/package.json

@@ -27,9 +27,9 @@
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^7.0.1",
     "gulp-clean-css": "^3.10.0",
-    "gulp-csscomb": "^3.0.8",
+    "gulp-csscomb": "^3.1.0",
     "gulp-rename": "^1.4.0",
-    "gulp-sass": "^4.0.2"
+    "gulp-sass": "^4.1.0"
   },
   "browserslist": [
     "last 4 Chrome versions",

user/themes/vocurations/scss/theme/_extensions.scss

@@ -1,6 +1,6 @@
 // slider
 .slider{
-  margin-bottom: 3rem;
+  // margin-bottom: 3rem;
   width: 90%;
   & > div{
     & > img{
@@ -123,6 +123,13 @@
       .center{
         width: calc((100% / 12) * 9);
       }
+      .result_for{
+        text-transform: uppercase;
+        p{
+          margin: 0!important;
+        }
+      }
+
       .search-wrapper{
         form{
           display: inline-flex;
@@ -131,7 +138,7 @@
             font-size: 6rem;
             text-transform: uppercase;
             width: 100%;
-            height: 150px;
+            height: auto;
             border: none;
             background: none;
           }
@@ -139,6 +146,9 @@
       }
     }
   }
+  .card-cat{
+    margin-bottom:0.6rem;
+  }
 }
 
 .search-results{
@@ -162,6 +172,9 @@
       .search-item{
         margin: 0;
       }
+      .card-cat{
+        margin-bottom:0.6rem;
+      }
       .search-title{
         h2{
           font-size: 2.5rem;

user/themes/vocurations/scss/theme/_mobile.scss

@@ -196,7 +196,15 @@ h2{
       .simplesearch{
         .search-wrapper{
           form{
-            display: block!important;
+            // display: block!important;
+            min-width: 100%!important;
+            input{
+              width: 90%!important;
+            }
+            button{
+              width: 10%!important;
+              margin-right: 10px;
+            }
             .search-input, button{
               font-size: 2rem!important;
               height: 50px!important;
@@ -208,7 +216,6 @@ h2{
     }
   }
 
-
   .search-results{
     .section{
       .simplesearch{
@@ -587,6 +594,14 @@ h3{
 
       }
     }
+    &.search-results{
+      margin-top: -2rem;
+      .search-wrapper{
+        button{
+            padding: 0;
+        }
+      }
+    }
   }
   .events{
     #start{

user/themes/vocurations/scss/theme/_typography.scss

@@ -46,7 +46,8 @@ h5{
 }
 
 p{
-  font-family: $Bold;
+  font-family: $Regular;
+  // font-family: $Bold;
   font-weight: normal;
   font-size: 1.6rem;
   line-height: 1.9rem;

user/themes/vocurations/templates/home.html.twig

@@ -18,8 +18,13 @@
       {% embed 'partials/layout.html.twig' with {blog: page} %}
         {% block item %}
 
-          {% set first_event = { items: {'@page.children':'/whats-on/exhibitions/current-upcoming'} } %}
-          {% set Efirst = page.collection(first_event) %}
+          {% set exhib = { items: {'@page.children':'/whats-on/exhibitions/current-upcoming'} } %}
+          {% set events = { items: {'@page.children':'/whats-on/events/current-upcoming'} } %}
+          {% set ExhibCollect = page.collection(exhib) %}
+          {% set EventCollect = page.collection(events) %}
+
+
+          {% set mergeTop = ExhibCollect.merge(EventCollect).order('date', 'desc')  %}
 
           {% set options = { items: {'@root.descendants':''}} %}
           {% set options2 = { items: {'@page.children':'/residence/current-upcoming'}} %}
@@ -29,7 +34,7 @@
 
           {% set mergeCollect = collection1.merge(collection2).order('date', 'desc')  %}
 
-          {% for siblings in Efirst %}
+          {% for siblings in mergeTop %}
             {% if siblings.header.topH == true %}
                 {% include 'partials/blog-list-item.html.twig' with {blog: page, page: siblings} %}
             {% endif %}

user/themes/vocurations/templates/partials/blog-item.html.twig

@@ -15,14 +15,14 @@
   {% if images %}
     <div class="slider">
       {% for images in page.media.images %}
-      {% set captions = images.filename|humanize|regex_replace(['/.jpg/','/.jpeg/','/.png/','/.pdf/'], [' ',' ',' ',' ']) %}
+      {# {% set captions = images.filename|humanize|regex_replace(['/.jpg/','/.jpeg/','/.png/','/.pdf/'], [' ',' ',' ']) %} #}
         <div>
           {{images.derivatives(320,1920,300).sizes('(max-width:100vw) 100vw, 50vw').html(captions, 'images article')}}
-          {% if page.template != "artistes" %}
+          {# {% if page.template != "artistes" %}
             <div class="caption">
               {{captions}}
             </div>
-          {% endif %}
+          {% endif %} #}
         </div>
       {% endfor %}
     </div>
@@ -33,7 +33,6 @@
   </div>
 
   <div class="item_content">
-    
     <div class="content">
       {{ page.content|raw }}
     </div>

user/themes/vocurations/templates/partials/simplesearch_item.html.twig

@@ -1,18 +1,23 @@
 {% set modularCollection = page.collection %}
 {% set pageCollection = search_results %}
+
 {% if page.template == 'modular' %}
 
   {% for item in page.collection %}
-
+    {% if item.media.images %}
       {% set value = query|hyphenize %}
       {% set title = item.title|hyphenize %}
-
       {% if title|contains(value) == 1  %}
+
         <section class="search-row">
           <a href="{{ item.header.url_news }}" target="_blank">
             {% set banner = item.media.images|first %}
             <div class="search-item">
 
+              <div class="card-cat">
+                {% include 'partials/blog/cat.html.twig' with {page: item}  %}
+              </div>
+
                 <div class="search-title">
                   {% include 'partials/blog/title.html.twig' with {title_level: 'h2', page: item} %}
                 </div>
@@ -34,16 +39,21 @@
         </section>
       {% endif %}
 
+      {% endif %}
   {% endfor %}
 
 {% else %}
 
+  {% if page.media.images %}
   <section class="search-row">
-
     <a href="{{page.url}}">
       {% set banner = page.media.images|first %}
       <div class="search-item">
 
+        <div class="card-cat">
+          {% include 'partials/blog/cat.html.twig' %}
+        </div>
+
           <div class="search-title">
             {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %}
           </div>
@@ -62,5 +72,5 @@
     </a>
 
   </section>
-
+{% endif %}
 {% endif %}

user/themes/vocurations/templates/simplesearch_results.html.twig

@@ -5,16 +5,18 @@
         <div class="center">
             {% include 'partials/simplesearch_searchbox.html.twig' %}
         </div>
-        <p>
-            {% if query %}
-                {% set count = search_results ? search_results.count : 0 %}
-                {% if count is same as( 1 ) %}
-                    {{ "PLUGIN_SIMPLESEARCH.SEARCH_RESULTS_SUMMARY_SINGULAR"|t(query|e)|raw }}
-                {% else %}
-                    {{ "PLUGIN_SIMPLESEARCH.SEARCH_RESULTS_SUMMARY_PLURAL"|t(query|e, count)|raw }}
-                {% endif %}
-            {% endif %}
-        </p>
+        <div class="result_for">
+          <p>
+              {% if query %}
+                  {% set count = search_results ? search_results.count : 0 %}
+                  {% if count is same as( 1 ) %}
+                      {{ "PLUGIN_SIMPLESEARCH.SEARCH_RESULTS_SUMMARY_SINGULAR"|t(query|e)|raw }}
+                  {% else %}
+                      {{ "PLUGIN_SIMPLESEARCH.SEARCH_RESULTS_SUMMARY_PLURAL"|t(query|e, count)|raw }}
+                  {% endif %}
+              {% endif %}
+          </p>
+        </div>
         <div class="results">
           {% for page in search_results.order('date', 'desc') %}
               {% include 'partials/simplesearch_item.html.twig' with {'page': page} %}