Adding some methods to container; pulling in latest bedrock

martbase · Apr 29, 2021 · dacffce · dacffce
1 parent 185ddf6
commit dacffce
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 69 deletions.
diff --git a/build/package-lock.json b/build/package-lock.json
diff --git a/concrete/css/fontawesome/all.css b/concrete/css/fontawesome/all.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.15.2 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa,

diff --git a/concrete/css/webfonts/fa-brands-400.eot b/concrete/css/webfonts/fa-brands-400.eot
diff --git a/concrete/css/webfonts/fa-brands-400.svg b/concrete/css/webfonts/fa-brands-400.svg
diff --git a/concrete/css/webfonts/fa-brands-400.ttf b/concrete/css/webfonts/fa-brands-400.ttf
diff --git a/concrete/css/webfonts/fa-brands-400.woff b/concrete/css/webfonts/fa-brands-400.woff
diff --git a/concrete/css/webfonts/fa-brands-400.woff2 b/concrete/css/webfonts/fa-brands-400.woff2
diff --git a/concrete/css/webfonts/fa-regular-400.eot b/concrete/css/webfonts/fa-regular-400.eot
diff --git a/concrete/css/webfonts/fa-regular-400.svg b/concrete/css/webfonts/fa-regular-400.svg
diff --git a/concrete/css/webfonts/fa-regular-400.ttf b/concrete/css/webfonts/fa-regular-400.ttf
diff --git a/concrete/css/webfonts/fa-regular-400.woff b/concrete/css/webfonts/fa-regular-400.woff
diff --git a/concrete/css/webfonts/fa-regular-400.woff2 b/concrete/css/webfonts/fa-regular-400.woff2
diff --git a/concrete/css/webfonts/fa-solid-900.eot b/concrete/css/webfonts/fa-solid-900.eot
diff --git a/concrete/css/webfonts/fa-solid-900.svg b/concrete/css/webfonts/fa-solid-900.svg
diff --git a/concrete/css/webfonts/fa-solid-900.ttf b/concrete/css/webfonts/fa-solid-900.ttf
diff --git a/concrete/css/webfonts/fa-solid-900.woff b/concrete/css/webfonts/fa-solid-900.woff
diff --git a/concrete/css/webfonts/fa-solid-900.woff2 b/concrete/css/webfonts/fa-solid-900.woff2
diff --git a/concrete/js/cms.js b/concrete/js/cms.js
diff --git a/concrete/js/features/conversations/frontend.js b/concrete/js/features/conversations/frontend.js
diff --git a/concrete/src/Area/ContainerArea.php b/concrete/src/Area/ContainerArea.php
@@ -11,6 +11,16 @@
 class ContainerArea
 {
 
+    /**
+     * @var bool
+     */
+    protected $gridContainerEnabled = false;
+
+    /**
+     * @var int|null
+     */
+    protected $gridMaximumColumns;
+
     /**
      * @var ContainerBlockInstance
      */
@@ -36,6 +46,22 @@ public function getAreaBlocksArray(Page $page) : array
         return [];
     }
 
+    /**
+     * Enable Grid containers.
+     */
+    final public function enableGridContainer()
+    {
+        $this->gridContainerEnabled = true;
+    }
+
+    /**
+     * @param int $columns
+     */
+    final public function setAreaGridMaximumColumns(int $columns)
+    {
+        $this->gridMaximumColumns = $columns;
+    }
+
     protected function getSubAreaObject(Page $page): ?SubArea
     {
         $block = $this->instance->getBlock();
@@ -67,6 +93,12 @@ public function display(Page $page)
     {
         $subArea = $this->getSubAreaObject($page);
         if ($subArea) {
+            if ($this->gridContainerEnabled) {
+                $subArea->enableGridContainer();
+            }
+            if (isset($this->gridMaximumColumns)) {
+                $subArea->setAreaGridMaximumColumns($this->gridMaximumColumns);
+            }
             $subArea->display($page);
             if (!$this->instance->getInstance()->areaAreasComputed()) {
 

diff --git a/concrete/themes/concrete/main.js b/concrete/themes/concrete/main.js
diff --git a/concrete/themes/dashboard/main.js b/concrete/themes/dashboard/main.js
diff --git a/concrete/themes/elemental/main.js b/concrete/themes/elemental/main.js