diff --git a/composer.json b/composer.json
index 9380a882502c07c382403ea592b1352a4f5a5d40..b10ed8bb20fc404607c9cc35c920b2e579a82896 100644
--- a/composer.json
+++ b/composer.json
@@ -92,6 +92,7 @@
"drupal/views_bulk_edit": "1.0-beta1",
"drupal/revision_log_default": "1.0",
"drupal/webform": "5.0-beta18",
+ "drupal/default_content": "1.0-alpha6",
"drupal/content_lock": "1.0-alpha4",
"drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd",
"drupal/rabbit_hole": "1.0-beta3",
@@ -148,7 +149,6 @@
"drupal/varbase_heroslider_media": "4.x-dev",
"drupal/varbase_carousels": "4.x-dev",
"drupal/varbase_total_control": "1.x-dev",
- "drupal/default_content": "1.0-alpha6",
"mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
"vardot/dropzone": "4.3.0.1",
"vardot/blazy": "1.8.2.1",
diff --git a/drupal-org.make b/drupal-org.make
index a87d5e8a3bd361ee5fd849af0d236c75a0516fb1..8568dec91415d485d2d578ec5f65686cb695bee0 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -199,6 +199,9 @@ projects[revision_log_default][version] = 1.0
projects[webform][type] = module
projects[webform][version] = 5.0-beta18
+projects[default_content][type] = module
+projects[default_content][version] = 1.0-alpha6
+
projects[content_lock][type] = module
projects[content_lock][version] = 1.0-alpha4
;; Issue #2907026: Fixed Warning: When we do not have content types yet in the system.
@@ -489,9 +492,6 @@ projects[varbase_bootstrap_paragraphs][version] = 4.x-dev
projects[varbase_total_control][type] = module
projects[varbase_total_control][version] = 1.x-dev
-projects[default_content][type] = module
-projects[default_content][version] = 1.0-alpha6
-
;;;;;;;;;;;;;;;;;;;;;
;; Libraries
;;;;;;;;;;;;;;;;;;;;;
diff --git a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
index 8055d3839d5b2a708de5cf5f18252ffccb3f9535..babf3dfae3e9b49b205e2b18306889369a349131 100644
--- a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
+++ b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml
@@ -2,7 +2,9 @@ name: 'Varbase default content'
type: module
hidden: TRUE
description: 'Varbase default content'
-package: Web services
-core: 8.x
dependencies:
- default_content
+package: Varbase
+version: 8.x-4.x-dev
+core: 8.x
+project: varbase
\ No newline at end of file
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/css/theme/footer.theme.css b/themes/vartheme/VARTHEME_SUBTHEME/css/theme/footer.theme.css
index c29dc334a972a2b22fed5ad6cdf3068a19fc8173..c9b85e181d09dbbbaefcc22764061c5f348528bf 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/css/theme/footer.theme.css
+++ b/themes/vartheme/VARTHEME_SUBTHEME/css/theme/footer.theme.css
@@ -1,7 +1,26 @@
-.footer {
+.footer-wrapper {
+ background-color: #f2f2f2;
+}
+.footer-wrapper .footer {
+ border: 0;
+ padding-top: 0;
+ padding-bottom: 0;
margin-top: 45px;
- padding-top: 35px;
- padding-bottom: 36px;
- border-top: 1px solid #e5e5e5;
+}
+.footer-wrapper .footer #block-copyright {
+ float: left;
+ padding: 17px 0 17px 0;
+ font-size: 12px;
+}
+.footer-wrapper .footer #block-copyright > div {
+ padding: 14px 0 10px 0;
+}
+.footer-wrapper .footer ul.nav {
+ float: right;
+ padding: 17px 0 17px 0;
+}
+.footer-wrapper .footer ul.nav li {
+ display: inline-block;
+ list-style: none;
}
/*# sourceMappingURL=footer.theme.css.map */
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/less/theme/footer.theme.less b/themes/vartheme/VARTHEME_SUBTHEME/less/theme/footer.theme.less
index dffe956ecd4f46912aebbabec5accfa5901d0791..cf99295bb86e8a43ab07ba68e20dfea5b8fe8e7a 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/less/theme/footer.theme.less
+++ b/themes/vartheme/VARTHEME_SUBTHEME/less/theme/footer.theme.less
@@ -8,9 +8,33 @@
// Insert your VARTHEME_SUBTHEME footer custom LESS styling.
-.footer {
- margin-top: 45px;
- padding-top: 35px;
- padding-bottom: 36px;
- border-top: 1px solid @legend-border-color;
+.footer-wrapper {
+ background-color: @footer-wrapper-bg;
+
+ .footer {
+ border: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ margin-top: 45px;
+
+ #block-copyright {
+ float: left;
+ padding: 17px 0 17px 0;
+ font-size: 12px;
+
+ > div {
+ padding: 14px 0 10px 0;
+ }
+ }
+
+ ul.nav {
+ float: right;
+ padding: 17px 0 17px 0;
+
+ li {
+ display: inline-block;
+ list-style: none;
+ }
+ }
+ }
}
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/less/variables.less b/themes/vartheme/VARTHEME_SUBTHEME/less/variables.less
index 4839a2daab68eb6c5ea969058afc0252b422ef6a..14daad8d79949c0183d4bd87c70e42b12eb44553 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/less/variables.less
+++ b/themes/vartheme/VARTHEME_SUBTHEME/less/variables.less
@@ -865,5 +865,8 @@
// Set the proper directory for the Bootstrap Glyphicon font.
@icon-font-path: '../../bootstrap/fonts/';
+// Footer wrapper background color.
+@footer-wrapper-bg: #f2f2f2;
+
// Change custom Varbase Bootstrap Paragraphs colors theme for Vartheme from:
// less/theme/vbp-colors.theme.less
diff --git a/themes/vartheme/css/base/vartheme.base.css b/themes/vartheme/css/base/vartheme.base.css
index 24fa69f052d3d820a07894bf5a3ae9e99429d1d5..42db3ca3eab9e9184fdef38d606494b4cb2f2ede 100644
--- a/themes/vartheme/css/base/vartheme.base.css
+++ b/themes/vartheme/css/base/vartheme.base.css
@@ -612,28 +612,4 @@ img {
.maintenance-page #page {
text-align: center;
}
-.footer-wrapper {
- background-color: #f2f2f2;
-}
-.footer-wrapper .footer {
- border: 0;
- padding-top: 0;
- padding-bottom: 0;
-}
-.footer-wrapper .footer #block-copyright {
- float: left;
- padding: 17px 0 17px 0;
- font-size: 12px;
-}
-.footer-wrapper .footer #block-copyright > div {
- padding: 14px 0 10px 0;
-}
-.footer-wrapper .footer ul.nav {
- float: right;
- padding: 17px 0 17px 0;
-}
-.footer-wrapper .footer ul.nav li {
- display: inline-block;
- list-style: none;
-}
/*# sourceMappingURL=vartheme.base.css.map */
diff --git a/themes/vartheme/css/theme/footer.theme.css b/themes/vartheme/css/theme/footer.theme.css
index c29dc334a972a2b22fed5ad6cdf3068a19fc8173..c9b85e181d09dbbbaefcc22764061c5f348528bf 100644
--- a/themes/vartheme/css/theme/footer.theme.css
+++ b/themes/vartheme/css/theme/footer.theme.css
@@ -1,7 +1,26 @@
-.footer {
+.footer-wrapper {
+ background-color: #f2f2f2;
+}
+.footer-wrapper .footer {
+ border: 0;
+ padding-top: 0;
+ padding-bottom: 0;
margin-top: 45px;
- padding-top: 35px;
- padding-bottom: 36px;
- border-top: 1px solid #e5e5e5;
+}
+.footer-wrapper .footer #block-copyright {
+ float: left;
+ padding: 17px 0 17px 0;
+ font-size: 12px;
+}
+.footer-wrapper .footer #block-copyright > div {
+ padding: 14px 0 10px 0;
+}
+.footer-wrapper .footer ul.nav {
+ float: right;
+ padding: 17px 0 17px 0;
+}
+.footer-wrapper .footer ul.nav li {
+ display: inline-block;
+ list-style: none;
}
/*# sourceMappingURL=footer.theme.css.map */
diff --git a/themes/vartheme/less/base/vartheme.base.less b/themes/vartheme/less/base/vartheme.base.less
index 27a4037a9fa262e9fcb8634844a47feecff5df01..4449e2a4e0614d93ce2de1eac2a59fd120ee5b94 100644
--- a/themes/vartheme/less/base/vartheme.base.less
+++ b/themes/vartheme/less/base/vartheme.base.less
@@ -798,33 +798,3 @@ img {
text-align: center;
}
}
-
-.footer-wrapper {
- background-color: #f2f2f2;
- .footer {
- border: 0;
- padding-top: 0;
- padding-bottom: 0;
-
- #block-copyright {
- float: left;
- padding: 17px 0 17px 0;
- font-size: 12px;
-
- > div {
- padding: 14px 0 10px 0;
- }
- }
-
- ul.nav {
- float: right;
- padding: 17px 0 17px 0;
-
- li {
- display: inline-block;
- list-style: none;
- }
- }
- }
-}
-
diff --git a/themes/vartheme/less/theme/footer.theme.less b/themes/vartheme/less/theme/footer.theme.less
index 9542354aa41332afce07113e7ab4aa79297ba3fc..b7758ccecc942e1d0aaa3e624d798f93a470dc87 100644
--- a/themes/vartheme/less/theme/footer.theme.less
+++ b/themes/vartheme/less/theme/footer.theme.less
@@ -8,9 +8,33 @@
// Insert your vartheme footer custom LESS styling.
-.footer {
- margin-top: 45px;
- padding-top: 35px;
- padding-bottom: 36px;
- border-top: 1px solid @legend-border-color;
+.footer-wrapper {
+ background-color: @footer-wrapper-bg;
+
+ .footer {
+ border: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ margin-top: 45px;
+
+ #block-copyright {
+ float: left;
+ padding: 17px 0 17px 0;
+ font-size: 12px;
+
+ > div {
+ padding: 14px 0 10px 0;
+ }
+ }
+
+ ul.nav {
+ float: right;
+ padding: 17px 0 17px 0;
+
+ li {
+ display: inline-block;
+ list-style: none;
+ }
+ }
+ }
}
diff --git a/themes/vartheme/less/variables.less b/themes/vartheme/less/variables.less
index e8eaa3432c456c4754fb0cb24df11bb9d4499591..fabd887e7c3066bab8fb395c2ef85a20685e437f 100644
--- a/themes/vartheme/less/variables.less
+++ b/themes/vartheme/less/variables.less
@@ -865,5 +865,8 @@
// Set the proper directory for the Bootstrap Glyphicon font.
@icon-font-path: '../../bootstrap/fonts/';
+// Footer wrapper background color.
+@footer-wrapper-bg: #f2f2f2;
+
// Change custom Varbase Bootstrap Paragraphs colors theme for Vartheme from:
// less/theme/vbp-colors.theme.less
\ No newline at end of file