t`:Merge branch 'master' of gitlab.com:agaric/sites/geo

composer.json

@@ -16,7 +16,8 @@
         "drupal/migrate_tools": "^4.1",
         "drupal/config_actions": "1.x-dev",
         "drupal/convert_bundles": "^1.0@alpha",
-        "drupal/drutopia_collection": "^1.0@alpha"
+        "drupal/drutopia_collection": "^1.0@alpha",
+        "drupal/field_token_value": "^1.0"
     },
     "repositories": {
         "drupal": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b03aebc622e464e94a8a9daac90b1737",
+    "content-hash": "c599c4440653c0c90f0151d0684fa35a",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -5990,6 +5990,54 @@
                 "source": "https://git.drupalcode.org/project/field_group"
             }
         },
+        {
+            "name": "drupal/field_token_value",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/field_token_value.git",
+                "reference": "8.x-1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/field_token_value-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "ba0c70108ca09589b9fa2ecce4c7a7194cdca897"
+            },
+            "require": {
+                "drupal/core": "~8.0",
+                "drupal/token": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0",
+                    "datestamp": "1503548344",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "haydent",
+                    "homepage": "https://www.drupal.org/user/2763191"
+                }
+            ],
+            "description": "Provides a field allowing the value to be set using a string containing tokens.",
+            "homepage": "https://www.drupal.org/project/field_token_value",
+            "support": {
+                "source": "https://git.drupalcode.org/project/field_token_value"
+            }
+        },
         {
             "name": "drupal/focal_point",
             "version": "1.0.0",
@@ -6542,6 +6590,9 @@
                     "services": {
                         "drush.services.yml": "^9"
                     }
+                },
+                "patches_applied": {
+                    "The limit option does not accept a value": "https://www.drupal.org/files/issues/2019-02-05/migrate-tools_fix-drush-options_3024399-23.patch"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",

config/sync/core.base_field_override.node.article.status.yml

@@ -0,0 +1,22 @@
+uuid: df7cd0d9-09bc-4673-892c-8fa2c54c1530
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.article
+id: node.article.status
+field_name: status
+entity_type: node
+bundle: article
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/core.base_field_override.node.blog.status.yml

@@ -0,0 +1,22 @@
+uuid: e8723a9c-07b4-4830-ae58-33ddfc638ffa
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.blog
+id: node.blog.status
+field_name: status
+entity_type: node
+bundle: blog
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/core.base_field_override.node.gleaning.status.yml

@@ -0,0 +1,22 @@
+uuid: 4cf8492a-ca92-4c87-ac26-181193dbeec6
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.gleaning
+id: node.gleaning.status
+field_name: status
+entity_type: node
+bundle: gleaning
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/core.base_field_override.node.page.status.yml

@@ -0,0 +1,22 @@
+uuid: c699ca82-26f3-4a26-bad5-7df13b9e4b6b
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.page
+id: node.page.status
+field_name: status
+entity_type: node
+bundle: page
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/core.base_field_override.node.people.status.yml

@@ -0,0 +1,22 @@
+uuid: 61438e3a-2e6a-4439-a0ef-20888b2ff51d
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.people
+id: node.people.status
+field_name: status
+entity_type: node
+bundle: people
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/core.entity_view_display.node.article.full.yml

@@ -138,7 +138,9 @@ content:
     settings:
       responsive_image_style: wide
       image_link: ''
-    third_party_settings: {  }
+    third_party_settings:
+      ds:
+        ds_limit: '1'
     label: visually_hidden
     region: header
   field_institutions_structures:

config/sync/core.entity_view_display.node.blog.full.yml

@@ -106,7 +106,9 @@ content:
     settings:
       responsive_image_style: wide
       image_link: ''
-    third_party_settings: {  }
+    third_party_settings:
+      ds:
+        ds_limit: '1'
     type: responsive_image
     region: header
   field_tags:

config/sync/core.extension.yml

@@ -47,6 +47,7 @@ module:
   faqfield: 0
   field: 0
   field_group: 0
+  field_token_value: 0
   field_ui: 0
   file: 0
   filter: 0

config/sync/field.storage.node.field_article_type.yml

@@ -15,7 +15,7 @@ settings:
   target_type: taxonomy_term
 module: core
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

config/sync/node.type.article.yml

@@ -1,7 +1,13 @@
 uuid: 9c4edacb-83e1-447b-a25e-93264c1cd018
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - menu_ui
+third_party_settings:
+  menu_ui:
+    available_menus: {  }
+    parent: ''
 _core:
   default_config_hash: AeW1SEDgb1OTQACAWGhzvMknMYAJlcZu0jljfeU3oso
 name: Article
@@ -9,5 +15,5 @@ type: article
 description: 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.'
 help: ''
 new_revision: true
-preview_mode: 1
+preview_mode: 0
 display_submitted: true

config/sync/node.type.blog.yml

@@ -15,6 +15,6 @@ name: Blog
 type: blog
 description: 'Use <em>blog</em> for personal or journal-like posts.'
 help: ''
-new_revision: false
-preview_mode: 1
+new_revision: true
+preview_mode: 0
 display_submitted: true

config/sync/node.type.gleaning.yml

@@ -13,6 +13,6 @@ name: Gleaning
 type: gleaning
 description: 'A gleaning is a quick link to material posted somewhere else online.  It should have a title, a link, and can also have a comment.  '
 help: ''
-new_revision: false
-preview_mode: 1
+new_revision: true
+preview_mode: 0
 display_submitted: false

config/sync/node.type.page.yml

@@ -17,5 +17,5 @@ type: page
 description: 'Use <em>basic pages</em> for your static content, such as an ''About us'' page.'
 help: ''
 new_revision: true
-preview_mode: 1
+preview_mode: 0
 display_submitted: false

config/sync/node.type.people.yml

@@ -16,5 +16,5 @@ type: people
 description: 'Use <em>people</em> content type for people such as staff, volunteers, contributors.'
 help: ''
 new_revision: true
-preview_mode: 1
+preview_mode: 0
 display_submitted: false

web/themes/custom/geofresco/dist/css/global.css

@@ -3083,6 +3083,19 @@ a.tag:hover {
   font-size: 22px;
   padding-top: 18px; }
 
+.slogan {
+  position: relative;
+  top: -36px;
+  height: 36px;
+  z-index: 30;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex; }
+  .slogan .title {
+    color: #8FB489;
+    font-size: 1.2rem;
+    margin: auto; }
+
 .input, .textarea, .select select {
   background-color: white;
   border-color: #dbdbdb;

web/themes/custom/geofresco/src/global/_elements.scss

@@ -50,3 +50,18 @@
   font-size: 22px;
   padding-top: 18px;
 }
+
+.slogan {
+  position: relative;
+  top: -36px;
+  height: 36px;
+  z-index: 30;
+  display: flex;
+  .title {
+    position: relative;
+    top: 2px;
+    color: $green-gray;
+    font-size: 1.2rem;
+    margin: auto;
+  }
+}

web/themes/custom/geofresco/src/global/global.scss

@@ -5,6 +5,7 @@ $blue: #4391E0;
 $red: #a70c20;
 $light-green: #65AB1F;
 $green: #478D00;
+$green-gray: #8FB489;
 
 // Update Bulma's global variables.
 $primary: $green;

web/themes/custom/geofresco/src/templates/layout/page.html.twig

@@ -37,7 +37,7 @@
 {{ parent() }}
 {% endblock navbar %}
 {% block header %}
-<h6 class="title">{{ site_slogan }}</h6>
+<p class="slogan"><strong class="title">{{ site_slogan }}</strong></p>
 <section class="hero">
   {% block header_and_search %}
   {% if page.header %}