From 56c2298530f5284a8abe7c84a5a1b1eed6222ecc Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 27 Apr 2021 13:41:26 -0600 Subject: [PATCH 1/4] fixed minor z-index issue for tooltips in sidebar --- CHANGELOG.md | 6 ++++++ themes/grav/css-compiled/template.css | 2 +- themes/grav/scss/template/_admin.scss | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da4a1154..cbbe9ef4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.10.14 +## mm/dd/2021 + +1. [](#bugfix) + * Fixed z-index issue for tooltips in sidebar + # v1.10.13 ## 04/23/2021 diff --git a/themes/grav/css-compiled/template.css b/themes/grav/css-compiled/template.css index 3fe1bf5b..40704a13 100644 --- a/themes/grav/css-compiled/template.css +++ b/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; diff --git a/themes/grav/scss/template/_admin.scss b/themes/grav/scss/template/_admin.scss index cc06dac6..a620a681 100644 --- a/themes/grav/scss/template/_admin.scss +++ b/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 { From ac4d1588f0d135e33646061347ad7fbc959f298e Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 28 Apr 2021 14:16:58 -0600 Subject: [PATCH 2/4] Added a `min_height:` option for list field --- CHANGELOG.md | 2 ++ themes/grav/templates/forms/fields/list/list.html.twig | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbbe9ef4..fce1de5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # v1.10.14 ## mm/dd/2021 +1. [](#improved) + * Added a `min_height:` option for list field 1. [](#bugfix) * Fixed z-index issue for tooltips in sidebar diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig index eddbaf51..cf9be078 100644 --- a/themes/grav/templates/forms/fields/list/list.html.twig +++ b/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 %} -
  • +
  • {% for childName, child in field.fields %} {% set child = child|merge({ '_list_index': itemName }) %} From 9d21a98f61c40c85a622169ac3291c77da4e6ae5 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 29 Apr 2021 14:58:48 +0300 Subject: [PATCH 3/4] Theme update - custom files overwritten #2135 --- CHANGELOG.md | 1 + classes/plugin/AdminController.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fce1de5f..39884a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * 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 diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php index 04413ba8..6c10f497 100644 --- a/classes/plugin/AdminController.php +++ b/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']; From 1c6bff164a0bf1f14939a0f6edb98687e16e52d4 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 29 Apr 2021 10:20:44 -0600 Subject: [PATCH 4/4] prepare for release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39884a10..765eb8e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.10.14 -## mm/dd/2021 +## 04/29/2021 1. [](#improved) * Added a `min_height:` option for list field diff --git a/blueprints.yaml b/blueprints.yaml index b5f63c29..c36317ec 100644 --- a/blueprints.yaml +++ b/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: