diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php index 4d72fec..4fa1ab5 100644 --- a/lib/Controller/CssController.php +++ b/lib/Controller/CssController.php @@ -63,6 +63,8 @@ class CssController extends Controller 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'), ], 'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1), + 'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'), + 'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'), ]; $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank'); diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 0d013cd..b984305 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -60,6 +60,8 @@ class Admin implements ISettings 'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'), 'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'), 'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'), + 'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'), + 'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'), ]; return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, ''); diff --git a/src/SideMenu.vue b/src/SideMenu.vue index e22b8d6..8e05002 100644 --- a/src/SideMenu.vue +++ b/src/SideMenu.vue @@ -28,8 +28,7 @@ along with this program. If not, see .
  • - - {{ app.name }} +
  • @@ -54,10 +53,14 @@ export default { let href = element.getAttribute('href') if (href !== '#') { + let svg = element.querySelector('svg').outerHTML + + svg = svg.replace(/(height|width)="20"/, '') + this.apps.push({ href: href, name: element.querySelector('span').innerHTML, - icon: element.querySelector('svg').outerHTML, + icon: svg, active: element.classList.contains('active') }); } diff --git a/src/admin.js b/src/admin.js index c6cdef2..1a60b51 100644 --- a/src/admin.js +++ b/src/admin.js @@ -24,6 +24,8 @@ const elements = [ 'side-menu-opener-position', 'side-menu-opener-hover', 'side-menu-display-logo', + 'side-menu-size-icon', + 'side-menu-size-text', 'side-menu-cache', ]; diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php index d8a872f..4ddb0aa 100644 --- a/templates/css/stylesheet.php +++ b/templates/css/stylesheet.php @@ -30,4 +30,57 @@ height: calc(100vh); top: 0; } + + + #side-menu, .side-menu-apps-list { + + width: 55px; + + width: 52px; + + } + + #side-menu .side-menu-opener { + + margin-left: 6px; + + margin-left: 4px; + + } + + + + + .side-menu-app-icon { + display: none; + } + + .side-menu-app-icon svg { + width: 15px; + height: 15px; + } + + .side-menu-app-icon svg { + width: 20px; + height: 20px; + } + + .side-menu-app-icon svg { + width: 23px; + height: 23px; + } + + + + .side-menu-app-text { + display: none; + } + + .side-menu-app-text { + font-size: 12px; + } + + .side-menu-app-text { + font-size: 16px; + } diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 95dac75..ccd0da1 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -24,6 +24,13 @@ $choicesYesNo = [ 'No' => '0', 'Yes' => '1', ]; + +$choicesSizes = [ + 'Hidden' => 'hidden', + 'Small' => 'small', + 'Normal' => 'normal', + 'Big' => 'big', +]; ?>
    @@ -165,6 +172,30 @@ $choicesYesNo = [
    + +
    + +
    + +
    + + + +