From cc8ecf262f61bfe9dc5f63b6a2fe96281ef51af5 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Wed, 16 Oct 2013 14:48:22 +0200 Subject: [PATCH] Reorganized styles refs #4895 --- application/controllers/StaticController.php | 2 +- .../layouts/scripts/parts/navigation.phtml | 9 +- .../layouts/scripts/parts/topbar.phtml | 25 +- config/modules/monitoring/menu.ini | 4 +- library/Icinga/Web/LessCompiler.php | 9 + modules/monitoring/public/css/main.less | 251 +++++ public/css/icinga/icons.css | 264 ----- public/css/icinga/icons.less | 363 +++++++ public/css/icinga/main.css | 999 ------------------ public/css/icinga/main.less | 411 +++++++ public/css/icinga/navigation.less | 219 ++++ 11 files changed, 1278 insertions(+), 1278 deletions(-) create mode 100644 modules/monitoring/public/css/main.less delete mode 100644 public/css/icinga/icons.css create mode 100644 public/css/icinga/icons.less delete mode 100644 public/css/icinga/main.css create mode 100644 public/css/icinga/main.less create mode 100644 public/css/icinga/navigation.less diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php index dd477d82e..3fe09be4e 100644 --- a/application/controllers/StaticController.php +++ b/application/controllers/StaticController.php @@ -165,7 +165,7 @@ class StaticController extends ActionController foreach ($moduleManager->getLoadedModules() as $moduleName) { $cssDir = $moduleName->getCssDir(); - + if (is_dir($cssDir)) { $lessCompiler->addItem($cssDir); } diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml index 0acbdea87..159f12b7b 100755 --- a/application/layouts/scripts/parts/navigation.phtml +++ b/application/layouts/scripts/parts/navigation.phtml @@ -35,8 +35,13 @@ $item = $this->navigation->keys("menu"); } $activeSet = $activeSet || $active; ?> -
  • "> - +
  • "> + + + + + +
  • - + -
    + -
    + -
    + + -
    - -
    auth()->isAuthenticated()): ?>