Merge branch 'release/1.10.14'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v1.10.14
+## 04/29/2021
+
+1. [](#improved)
+    * Added a `min_height:` option for list field
+1. [](#bugfix)
+    * Fixed z-index issue for tooltips in sidebar
+    * Fixed custom files being overridden during theme update [#2135](https://github.com/getgrav/grav-plugin-admin/issues/2135)
+
 # v1.10.13
 ## 04/23/2021
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.13
+version: 1.10.14
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

classes/plugin/AdminController.php

@@ -993,7 +993,7 @@ class AdminController extends AdminBaseController
             return false;
         }
 
-        $result = Gpm::install(array_keys($dependencies), ['theme' => $type === 'theme']);
+        $result = Gpm::install(array_keys($dependencies), ['theme' => $type === 'themes']);
 
         if ($result) {
             $this->admin->json_response = ['status' => 'success', 'message' => 'Dependencies installed successfully'];
@@ -1033,7 +1033,7 @@ class AdminController extends AdminBaseController
         $data = $this->post;
         $package = $data['package'] ?? '';
         try {
-            $result = Gpm::install($package, ['theme' => $type === 'theme']);
+            $result = Gpm::install($package, ['theme' => $type === 'themes']);
         } catch (\Exception $e) {
             /** @var Debugger $debugger */
             $debugger = $this->grav['debugger'];

themes/grav/css-compiled/template.css

@@ -2071,7 +2071,7 @@ table.noflex {
   width: 100%;
   max-height: 100vh;
   opacity: 0;
-  z-index: 0; }
+  z-index: 1; }
   #admin-sidebar #open-handle {
     display: block;
     position: absolute;

themes/grav/scss/template/_admin.scss

@@ -165,7 +165,7 @@ $content-padding: 1.5rem;
     width: 100%;
     max-height: 100vh;
     opacity: 0;
-    z-index: 0;
+    z-index: 1;
     //transition: opacity 0.2s 0s, visibility 0s 0.2s;
 
     #open-handle {

themes/grav/templates/forms/fields/list/list.html.twig

@@ -70,7 +70,10 @@
                 {% set collapsible = field.fields|length > 1 and (field.collapsible is not defined or field.collapsible)  %}
                 {% for key, val in value %}
                     {% set itemName = name ? name ~ '.' ~ key : key %}
-                    <li data-collection-item="{{ itemName }}" data-collection-key="{{ key }}" class="{{ collapsible and field.collapsed ? 'collection-collapsed' : '' }}">
+                    <li data-collection-item="{{ itemName }}"
+                        data-collection-key="{{ key }}"
+                        class="{{ collapsible and field.collapsed ? 'collection-collapsed' : '' }}"
+                        {% if field.min_height %}style="min-height:{{ field.min_height }};"{% endif %}>
                         <div class="collection-sort"><i class="fa fa-fw fa-bars"></i></div>
                         {% for childName, child in field.fields %}
                             {% set child = child|merge({ '_list_index': itemName }) %}