Merge branch 'theme-progress' into 'master'

Theme progress

See merge request agaric/sites/agaric-com!20
This commit is contained in:
Clayton Dewey 2018-10-16 17:58:23 +00:00
commit 635a840f2a
3 changed files with 78 additions and 5 deletions

View file

@ -23,7 +23,8 @@
"drupal/wysiwyg_linebreaks": "^1.9",
"drupal/redirect": "^1.2",
"drupal/block_theme_sync": "^1.0@alpha",
"drupal/search404": "^1.0"
"drupal/search404": "^1.0",
"drupal/coffee": "^1.0@beta"
},
"repositories": {
"drupal": {

78
composer.lock generated
View file

@ -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": "02c3a5e7aebf85e65904d4b2597b4f68",
"content-hash": "d6ed4f6cd201fdf33d4e19ec8965247d",
"packages": [
{
"name": "asm89/stack-cors",
@ -2417,6 +2417,77 @@
"source": "http://cgit.drupalcode.org/bulma"
}
},
{
"name": "drupal/coffee",
"version": "1.0.0-beta2",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/coffee",
"reference": "8.x-1.0-beta2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/coffee-8.x-1.0-beta2.zip",
"reference": "8.x-1.0-beta2",
"shasum": "92631b9ea65298a057cc4143e0939bb156ef5e8d"
},
"require": {
"drupal/core": "~8.0"
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-1.x": "1.x-dev",
"dev-8.x-1.x": "8.1.x-dev"
},
"drupal": {
"version": "8.x-1.0-beta2",
"datestamp": "1477414741",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0+"
],
"authors": [
{
"name": "Michael Mol",
"homepage": "https://www.drupal.org/u/michaelmol",
"role": "Maintainer"
},
{
"name": "Marco",
"homepage": "https://www.drupal.org/u/willzyx",
"role": "Maintainer"
},
{
"name": "Oliver Köhler",
"homepage": "https://www.drupal.org/u/nebel54",
"role": "Maintainer"
},
{
"name": "Alli Price",
"homepage": "https://www.drupal.org/u/heylookalive",
"role": "Maintainer"
},
{
"name": "See other contributors",
"homepage": "https://www.drupal.org/node/1356930/committers",
"role": "contributor"
}
],
"description": "Provides an Alfred like search box to navigate within your site.",
"homepage": "https://drupal.org/project/coffee",
"support": {
"source": "https://cgit.drupalcode.org/coffee",
"issues": "https://drupal.org/project/issues/coffee",
"irc": "irc://irc.freenode.org/drupal-contribute"
}
},
{
"name": "drupal/components",
"version": "1.0.0",
@ -4973,7 +5044,7 @@
},
"drupal": {
"version": "8.x-1.5",
"datestamp": "1527241084",
"datestamp": "1539588781",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@ -9895,7 +9966,8 @@
"drupal/drutopia_core": 20,
"drupal/drutopia_resource": 20,
"drupal/webform": 5,
"drupal/block_theme_sync": 15
"drupal/block_theme_sync": 15,
"drupal/coffee": 10
},
"prefer-stable": true,
"prefer-lowest": false,

@ -1 +1 @@
Subproject commit 8e9d186c96e3f54b7870cbbaaa1922d829481e04
Subproject commit 700529c6ca341bf194df2ddf0e15c6d15f51b451