diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 315209232..02b711272 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -420,7 +420,7 @@ class ActionController extends Zend_Controller_Action } if ($this->autorefreshInterval !== null) { - $resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval); + // $resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval); } } diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less index 9399dfa09..c6b6576bc 100644 --- a/public/css/icinga/layout-colors.less +++ b/public/css/icinga/layout-colors.less @@ -4,21 +4,17 @@ /* Layout colors */ #sidebar { - background-color: #999; - -moz-box-shadow: inset -0.5em 0 0.5em -0.5em #555; - -webkit-box-shadow: inset -0.5em 0 0.5em -0.5em #555; - box-shadow: inset -0.5em 0 0.5em -0.5em #555; + background-color: #eee; + -moz-box-shadow: inset -0.4em 0 0.4em -0.4em #555; + -webkit-box-shadow: inset -0.4em 0 0.4em -0.4em #555; + box-shadow: inset -0.4em 0 0.4em -0.4em #555; } #header { - background-color: #555; - background-image: -moz-linear-gradient(top, #777, #555); - background-image: -webkit-linear-gradient(top, #777, #555); - background-image: -o-linear-gradient(top, #777, #555); - background-image: -ms-linear-gradient(top, #777, #555); - background-image: linear-gradient(top, #777, #555); + background-color: #049baf; color: #ddd; color: #d0d0d0; + border-bottom: solid 1px; } #header input { diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less index be8a8703f..97242c9bd 100644 --- a/public/css/icinga/layout-structure.less +++ b/public/css/icinga/layout-structure.less @@ -166,7 +166,7 @@ html { } .container .controls > * { - margin-left: 1em; + margin-left: 0em; } .container .controls h1 { diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less index 6f8b97fa9..6f4744f21 100644 --- a/public/css/icinga/menu.less +++ b/public/css/icinga/menu.less @@ -25,14 +25,9 @@ } #menu li { - margin-left: 0.5em; + margin-left: 0.0em; } -#menu > ul > li { - border-bottom: 2em solid #888; -} - - #menu > ul > li > ul { display: none; } @@ -47,13 +42,13 @@ #menu > ul > li.active { background-color: white; - padding-left: 0.5em; + padding-left: 0.0em; margin-left: 0; margin-right: 0; } #menu > ul > li > a { - text-shadow: #555 -1px 1px 0px; + text-shadow: none; } #menu > ul > li.active > a { @@ -79,7 +74,7 @@ } #menu > ul > li { - border-bottom: 1px solid #888; + border-bottom: 1px solid #d9d9d9; } #menu > ul > li li { @@ -90,12 +85,12 @@ /* Collapsed menu item color */ #menu > ul > li > a { - color: #f5f5f5; + color: #666; } /* Sub item color */ #menu .active ul li a { - color: #a6a6a6; + color: #666; } #menu ul { @@ -122,22 +117,23 @@ } #menu > ul > li { - margin: 0 0 0 0.5em; + margin-left: 5px; } #menu > ul > li.active { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; + border-left: solid 5px #049baf; } /* BEGIN OF Hoverable menu */ #menu li.hover { width: 26em; - padding-left: 0.5em; - margin-left: 0; - margin-right: 0; + padding-left: 0.0em; + margin-left: 5px; + margin-right: 5; position: relative; } @@ -148,13 +144,14 @@ right: 0; top: -0.5em; padding-top: 1em; + padding-left: 1em; padding-bottom: 0.5em; height: auto; - background-color: #333; + background-color: #222222; } #menu li.hover > a { - color: white; + color: black; } #menu li.hover > ul a { @@ -168,7 +165,7 @@ } #menu li.hover > ul a:focus { - text-shadow: 1px 1px 0 #ddd; + text-shadow: none; } #menu li.hover > ul > li.active > a { @@ -220,9 +217,8 @@ background-image: url('../img/icons/search.png'); background-repeat: no-repeat; background-position: 1.2em center; - color: #f5f5f5; - text-shadow: -1px 1px 0 #555555; - border-bottom: 1px solid #888; + color: #666; + border-bottom: 1px solid #d9d9d9; } html.ie8 #menu input.search { @@ -230,15 +226,15 @@ html.ie8 #menu input.search { } #menu input.search:-ms-input-placeholder { - color: #f5f5f5; + color: #666; } #menu input.search::-webkit-input-placeholder { - color: #f5f5f5; + color: #666; } #menu input.search::-moz-placeholder { - color: #f5f5f5; + color: #666; opacity: 1; } diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less index 74e3e0b72..8b4adc664 100644 --- a/public/css/icinga/tabs.less +++ b/public/css/icinga/tabs.less @@ -33,9 +33,6 @@ ul.tabs li a { } ul.tabs > li > a { - border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - -webkit-border-radius: 3px 3px 0 0; } ul.tabs > li > a:focus { @@ -138,4 +135,4 @@ ul.tabs img.icon { a.close-tab { display: none; -} \ No newline at end of file +}