From 9a56e13b170ca063c83a4336e6791653c202c762 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 28 Jan 2018 15:58:46 +0200
Subject: [PATCH] Issue #2939408: Added [Varbase Theme - Material Design] theme
the vartheme material theme
---
composer.json | 17 ++++-----
config/install/system.theme.yml | 2 +-
drupal-org.make | 23 +++++++-----
...k.views_block__blog_entry_most_popular.yml | 0
...lock__blog_entry_most_popular_material.yml | 35 ++++++++++++++++++
...ews_block__blog_entry_most_recent_blog.yml | 0
...__blog_entry_most_recent_blog_material.yml | 35 ++++++++++++++++++
....views_block__blog_entry_related_blogs.yml | 0
...ock__blog_entry_related_blogs_material.yml | 36 +++++++++++++++++++
.../block.block.copyright.yml | 0
.../block.block.copyright_material.yml | 29 +++++++++++++++
varbase.info.yml | 2 +-
12 files changed, 161 insertions(+), 18 deletions(-)
rename modules/varbase_features/varbase_blog/config/{install => optional}/block.block.views_block__blog_entry_most_popular.yml (100%)
mode change 100755 => 100644
create mode 100644 modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_popular_material.yml
rename modules/varbase_features/varbase_blog/config/{install => optional}/block.block.views_block__blog_entry_most_recent_blog.yml (100%)
mode change 100755 => 100644
create mode 100644 modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_most_recent_blog_material.yml
rename modules/varbase_features/varbase_blog/config/{install => optional}/block.block.views_block__blog_entry_related_blogs.yml (100%)
mode change 100755 => 100644
create mode 100644 modules/varbase_features/varbase_blog/config/optional/block.block.views_block__blog_entry_related_blogs_material.yml
rename modules/varbase_features/varbase_default_content/config/{install => optional}/block.block.copyright.yml (100%)
create mode 100644 modules/varbase_features/varbase_default_content/config/optional/block.block.copyright_material.yml
diff --git a/composer.json b/composer.json
index b160fb5e..85f8b277 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 960c45b7..79d0b81a 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 d2a91bb0..f1f741a5 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 00000000..d8bb7fda
--- /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 00000000..e3532184
--- /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 00000000..8212e83c
--- /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 00000000..6279cea7
--- /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 c17e2c76..01081843 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
--
GitLab