diff --git a/src/Controller/Component/NavigationComponent.php b/src/Controller/Component/NavigationComponent.php index aa6f466..23dac07 100644 --- a/src/Controller/Component/NavigationComponent.php +++ b/src/Controller/Component/NavigationComponent.php @@ -121,15 +121,20 @@ class NavigationComponent extends Component ], ] ], - 'LocalTools' => [ + 'Instance' => [ 'label' => __('Instance'), - 'icon' => $this->iconToTableMapping['LocalTools'], + 'icon' => $this->iconToTableMapping['Instance'], 'children' => [ + 'Settings' => [ + 'label' => __('Settings'), + 'url' => '/instance/settings', + 'icon' => 'cogs', + ], 'Database' => [ 'label' => __('Database'), 'url' => '/instance/migrationIndex', 'icon' => 'database', - ] + ], ] ], ], diff --git a/templates/element/Settings/fieldGroup.php b/templates/element/Settings/fieldGroup.php index f73bf4e..dbd889b 100644 --- a/templates/element/Settings/fieldGroup.php +++ b/templates/element/Settings/fieldGroup.php @@ -41,7 +41,7 @@ ]); $inputGroupSave = $this->Bootstrap->genNode('div', [ - 'class' => ['input-group-append', 'd-none', 'position-relative', 'input-group-actions'], + 'class' => ['d-none', 'position-relative', 'input-group-actions'], ], implode('', [ $this->Bootstrap->genNode('a', [ 'class' => ['position-absolute', 'fas fa-times', 'p-abs-center-y', 'text-reset text-decoration-none', 'btn-reset-setting'], diff --git a/webroot/css/bootstrap-additional.css b/webroot/css/bootstrap-additional.css index fd47cfa..3805c7b 100644 --- a/webroot/css/bootstrap-additional.css +++ b/webroot/css/bootstrap-additional.css @@ -111,31 +111,31 @@ div.progress-timeline .progress-line.progress-inactive { .callout { border: 1px solid #00000000; - border-left-color: var(--light); + border-left-color: var(--bs-light); border-left-width: 1px; border-left-width: .25rem; border-radius: .25rem; } .callout-primary { - border-left-color: var(--primary); + border-left-color: var(--bs-primary); } .callout-info { - border-left-color: var(--info); + border-left-color: var(--bs-info); } .callout-success { - border-left-color: var(--success); + border-left-color: var(--bs-success); } .callout-warning { - border-left-color: var(--warning); + border-left-color: var(--bs-warning); } .callout-danger { - border-left-color: var(--danger); + border-left-color: var(--bs-danger); } .callout-dark { - border-left-color: var(--dark); + border-left-color: var(--bs-dark); } .callout-light { - border-left-color: var(--light); + border-left-color: var(--bs-light); } .form-control.is-invalid.warning {