diff --git a/composer.json b/composer.json index b160fb5ef826b9923c9cee08de2dc9e86de6e1be..85f8b27719d02a7b73d00b037a9be27459044a64 100644 --- a/composer.json +++ b/composer.json @@ -143,14 +143,15 @@ "drupal/betterlogin": "1.x-dev#f7cf1c5c9ec5e80c6ac0ef04ed605e25495232cd", "drupal/ckeditor_media_embed": "1.1", "drupal/total_control": "2.0-alpha4", - "drupal/anchor_link": "1.6", - "drupal/entity_browser_enhanced": "1.0-beta6", - "drupal/vmi": "1.0-beta3", - "drupal/varbase_bootstrap_paragraphs": "4.0-rc1", - "drupal/varbase_editor": "4.18", - "drupal/varbase_heroslider_media": "4.0-beta13", - "drupal/varbase_carousels": "4.0-beta3", - "drupal/varbase_total_control": "1.0-beta9", + "drupal/anchor_link": "1.x-dev", + "drupal/entity_browser_enhanced": "1.x-dev", + "drupal/vmi": "1.x-dev", + "drupal/varbase_bootstrap_paragraphs": "4.x-dev", + "drupal/varbase_editor": "4.x-dev", + "drupal/varbase_heroslider_media": "4.x-dev", + "drupal/varbase_carousels": "4.x-dev", + "drupal/varbase_total_control": "1.x-dev", + "drupal/vartheme_material": "4.x-dev", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "vardot/dropzone": "4.3.0.1", "vardot/blazy": "1.8.2.1", diff --git a/config/install/system.theme.yml b/config/install/system.theme.yml index 960c45b7a9cf3870d3731d2f09bea17003f8d5c0..79d0b81a1c7a0fa7f24d6e8d2a20806953f54d7e 100644 --- a/config/install/system.theme.yml +++ b/config/install/system.theme.yml @@ -1,2 +1,2 @@ admin: vartheme_admin -default: vartheme +default: vartheme_material diff --git a/drupal-org.make b/drupal-org.make index d2a91bb075a5472a48fa6e6cb2a7af2c5e73a502..f1f741a595f0bfce80d1fd6b5f2694dfad76ae7a 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -499,13 +499,13 @@ projects[xmlsitemap][version] = 1.0-alpha2 ;;;;;;;;;;;;;;;;;;;;; projects[anchor_link][type] = module -projects[anchor_link][version] = 1.6 +projects[anchor_link][version] = 1.x-dev projects[entity_browser_enhanced][type] = module -projects[entity_browser_enhanced][version] = 1.0-beta6 +projects[entity_browser_enhanced][version] = 1.x-dev projects[vmi][type] = module -projects[vmi][version] = 1.0-beta3 +projects[vmi][version] = 1.x-dev projects[total_control][type] = module projects[total_control][version] = 2.0-alpha4 @@ -517,19 +517,26 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2 ;;;;;;;;;;;;;;;;;;;;; projects[varbase_editor][type] = module -projects[varbase_editor][version] = 4.18 +projects[varbase_editor][version] = 4.x-dev projects[varbase_heroslider_media][type] = module -projects[varbase_heroslider_media][version] = 4.0-beta13 +projects[varbase_heroslider_media][version] = 4.x-dev projects[varbase_carousels][type] = module -projects[varbase_carousels][version] = 4.0-beta3 +projects[varbase_carousels][version] = 4.x-dev projects[varbase_bootstrap_paragraphs][type] = module -projects[varbase_bootstrap_paragraphs][version] = 4.0-rc1 +projects[varbase_bootstrap_paragraphs][version] = 4.x-dev projects[varbase_total_control][type] = module -projects[varbase_total_control][version] = 1.0-beta9 +projects[varbase_total_control][version] = 1.x-dev + +;;;;;;;;;;;;;;;;;;;;; +;; Varbase public contrib themes. +;;;;;;;;;;;;;;;;;;;;; + +projects[vartheme_material][type] = module +projects[vartheme_material][version] = 4.x-dev ;;;;;;;;;;;;;;;;;;;;; ;; Libraries diff --git a/modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_most_popular.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular.yml old mode 100755 new mode 100644 similarity index 100% rename from modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_most_popular.yml rename to modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular.yml diff --git a/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular_material.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular_material.yml new file mode 100644 index 0000000000000000000000000000000000000000..d8bb7fdac753cf4f576fa3f1c8a66e9c1cef232f --- /dev/null +++ b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular_material.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - views.view.blog_entry + module: + - block_class + - ctools + - views + theme: + - vartheme_material +third_party_settings: + block_class: + classes: '' +id: views_block__blog_entry_most_popular_material +theme: vartheme_material +region: sidebar_second +weight: -7 +provider: null +plugin: 'views_block:blog_entry-most_popular' +settings: + id: 'views_block:blog_entry-most_popular' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + 'entity_bundle:node': + id: 'entity_bundle:node' + bundles: + varbase_blog: varbase_blog + negate: false + context_mapping: + node: '@node.node_route_context:node' diff --git a/modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_most_recent_blog.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog.yml old mode 100755 new mode 100644 similarity index 100% rename from modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_most_recent_blog.yml rename to modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog.yml diff --git a/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog_material.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog_material.yml new file mode 100644 index 0000000000000000000000000000000000000000..e3532184bd3066abb48295d0cef6bc3ee07dc46a --- /dev/null +++ b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog_material.yml @@ -0,0 +1,35 @@ +langcode: en +status: true +dependencies: + config: + - views.view.blog_entry + module: + - block_class + - ctools + - views + theme: + - vartheme_material +third_party_settings: + block_class: + classes: '' +id: views_block__blog_entry_most_recent_blog_material +theme: vartheme_material +region: sidebar_second +weight: -6 +provider: null +plugin: 'views_block:blog_entry-most_recent_blog' +settings: + id: 'views_block:blog_entry-most_recent_blog' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none +visibility: + 'entity_bundle:node': + id: 'entity_bundle:node' + bundles: + varbase_blog: varbase_blog + negate: false + context_mapping: + node: '@node.node_route_context:node' diff --git a/modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_related_blogs.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs.yml old mode 100755 new mode 100644 similarity index 100% rename from modules/varbase_features/varbase_blog/config/install/block.block.views_block__blog_entry_related_blogs.yml rename to modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs.yml diff --git a/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs_material.yml b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs_material.yml new file mode 100644 index 0000000000000000000000000000000000000000..8212e83c109bb2c66c28ad537de3647c471d2737 --- /dev/null +++ b/modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs_material.yml @@ -0,0 +1,36 @@ +langcode: en +status: true +dependencies: + config: + - views.view.blog_entry + module: + - block_class + - ctools + - views + theme: + - vartheme_material +third_party_settings: + block_class: + classes: '' +id: views_block__blog_entry_related_blogs_material +theme: vartheme_material +region: content +weight: 0 +provider: null +plugin: 'views_block:blog_entry-related_blogs' +settings: + id: 'views_block:blog_entry-related_blogs' + label: '' + provider: views + label_display: visible + views_label: '' + items_per_page: none + context_mapping: { } +visibility: + 'entity_bundle:node': + id: 'entity_bundle:node' + bundles: + varbase_blog: varbase_blog + negate: false + context_mapping: + node: '@node.node_route_context:node' diff --git a/modules/varbase_features/varbase_default_content/config/install/block.block.copyright.yml b/modules/varbase_features/varbase_default_content/config/optional/block.block.copyright.yml similarity index 100% rename from modules/varbase_features/varbase_default_content/config/install/block.block.copyright.yml rename to modules/varbase_features/varbase_default_content/config/optional/block.block.copyright.yml diff --git a/modules/varbase_features/varbase_default_content/config/optional/block.block.copyright_material.yml b/modules/varbase_features/varbase_default_content/config/optional/block.block.copyright_material.yml new file mode 100644 index 0000000000000000000000000000000000000000..6279cea7cf67bb6f45fdcb429c328d27ed51cb0f --- /dev/null +++ b/modules/varbase_features/varbase_default_content/config/optional/block.block.copyright_material.yml @@ -0,0 +1,29 @@ +langcode: en +status: true +dependencies: + content: + - 'block_content:basic:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' + module: + - block_class + - block_content + theme: + - vartheme_material +third_party_settings: + block_class: + classes: '' +id: copyright +theme: vartheme_material +region: footer +weight: -5 +provider: null +plugin: 'block_content:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' +settings: + id: 'block_content:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' + label: Copyright + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: { } + diff --git a/varbase.info.yml b/varbase.info.yml index c17e2c76e72e3519a02e762178d8fb9c8398b7dc..01081843400c112d7ff6661380325c807d6811e5 100755 --- a/varbase.info.yml +++ b/varbase.info.yml @@ -122,7 +122,7 @@ themes: - bootstrap # Custom themes. - - vartheme + - vartheme_material - vartheme_admin distribution: name: Varbase